From a6bebc033aa19c8a62409acab99d8d9d9ec74e3f Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 12 Aug 2011 16:02:08 -0700
Subject: Add title for bookmark shortcut picker

 Bug: 5144535

Change-Id: I4d8c7b961d44d8d79300fab33425881f255b3156
---
 res/values/strings.xml                        | 2 ++
 res/values/styles.xml                         | 2 --
 src/com/android/browser/ShortcutActivity.java | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5b1edb960..5b6d38b0a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -204,6 +204,8 @@
     <string name="bookmarks">Bookmarks</string>
     <!-- Secondary name for the Activity "BrowserBookmarksPage" -->
     <string name="shortcut_bookmark">Bookmark</string>
+    <!-- Title for the activity asking the user to select a bookmark [CHAR LIMIT=50] -->
+    <string name="shortcut_bookmark_title">Pick a bookmark</string>
     <!-- Menu item to display the History of previously visited pages -->
     <string name="history">History</string>
     <!-- Menu item for viewing downloads from the browser -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 76a698e87..20e729729 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -59,8 +59,6 @@
         <item name="android:background">@color/black</item>
     </style>
     <style name="ShortcutTheme" parent="@android:Theme.Holo.DialogWhenLarge">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
     </style>
     <style name="TitleBar">
         <item name="android:windowEnterAnimation">@anim/title_bar_enter</item>
diff --git a/src/com/android/browser/ShortcutActivity.java b/src/com/android/browser/ShortcutActivity.java
index 612116e10..56e9c30be 100644
--- a/src/com/android/browser/ShortcutActivity.java
+++ b/src/com/android/browser/ShortcutActivity.java
@@ -31,8 +31,7 @@ public class ShortcutActivity extends Activity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // TODO: Is this needed?
-        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
+        setTitle(R.string.shortcut_bookmark_title);
         setContentView(R.layout.pick_bookmark);
         mBookmarks = (BrowserBookmarksPage) getFragmentManager()
                 .findFragmentById(R.id.bookmarks);
-- 
cgit v1.2.3