commit 706b52061785fe3562ccb872aa0c5404e2115484
author John Reck <jreck@google.com> Fri Aug 12 16:13:03 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 12 16:13:03 2011 -0700
tree 33c7856d6d967202c9c888fa8fbfd3e5f3c43004
parent a7ab18a8809a5fb8dd36105c53aceee4e8f65aa7
parent a6bebc033aa19c8a62409acab99d8d9d9ec74e3f

Merge "Add title for bookmark shortcut picker"

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>

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