commit 3abc0723f7b8f960412c9769e92f75a30eadc99c
author Ben Murdoch <benm@google.com> Fri Jul 08 10:24:04 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 08 10:24:04 2011 -0700
tree c73d611f5474b3c66ed40e910df9911465ea14e6
parent 23ba109e5f05d0306059f9e029991f0e45f94a2f
parent 621980e6e3d50804e98b055ea446a96c11a34347

Merge "Fix capitalization of auto-fill setup dialog."

res/drawable-mdpi/geolocation_permissions_prompt_background.9.png

diff --git a/res/drawable-mdpi/geolocation_permissions_prompt_background.9.png b/res/drawable-mdpi/geolocation_permissions_prompt_background.9.png
new file mode 100644
index 0000000..44a2e2f
--- /dev/null
+++ b/res/drawable-mdpi/geolocation_permissions_prompt_background.9.png
Binary files differ

src/com/android/browser/BaseUi.java

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 @@
             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);