diff options
| author | John Reck <jreck@google.com> | 2011-08-12 16:13:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-12 16:13:03 -0700 |
| commit | 706b52061785fe3562ccb872aa0c5404e2115484 (patch) | |
| tree | 33c7856d6d967202c9c888fa8fbfd3e5f3c43004 | |
| parent | a7ab18a8809a5fb8dd36105c53aceee4e8f65aa7 (diff) | |
| parent | a6bebc033aa19c8a62409acab99d8d9d9ec74e3f (diff) | |
| download | packages_apps_browser-706b52061785fe3562ccb872aa0c5404e2115484.zip packages_apps_browser-706b52061785fe3562ccb872aa0c5404e2115484.tar.gz packages_apps_browser-706b52061785fe3562ccb872aa0c5404e2115484.tar.bz2 | |
Merge "Add title for bookmark shortcut picker"
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | 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 5b1edb9..5b6d38b 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 76a698e..20e7297 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 612116e..56e9c30 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); |