commit 5d43ce897758b7cb5deadc1203717b965334784c
author John Reck <jreck@google.com> Tue Jun 21 17:16:51 2011 -0700
committer John Reck <jreck@google.com> Wed Jun 22 10:19:03 2011 -0700
tree 29b25c54d348ab26b816c02594329dcffb798b9f
parent 1d9606b591f3c0f6ee7e51c27a5d0ac0f1d9d46a

Implement scroll up trigger titlebar

 On phones, when scroll up show the title bar

Change-Id: I432bdddf693a351be9c6223e26804452b09d783f

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 25cdbd9..84ad6ea 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -35,7 +35,7 @@
 /**
  * Ui for xlarge screen sizes
  */
-public class XLargeUi extends BaseUi implements ScrollListener {
+public class XLargeUi extends BaseUi {
 
     private static final String LOGTAG = "XLargeUi";
 
@@ -153,6 +153,7 @@
 
     @Override
     public void onScroll(int visibleTitleHeight, boolean userInitiated) {
+        super.onScroll(visibleTitleHeight, userInitiated);
         mTabBar.onScroll(visibleTitleHeight, userInitiated);
     }
 
@@ -192,13 +193,7 @@
                 captureTab(mActiveTab);
             }
         }
-        super.setActiveTab(tab, true);
-        setActiveTab(tab, true);
-        mTitleBar.setSkipTitleBarAnimations(false);
-    }
-
-    @Override
-    void setActiveTab(Tab tab, boolean needsAttaching) {
+        super.setActiveTab(tab);
         BrowserWebView view = (BrowserWebView) tab.getWebView();
         // TabControl.setCurrentTab has been called before this,
         // so the tab is guaranteed to have a webview
@@ -226,6 +221,7 @@
         }
         updateLockIconToLatest(tab);
         tab.getTopWindow().requestFocus();
+        mTitleBar.setSkipTitleBarAnimations(false);
     }
 
     @Override
@@ -282,10 +278,6 @@
         }
     }
 
-    public boolean isEditingUrl() {
-        return mTitleBar.isEditingUrl();
-    }
-
     @Override
     protected TitleBarBase getTitleBar() {
         return mTitleBar;