summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-07-07 16:53:12 -0700
committerJohn Reck <jreck@google.com>2011-07-07 16:53:12 -0700
commit1e822eba4fea39d926c92e304626efd7cc769d53 (patch)
tree9682dcb32ab07c51d451bab66c928a8cb387a6a0
parent180d76d96625a92e0dcaeaaf7ab94dda4eb238b8 (diff)
downloadpackages_apps_browser-1e822eba4fea39d926c92e304626efd7cc769d53.zip
packages_apps_browser-1e822eba4fea39d926c92e304626efd7cc769d53.tar.gz
packages_apps_browser-1e822eba4fea39d926c92e304626efd7cc769d53.tar.bz2
Don't show URL bar during pinch zoom
Bug: 4984157 Change-Id: Ice03f3a497fbf16401fab0b2245c9ae1c168b1fb
-rw-r--r--src/com/android/browser/BaseUi.java3
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);