summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/PhoneUi.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-06-21 17:16:51 -0700
committerJohn Reck <jreck@google.com>2011-06-22 10:19:03 -0700
commit5d43ce897758b7cb5deadc1203717b965334784c (patch)
tree29b25c54d348ab26b816c02594329dcffb798b9f /src/com/android/browser/PhoneUi.java
parent1d9606b591f3c0f6ee7e51c27a5d0ac0f1d9d46a (diff)
downloadpackages_apps_Browser-5d43ce897758b7cb5deadc1203717b965334784c.tar.gz
packages_apps_Browser-5d43ce897758b7cb5deadc1203717b965334784c.tar.bz2
packages_apps_Browser-5d43ce897758b7cb5deadc1203717b965334784c.zip
Implement scroll up trigger titlebar
On phones, when scroll up show the title bar Change-Id: I432bdddf693a351be9c6223e26804452b09d783f
Diffstat (limited to 'src/com/android/browser/PhoneUi.java')
-rw-r--r--src/com/android/browser/PhoneUi.java11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index d7f84b50d..d0b0f77b7 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -33,7 +33,6 @@ import android.widget.FrameLayout;
public class PhoneUi extends BaseUi {
private static final String LOGTAG = "PhoneUi";
- private static final float NAV_TAB_SCALE = 0.75f;
private TitleBarPhone mTitleBar;
private ActiveTabsPage mActiveTabsPage;
@@ -134,7 +133,7 @@ public class PhoneUi extends BaseUi {
mTitleBar.setProgress(progress);
if (progress == 100) {
if (!mOptionsMenuOpen || !mExtendedMenuOpen) {
- hideTitleBar();
+ suggestHideTitleBar();
if (mUseQuickControls) {
mTitleBar.setShowProgressOnly(false);
}
@@ -154,12 +153,7 @@ public class PhoneUi extends BaseUi {
@Override
public void setActiveTab(final Tab tab) {
captureTab(mActiveTab);
- super.setActiveTab(tab, true);
- setActiveTab(tab, true);
- }
-
- @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
@@ -176,6 +170,7 @@ public class PhoneUi extends BaseUi {
if (mTitleBar.getParent() == null) {
view.setEmbeddedTitleBar(mTitleBar);
}
+ view.setScrollListener(this);
}
if (tab.isInVoiceSearchMode()) {
showVoiceTitleBar(tab.getVoiceDisplayTitle(), tab.getVoiceSearchResults());