diff options
| author | John Reck <jreck@google.com> | 2011-05-18 09:22:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-18 09:22:11 -0700 |
| commit | 1617b123ee4f5468d1b3cf605d84c7dc616b42e1 (patch) | |
| tree | 71ddd6284c91fbd54c519a2354c25b54acffaa7e /res | |
| parent | fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01 (diff) | |
| parent | ccdc7bbd51dd5fe250a9ad27790bbbf974579b5a (diff) | |
| download | packages_apps_browser-1617b123ee4f5468d1b3cf605d84c7dc616b42e1.zip packages_apps_browser-1617b123ee4f5468d1b3cf605d84c7dc616b42e1.tar.gz packages_apps_browser-1617b123ee4f5468d1b3cf605d84c7dc616b42e1.tar.bz2 | |
am ccdc7bbd: am 9fdd981a: Bookmark action bar fix
* commit 'ccdc7bbd51dd5fe250a9ad27790bbbf974579b5a':
Bookmark action bar fix
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu-w720dp/bookmark.xml | 37 | ||||
| -rw-r--r-- | res/menu/bookmark.xml | 2 |
2 files changed, 38 insertions, 1 deletions
diff --git a/res/menu-w720dp/bookmark.xml b/res/menu-w720dp/bookmark.xml new file mode 100644 index 0000000..0adadac --- /dev/null +++ b/res/menu-w720dp/bookmark.xml @@ -0,0 +1,37 @@ +<?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/add_bookmark" + android:icon="@drawable/ic_bookmark_off_holo_dark" + android:title="@string/add_new_bookmark" + android:showAsAction="always|withText" /> + <item + android:id="@+id/go_home" + android:icon="@drawable/ic_home_holo_dark" + android:showAsAction="always" /> + <item + android:id="@+id/thumbnail_view" + android:title="@string/bookmark_thumbnail_view"/> + <item + android:id="@+id/list_view" + android:title="@string/bookmark_list_view"/> + <item + android:id="@+id/preferences_menu_id" + android:title="@string/menu_preferences" + android:alphabeticShortcut="p" /> +</menu> diff --git a/res/menu/bookmark.xml b/res/menu/bookmark.xml index 5517ab9..3d248b4 100644 --- a/res/menu/bookmark.xml +++ b/res/menu/bookmark.xml @@ -19,7 +19,7 @@ android:id="@+id/add_bookmark" android:icon="@drawable/ic_bookmark_off_holo_dark" android:title="@string/add_new_bookmark" - android:showAsAction="always|withText" /> + android:showAsAction="always" /> <item android:id="@+id/go_home" android:icon="@drawable/ic_home_holo_dark" |