commit 42229bcdea8a1623d9ac3fce099793a3767fb14d
author John Reck <jreck@google.com> Fri Aug 19 13:26:43 2011 -0700
committer John Reck <jreck@google.com> Fri Aug 19 13:26:43 2011 -0700
tree 3069825c505174e5b67d4be65bd5714db75f27f3
parent 0d7c69e9621a860f467a3e3171ee4962ad793df9

YAMR - Yet Another Menu Reorg

 Bug: 5186166

Change-Id: Icd459c8f9cd557659a5402431a843a856fb1b134

res/menu/browser.xml

diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index d3dc7d0..7d288c1 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -56,10 +56,18 @@
             android:icon="@drawable/ic_share_holo_dark"
             android:alphabeticShortcut="s" />
         <item
-            android:id="@+id/view_downloads_menu_id"
-            android:title="@string/menu_view_download"
-            android:icon="@drawable/ic_downloads_holo_dark"
-            android:alphabeticShortcut="j" />
+            android:id="@+id/find_menu_id"
+            android:title="@*android:string/find_on_page"/>
+        <item
+            android:id="@+id/ua_desktop_menu_id"
+            android:checkable="true"
+            android:title="@string/ua_switcher_desktop" />
+        <item
+            android:id="@+id/save_snapshot_menu_id"
+            android:title="@string/menu_save_snapshot" />
+        <item
+            android:id="@+id/page_info_menu_id"
+            android:title="@string/page_info" />
         <item
             android:id="@+id/preferences_menu_id"
             android:title="@string/menu_preferences"
@@ -76,6 +84,8 @@
             android:visible="false" />
     </group>
     <group android:id="@+id/MAIN_SHORTCUT_MENU" android:visible="false">
+        <item android:id="@+id/view_downloads_menu_id"
+            android:alphabeticShortcut="j" />
         <item android:id="@+id/homepage_menu_id"
             android:alphabeticShortcut="&#32;" />
         <item android:id="@+id/classic_history_menu_id"

res/menu/ua_switcher.xml

diff --git a/res/menu/ua_switcher.xml b/res/menu/ua_switcher.xml
deleted file mode 100644
index 51236de..0000000
--- a/res/menu/ua_switcher.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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/ua_mobile_menu_id"
-        android:checkable="true"
-        android:title="@string/ua_switcher_mobile" />
-    <item
-        android:id="@+id/ua_desktop_menu_id"
-        android:checkable="true"
-        android:title="@string/ua_switcher_desktop" />
-    <item
-        android:id="@+id/find_menu_id"
-        android:title="@*android:string/find_on_page"/>
-    <item
-        android:id="@+id/save_snapshot_menu_id"
-        android:title="@string/menu_save_snapshot" />
-    <item
-        android:id="@+id/page_info_menu_id"
-        android:title="@string/page_info" />
-</menu>
-