summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-12-15 11:59:40 -0800
committerMichael Kolb <kolby@google.com>2011-12-15 14:50:29 -0800
commitb7e16709dfe32c75c4414286cff9e1884f7c8682 (patch)
tree5406732ceea1fdfdb0fd98bca3f67b673f9cfc05 /src/com/android/browser
parent0b2dc2befd97808992ffc3dac9eae05ec7602171 (diff)
downloadpackages_apps_Browser-b7e16709dfe32c75c4414286cff9e1884f7c8682.zip
packages_apps_Browser-b7e16709dfe32c75c4414286cff9e1884f7c8682.tar.gz
packages_apps_Browser-b7e16709dfe32c75c4414286cff9e1884f7c8682.tar.bz2
fix navscreen animation
Prevent image from jumping when coming out of navscreen by using the visible title height as the target top. Note: there is still a little jump animating to the nav screen this will be fixed by a different CL Change-Id: Id85995e43253579754a8f214fb8596dcd77e7240
Diffstat (limited to 'src/com/android/browser')
-rw-r--r--src/com/android/browser/PhoneUi.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 4da0668..1bc0f77 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -434,7 +434,7 @@ public class PhoneUi extends BaseUi {
mNavScreen.mScroller.finishScroller();
ImageView target = tabview.mImage;
int toLeft = 0;
- int toTop = getTitleBar().getHeight();
+ int toTop = (tab.getWebView() != null) ? tab.getWebView().getVisibleTitleHeight() : 0;
int toRight = mContentView.getWidth();
int width = target.getDrawable().getIntrinsicWidth();
int height = target.getDrawable().getIntrinsicHeight();