summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/PhoneUi.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-06-30 09:23:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-30 09:23:53 -0700
commit4399b13ca463824bbab1ba422f4004cff100b483 (patch)
treebe89af77694712be525fe133dff331b8586b629c /src/com/android/browser/PhoneUi.java
parentf64f0f0632f9166fb084d5d7e26ad198f66c31aa (diff)
parentbf2ec206e8743467961da3e857b07aad6c50cd67 (diff)
downloadpackages_apps_browser-4399b13ca463824bbab1ba422f4004cff100b483.zip
packages_apps_browser-4399b13ca463824bbab1ba422f4004cff100b483.tar.gz
packages_apps_browser-4399b13ca463824bbab1ba422f4004cff100b483.tar.bz2
Merge "Always trigger URL bar on scroll down gesture"
Diffstat (limited to 'src/com/android/browser/PhoneUi.java')
-rw-r--r--src/com/android/browser/PhoneUi.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index d0b0f77..aedd712 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -36,7 +36,6 @@ public class PhoneUi extends BaseUi {
private TitleBarPhone mTitleBar;
private ActiveTabsPage mActiveTabsPage;
- private boolean mUseQuickControls;
private PieControl mPieControl;
private NavScreen mNavScreen;
@@ -164,13 +163,11 @@ public class PhoneUi extends BaseUi {
// Request focus on the top window.
if (mUseQuickControls) {
mPieControl.forceToTop(mContentView);
- view.setScrollListener(null);
} else {
// check if title bar is already attached by animation
if (mTitleBar.getParent() == null) {
view.setEmbeddedTitleBar(mTitleBar);
}
- view.setScrollListener(this);
}
if (tab.isInVoiceSearchMode()) {
showVoiceTitleBar(tab.getVoiceDisplayTitle(), tab.getVoiceSearchResults());