commit 1a1ca9a634ab50225d80592022084dbbade02c4d
author Michael Kolb <kolby@google.com> Wed Nov 09 19:34:48 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 09 19:34:48 2011 +0000
tree 76bde30ce8bedf72e4e8ffda3200c7891e956206
parent 65ae8361b66f21af61971c56b2b3773665c92528
parent 50c04abe67ac1eebd5a07777b5395b244d90b9ac

am 50c04abe: Merge "Add Monkey protection" into ics-mr1

* commit '50c04abe67ac1eebd5a07777b5395b244d90b9ac':
  Add Monkey protection

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(),