Fix dual-bar action bar in bookmarks
Change-Id: I212264144a5938ea2eb9e04c0c8471b911c38765
diff --git a/res/menu-w500dp/bookmark.xml b/res/menu-w500dp/bookmark.xml
new file mode 100644
index 0000000..a951373
--- /dev/null
+++ b/res/menu-w500dp/bookmark.xml
@@ -0,0 +1,40 @@
+<?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" />
+ <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"
+ 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/bookmark.xml b/res/menu/bookmark.xml
index 3d248b4..eee1706 100644
--- a/res/menu/bookmark.xml
+++ b/res/menu/bookmark.xml
@@ -18,12 +18,11 @@
<item
android:id="@+id/add_bookmark"
android:icon="@drawable/ic_bookmark_off_holo_dark"
- android:title="@string/add_new_bookmark"
- android:showAsAction="always" />
+ android:title="@string/add_new_bookmark" />
<item
android:id="@+id/go_home"
- android:icon="@drawable/ic_home_holo_dark"
- android:showAsAction="always" />
+ android:title="@string/go_home"
+ android:icon="@drawable/ic_home_holo_dark" />
<item
android:id="@+id/thumbnail_view"
android:title="@string/bookmark_thumbnail_view"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8df4642..34ca824 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -680,6 +680,8 @@
<string name="browser_history">Recently visited pages</string>
<!-- Appears on History screen if no history is found -->
<string name="empty_history">Browser history is empty.</string>
+ <!-- Menu option to load the user's home page [CHAR LIMIT=30] -->
+ <string name="go_home">Home</string>
<!-- Displayed at the top of the bookmarks page. When clicked, it bookmarks the page the browser is currently showing -->
<string name="add_new_bookmark">Add bookmark\u2026</string>
<!-- Verb placed in front of a screenshot of a web page that, when clicked,
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index d871f22..f2f7de3 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -258,10 +258,6 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.bookmark, menu);
- if (!BrowserActivity.isTablet(getActivity())) {
- MenuItem item = menu.findItem(R.id.add_bookmark);
- item.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- }
}
@Override