Merge "Don't hide the navscreen when going to bookmarks"

1 files changed, 11 insertions, 8 deletions

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 7321267c..bb6b63e1 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -153,14 +153,6 @@ public class PhoneUi extends BaseUi {
         }
     }
 
-    @Override
-    public void showComboView(ComboViews startWith, Bundle extras) {
-        if (mNavScreen != null) {
-            hideNavScreen(false);
-        }
-        super.showComboView(startWith, extras);
-    }
-
     // menu handling callbacks
 
     @Override
@@ -309,4 +301,15 @@ public class PhoneUi extends BaseUi {
         return true;
     }
 
+    @Override
+    public boolean isWebShowing() {
+        return super.isWebShowing() && mNavScreen == null;
+    }
+
+    @Override
+    public void showWeb(boolean animate) {
+        super.showWeb(animate);
+        hideNavScreen(animate);
+    }
+
 }