commit 004df58a3e95fd81c334390af7850517ce02e51a
author John Reck <jreck@google.com> Thu Dec 15 15:01:08 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 15 15:01:08 2011 -0800
tree 5d163516373ae99fabe3a7bdb89f739ba61de7b7
parent 0924c0aee3c3a48325e22311ebaf6b5ad99c7980
parent 1e6a287e0ecb6311faf02a03ad6dc787fc5bad78

Merge "Fix generic filter check"

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

src/com/android/browser/view/PieStackView.java

diff --git a/src/com/android/browser/view/PieStackView.java b/src/com/android/browser/view/PieStackView.java
index ca641f9..7e1922d 100644
--- a/src/com/android/browser/view/PieStackView.java
+++ b/src/com/android/browser/view/PieStackView.java
@@ -84,7 +84,7 @@
 
     @Override
     public void draw(Canvas canvas) {
-        if (mViews != null) {
+        if ((mViews != null) && (mCurrent > -1)) {
             final int n = mViews.size();
             for (int i = 0; i < mCurrent; i++) {
                 drawView(mViews.get(i), canvas);