commit 0924c0aee3c3a48325e22311ebaf6b5ad99c7980
author Michael Kolb <kolby@google.com> Thu Dec 15 14:57:59 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 15 14:57:59 2011 -0800
tree ba1c5058d53af00d02d251a482c28ba67e0e9808
parent 3241d1bd47d95e2c99168a70544c44af6287bc9e
parent b7e16709dfe32c75c4414286cff9e1884f7c8682

Merge "fix navscreen animation"

src/com/android/browser/PhoneUi.java

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 @@
         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();