diff options
author | John Reck <jreck@google.com> | 2011-07-13 15:48:43 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-07-18 10:25:43 -0700 |
commit | d3e4d5b4ffdf374b836ec9d4d3e315040c8c3779 (patch) | |
tree | fa5229389ce7992567356db87572a014ea9f032d /res/menu | |
parent | caaf540bc9ae738f1b6f27e7012378686124ce6d (diff) | |
download | packages_apps_browser-d3e4d5b4ffdf374b836ec9d4d3e315040c8c3779.zip packages_apps_browser-d3e4d5b4ffdf374b836ec9d4d3e315040c8c3779.tar.gz packages_apps_browser-d3e4d5b4ffdf374b836ec9d4d3e315040c8c3779.tar.bz2 |
Move ComboView to its own activity
Bugs: 5009130 3368824
Change-Id: I559bb88a1e759172ef9a7d2a8b41ea4c7e523ec6
Diffstat (limited to 'res/menu')
-rw-r--r-- | res/menu/bookmark.xml | 39 | ||||
-rw-r--r-- | res/menu/combined.xml | 18 | ||||
-rw-r--r-- | res/menu/history.xml | 11 |
3 files changed, 20 insertions, 48 deletions
diff --git a/res/menu/bookmark.xml b/res/menu/bookmark.xml deleted file mode 100644 index eee1706..0000000 --- a/res/menu/bookmark.xml +++ /dev/null @@ -1,39 +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/add_bookmark" - android:icon="@drawable/ic_bookmark_off_holo_dark" - android:title="@string/add_new_bookmark" /> - <item - android:id="@+id/go_home" - android:title="@string/go_home" - android:icon="@drawable/ic_home_holo_dark" /> - <item - android:id="@+id/thumbnail_view" - android:title="@string/bookmark_thumbnail_view" - android:icon="@drawable/ic_thumbnail_view_holo_dark" /> - <item - android:id="@+id/list_view" - android:title="@string/bookmark_list_view" - android:icon="@drawable/ic_list_view_holo_dark" /> - <item - android:id="@+id/preferences_menu_id" - android:title="@string/menu_preferences" - android:icon="@drawable/ic_settings_holo_dark" - android:alphabeticShortcut="p" /> -</menu> diff --git a/res/menu/combined.xml b/res/menu/combined.xml new file mode 100644 index 0000000..559bb74 --- /dev/null +++ b/res/menu/combined.xml @@ -0,0 +1,18 @@ +<?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"> +</menu> diff --git a/res/menu/history.xml b/res/menu/history.xml index 5b029b5..a8c1b29 100644 --- a/res/menu/history.xml +++ b/res/menu/history.xml @@ -4,9 +4,9 @@ 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. @@ -15,11 +15,4 @@ --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/clear_history_menu_id" - android:title="@string/clear_history" - android:icon="@android:drawable/ic_menu_close_clear_cancel" /> - <item android:id="@+id/preferences_menu_id" - android:title="@string/menu_preferences" - android:icon="@drawable/ic_settings_holo_dark" - android:alphabeticShortcut="p" /> </menu> |