summaryrefslogtreecommitdiff
path: root/src/com/android/browser/PhoneUi.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-10-11 13:45:29 -0700
committerJohn Reck <jreck@google.com>2011-10-11 13:45:29 -0700
commitce8bcb0d8fff390451e9c95acd89cc2bbe0f66f7 (patch)
tree104d118c7c170577982abefb70b5240ddfffae8b /src/com/android/browser/PhoneUi.java
parente1e4e1b2ad588f227872468cf7dbe51e647b565e (diff)
downloadBrowser-ce8bcb0d8fff390451e9c95acd89cc2bbe0f66f7.tar.gz
Reset animation state
Bug: 5444751 Change-Id: I1a053cf13f0f01d1f8b1ece2d9abe5efb605273d
Diffstat (limited to 'src/com/android/browser/PhoneUi.java')
-rw-r--r--src/com/android/browser/PhoneUi.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index d39909e0..2fff5fab 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -322,11 +322,17 @@ public class PhoneUi extends BaseUi {
mActiveTab.capture();
if (mAnimScreen == null) {
mAnimScreen = new AnimScreen(mActivity);
+ } else {
+ mAnimScreen.mMain.setAlpha(1f);
+ mAnimScreen.mTitle.setAlpha(1f);
+ mAnimScreen.setScaleFactor(1f);
}
mAnimScreen.set(getTitleBar(), getWebView());
mCustomViewContainer.addView(mAnimScreen.mMain, COVER_SCREEN_PARAMS);
mCustomViewContainer.setVisibility(View.VISIBLE);
mCustomViewContainer.bringToFront();
+ mAnimScreen.mMain.layout(0, 0, mContentView.getWidth(),
+ mContentView.getHeight());
int fromLeft = 0;
int fromTop = getTitleBar().getHeight();
int fromRight = mContentView.getWidth();