diff options
| author | John Reck <jreck@google.com> | 2011-07-08 10:15:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-08 10:15:21 -0700 |
| commit | 23ba109e5f05d0306059f9e029991f0e45f94a2f (patch) | |
| tree | 3c2d1028e837174e0ce88693dbebfd39e6e44ca6 /src | |
| parent | 1b652acc1ac3f6e7d5c2222fdd2a81285e9b2e03 (diff) | |
| parent | 1e822eba4fea39d926c92e304626efd7cc769d53 (diff) | |
| download | packages_apps_Browser-23ba109e5f05d0306059f9e029991f0e45f94a2f.zip packages_apps_Browser-23ba109e5f05d0306059f9e029991f0e45f94a2f.tar.gz packages_apps_Browser-23ba109e5f05d0306059f9e029991f0e45f94a2f.tar.bz2 | |
Merge "Don't show URL bar during pinch zoom"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BaseUi.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index 0777efd..8e24353 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -838,7 +838,8 @@ public abstract class BaseUi implements UI, OnTouchListener { break; case MotionEvent.ACTION_MOVE: WebView web = (WebView) v; - if (!isTitleBarShowing() + if (event.getPointerCount() == 1 + && !isTitleBarShowing() && web.getVisibleTitleHeight() == 0 && event.getY() > (mInitialY + mTitlebarScrollTriggerSlop)) { mHandler.removeMessages(MSG_HIDE_TITLEBAR); |