summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-08-12 16:13:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-12 16:13:03 -0700
commit706b52061785fe3562ccb872aa0c5404e2115484 (patch)
tree33c7856d6d967202c9c888fa8fbfd3e5f3c43004 /res/values
parenta7ab18a8809a5fb8dd36105c53aceee4e8f65aa7 (diff)
parenta6bebc033aa19c8a62409acab99d8d9d9ec74e3f (diff)
downloadpackages_apps_Browser-706b52061785fe3562ccb872aa0c5404e2115484.zip
packages_apps_Browser-706b52061785fe3562ccb872aa0c5404e2115484.tar.gz
packages_apps_Browser-706b52061785fe3562ccb872aa0c5404e2115484.tar.bz2
Merge "Add title for bookmark shortcut picker"
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/values/styles.xml2
2 files changed, 2 insertions, 2 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>