commit fbb40a44d41a8c2c405db0fd0be178587bb9dcfd
author The Android Automerger <android-build@android.com> Wed Nov 09 06:47:22 2011 -0800
committer The Android Automerger <android-build@android.com> Wed Nov 09 06:47:22 2011 -0800
tree f8f534c542bf1df4fbb13282be72ae005a42b2f0
parent 50c04abe67ac1eebd5a07777b5395b244d90b9ac
parent e4f145d8b33b8863a4922043ca2f929ea93d8298

merge in ics-mr1-release history after reset to ics-mr1

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index a13eca3..37d0b34 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -332,7 +332,9 @@
             mAnimScreen.setScaleFactor(1f);
         }
         mAnimScreen.set(getTitleBar(), getWebView());
-        mCustomViewContainer.addView(mAnimScreen.mMain, COVER_SCREEN_PARAMS);
+        if (mAnimScreen.mMain.getParent() == null) {
+            mCustomViewContainer.addView(mAnimScreen.mMain, COVER_SCREEN_PARAMS);
+        }
         mCustomViewContainer.setVisibility(View.VISIBLE);
         mCustomViewContainer.bringToFront();
         mAnimScreen.mMain.layout(0, 0, mContentView.getWidth(),