diff options
| author | Michael Kolb <kolby@google.com> | 2011-11-08 10:15:19 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-08 10:15:19 -0800 |
| commit | 50c04abe67ac1eebd5a07777b5395b244d90b9ac (patch) | |
| tree | f8f534c542bf1df4fbb13282be72ae005a42b2f0 /src/com/android/browser | |
| parent | e7c44c2871ea595c8c3f879f19e8790083dbb84c (diff) | |
| parent | a30e4fb67322f444475de6103b66ce594ef39e04 (diff) | |
| download | packages_apps_Browser-50c04abe67ac1eebd5a07777b5395b244d90b9ac.tar.gz packages_apps_Browser-50c04abe67ac1eebd5a07777b5395b244d90b9ac.tar.bz2 packages_apps_Browser-50c04abe67ac1eebd5a07777b5395b244d90b9ac.zip | |
Merge "Add Monkey protection" into ics-mr1
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/PhoneUi.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index a13eca33e..37d0b3415 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -332,7 +332,9 @@ public class PhoneUi extends BaseUi { 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(), |