commit b3ad0edc1476ae1562bb5e0b26f253b2e504285f
author Tony Wickham <twickham@google.com> Thu Apr 05 20:25:54 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 05 20:25:54 2018 +0000
tree 8888c44d59ce03980ec7dcbf24a489b5e1aae161
parent d3897cbab7f3f49fb388fe83fd7030ea14a73f83
parent c51493d2815cda49fa995209bac21b889e55881d

Merge "Don't let touches go through popup when notification is present" into ub-launcher3-master

src/com/android/launcher3/popup/PopupContainerWithArrow.java

diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 422a4ec..454fc7d 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -129,7 +129,7 @@
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
         if (mNotificationItemView != null) {
-            return mNotificationItemView.onTouchEvent(ev);
+            return mNotificationItemView.onTouchEvent(ev) || super.onTouchEvent(ev);
         }
         return super.onTouchEvent(ev);
     }