commit 904a8bd6faf1965097b4f264595e654a33ac2086
author John Reck <jreck@google.com> Wed Aug 24 11:21:50 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 24 11:21:50 2011 -0700
tree 0ebb0c62b173e8c06f9f82508a9346718f0f786b
parent 9bed7eeb8a8e66a6b49efd190c6b12ddd951af89
parent 5636ca90acbb79c498c4dd0d94a946abe8c0ff52

Merge "Widget resize support"

res/layout/browser_add_bookmark_content.xml

diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 6287ef8..03936c3 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -197,13 +197,6 @@
         android:paddingTop="4dip"
         android:paddingLeft="2dip"
         android:paddingRight="2dip" >
-        <Button android:id="@+id/OK"
-            android:text="@string/save"
-            android:layout_width="0dip"
-            android:layout_gravity="left"
-            android:layout_weight="1"
-            android:maxLines="2"
-            android:layout_height="wrap_content" />
         <Button android:id="@+id/cancel"
             android:text="@string/do_not_save"
             android:layout_width="0dip"
@@ -211,6 +204,13 @@
             android:layout_weight="1"
             android:maxLines="2"
             android:layout_height="wrap_content" />
+        <Button android:id="@+id/OK"
+            android:text="@string/save"
+            android:layout_width="0dip"
+            android:layout_gravity="left"
+            android:layout_weight="1"
+            android:maxLines="2"
+            android:layout_height="wrap_content" />
     </LinearLayout>
 
 </merge>

src/com/android/browser/SnapshotTab.java

diff --git a/src/com/android/browser/SnapshotTab.java b/src/com/android/browser/SnapshotTab.java
index bb4c240..cc6eeb7 100644
--- a/src/com/android/browser/SnapshotTab.java
+++ b/src/com/android/browser/SnapshotTab.java
@@ -81,7 +81,11 @@
 
     @Override
     void addChildTab(Tab child) {
-        throw new IllegalStateException("Snapshot tabs cannot have child tabs!");
+        if (mIsLive) {
+            super.addChildTab(child);
+        } else {
+            throw new IllegalStateException("Snapshot tabs cannot have child tabs!");
+        }
     }
 
     @Override
@@ -95,11 +99,17 @@
 
     @Override
     public ContentValues createSnapshotValues() {
+        if (mIsLive) {
+            return super.createSnapshotValues();
+        }
         return null;
     }
 
     @Override
     public Bundle saveState() {
+        if (mIsLive) {
+            return super.saveState();
+        }
         return null;
     }
 
@@ -202,12 +212,8 @@
 
     @Override
     protected void persistThumbnail() {
-        // Nope
+        if (mIsLive) {
+            super.persistThumbnail();
+        }
     }
-
-    @Override
-    protected void deleteThumbnail() {
-        // Nope
-    }
-
 }