commit 8d5af2d0208aa5b5197f50e12ba11c5565d74dc4
author Eric Fischer <enf@google.com> Mon Aug 15 10:24:19 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 15 10:24:19 2011 -0700
tree ef705b0c1c9e4b68bb1fa99bfcdb45890903d2d6
parent 706b52061785fe3562ccb872aa0c5404e2115484
parent c16e630f9094654e04d970820dd5f82d9420a958

Merge "Import revised translations."

res/values/dimensions.xml

diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 3d3d7ce..279c53c 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -64,8 +64,8 @@
     <dimen name="menu_width">240dip</dimen>
     <dimen name="menu_height">32dip</dimen>
     <dimen name="toolbar_height">52dip</dimen>
-    <dimen name="tab_thumbnail_width">@dimen/nav_tab_width</dimen>
-    <dimen name="tab_thumbnail_height">@dimen/nav_tab_height</dimen>
+    <dimen name="tab_thumbnail_width">240dip</dimen>
+    <dimen name="tab_thumbnail_height">160dip</dimen>
     <dimen name="nav_tab_width">240dip</dimen>
     <dimen name="nav_tab_height">160dip</dimen>
     <dimen name="nav_tab_text_normal">18sp</dimen>

res/values/strings.xml

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 -->

res/values/styles.xml

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>

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index a52bc56..b5497d5 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -424,7 +424,7 @@
             mUiController.endActionMode();
         }
         showTitleBar();
-        if (!getActiveTab().isSnapshot()) {
+        if ((getActiveTab() != null) && !getActiveTab().isSnapshot()) {
             mNavigationBar.startEditingUrl(clearInput);
         }
     }

src/com/android/browser/ShortcutActivity.java

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 @@
     @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);