commit fd2e619a2fb263315816b3579a9c6751c398132d
author Doris Liu <tianliu@google.com> Tue Apr 23 11:00:37 2013 -0700
committer Doris Liu <tianliu@google.com> Tue Apr 23 13:28:59 2013 -0700
tree 7a4b8cc8a5cfc959b1a4e1cbf2c0df4de16c48b4
parent 37c006fc72a6a3f849545587ad85c82466862bc4

Fix for popuping being hard to dismiss

Bug: 8688503
Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3

src/com/android/camera/PhotoUI.java

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index fd148ba..ad04a4e 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -389,9 +389,7 @@
     }
 
     public boolean dispatchTouchEvent(MotionEvent m) {
-        if (mPopup != null) {
-            return mActivity.superDispatchTouchEvent(m);
-        } else if (mGestures != null && mRenderOverlay != null) {
+        if (mGestures != null && mRenderOverlay != null) {
             return mGestures.dispatchTouch(m);
         }
         return false;
@@ -462,6 +460,7 @@
                 LayoutParams.WRAP_CONTENT);
         lp.gravity = Gravity.CENTER;
         ((FrameLayout) mRootView).addView(mPopup, lp);
+        mGestures.addTouchReceiver(mPopup);
     }
 
     public void dismissPopup(boolean topPopupOnly) {
@@ -475,6 +474,7 @@
         }
         setShowMenu(fullScreen);
         if (mPopup != null) {
+            mGestures.removeTouchReceiver(mPopup);
             ((FrameLayout) mRootView).removeView(mPopup);
             mPopup = null;
         }

src/com/android/camera/PreviewGestures.java

diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index 90ab075..0b80ff6 100644
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -128,6 +128,11 @@
         mReceivers.add(v);
     }
 
+    public void removeTouchReceiver(View v) {
+        if (mReceivers == null || v == null) return;
+        mReceivers.remove(v);
+    }
+
     public void addUnclickableArea(View v) {
         if (mUnclickableAreas == null) {
             mUnclickableAreas = new ArrayList<View>();

src/com/android/camera/VideoUI.java

diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 79150e9..1da4c24 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -295,6 +295,7 @@
                 LayoutParams.WRAP_CONTENT);
         lp.gravity = Gravity.CENTER;
         ((FrameLayout) mRootView).addView(mPopup, lp);
+        mGestures.addTouchReceiver(mPopup);
     }
 
     public void dismissPopup(boolean topLevelOnly) {
@@ -308,6 +309,7 @@
         }
         setShowMenu(fullScreen);
         if (mPopup != null) {
+            mGestures.removeTouchReceiver(mPopup);
             ((FrameLayout) mRootView).removeView(mPopup);
             mPopup = null;
         }
@@ -486,10 +488,8 @@
     }
 
     public boolean dispatchTouchEvent(MotionEvent m) {
-        if (mPopup == null && mGestures != null && mRenderOverlay != null) {
+        if (mGestures != null && mRenderOverlay != null) {
             return mGestures.dispatchTouch(m);
-        } else if (mPopup != null) {
-            return mActivity.superDispatchTouchEvent(m);
         }
         return false;
     }