diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-09-15 16:18:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-15 16:18:38 -0700 |
| commit | b68db35d469fae510c35ef9ab0da7fe25fc88836 (patch) | |
| tree | 8ec726131278ae5dfb1b52085573f2ca1d5fcc1d /res | |
| parent | 3a20b79392e1d984b4a8c6299d249ddccbce192b (diff) | |
| parent | eb117233adb17f67625c0409c32332591bf36485 (diff) | |
| download | packages_apps_Browser-b68db35d469fae510c35ef9ab0da7fe25fc88836.zip packages_apps_Browser-b68db35d469fae510c35ef9ab0da7fe25fc88836.tar.gz packages_apps_Browser-b68db35d469fae510c35ef9ab0da7fe25fc88836.tar.bz2 | |
Merge branch 'master' of ssh://android-git:29418/platform/packages/apps/Browser
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/browser.xml | 39 | ||||
| -rw-r--r-- | res/menu/snapshot_go_live.xml | 22 |
2 files changed, 24 insertions, 37 deletions
diff --git a/res/menu/browser.xml b/res/menu/browser.xml index 7d288c1..2b651c3 100644 --- a/res/menu/browser.xml +++ b/res/menu/browser.xml @@ -50,21 +50,30 @@ android:icon="@drawable/ic_bookmarks_history_holo_dark" android:alphabeticShortcut="b" android:visible="@bool/menu_show_bookmarks" /> - <item - android:id="@+id/share_page_menu_id" - android:title="@string/share_page" - android:icon="@drawable/ic_share_holo_dark" - android:alphabeticShortcut="s" /> - <item - 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" /> + <group + android:id="@+id/LIVE_MENU"> + <item + android:id="@+id/share_page_menu_id" + android:title="@string/share_page" + android:icon="@drawable/ic_share_holo_dark" + android:alphabeticShortcut="s" /> + <item + 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" /> + </group> + <group + android:id="@+id/SNAPSHOT_MENU"> + <item + android:id="@+id/snapshot_go_live" + android:title="@string/snapshot_go_live" /> + </group> <item android:id="@+id/page_info_menu_id" android:title="@string/page_info" /> diff --git a/res/menu/snapshot_go_live.xml b/res/menu/snapshot_go_live.xml deleted file mode 100644 index aa6b38e..0000000 --- a/res/menu/snapshot_go_live.xml +++ /dev/null @@ -1,22 +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/snapshot_go_live" - android:title="@string/snapshot_go_live" /> -</menu> - |