Move Find on page and Select into the framework.
Bug: 2938052
Depends on a change to frameworks/base
Change-Id: I28db6d06fa248913091455e82853ef151a0561b0
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index adb1bad..2c237a6 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -40,8 +40,8 @@
android:icon="@drawable/ic_menu_add_bookmark"
android:alphabeticShortcut="a" />
<item android:id="@+id/find_menu_id"
- android:title="@string/find_dot"
- android:icon="@drawable/ic_menu_find"
+ android:title="@*android:string/find_on_page"
+ android:icon="@*android:drawable/ic_menu_find"
android:alphabeticShortcut="f" />
<item android:id="@+id/share_page_menu_id"
android:title="@string/share_page"
diff --git a/res/menu/copy.xml b/res/menu/copy.xml
deleted file mode 100644
index 018be25..0000000
--- a/res/menu/copy.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/copy"
- android:icon="@drawable/ic_btn_copy"
- android:showAsAction="always"
- />
- <item android:id="@+id/share"
- android:icon="@drawable/ic_btn_share"
- android:showAsAction="always"
- />
- <item android:id="@+id/select_all"
- android:icon="@drawable/ic_btn_select_all"
- android:showAsAction="always"
- />
- <item android:id="@+id/find"
- android:icon="@drawable/ic_btn_find"
- android:showAsAction="always"
- />
-</menu>
-
diff --git a/res/menu/find.xml b/res/menu/find.xml
deleted file mode 100644
index 74a40aa..0000000
--- a/res/menu/find.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/find_prev"
- android:icon="@drawable/ic_btn_find_prev"
- android:showAsAction="always"
- />
- <item android:id="@+id/find_next"
- android:icon="@drawable/ic_btn_find_next"
- android:showAsAction="always"
- />
-</menu>