commit 05661918eb54ed76081a7230ab0d51bdf9adc001
author Tony Wickham <twickham@google.com> Thu Feb 16 16:38:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 16 16:38:59 2017 +0000
tree 41e3c97c644f1a0550bb712c439df07da8efc1e5
parent 0891d1fd9bb1eb67d608aec786f764b265b2f87a
parent 7aefaae5d9e0938e5268238d397d40d8959dc7ba

Merge "Ignore touches before notification is populated" into ub-launcher3-master

src/com/android/launcher3/notification/NotificationItemView.java

diff --git a/src/com/android/launcher3/notification/NotificationItemView.java b/src/com/android/launcher3/notification/NotificationItemView.java
index 639447d..c9b3940 100644
--- a/src/com/android/launcher3/notification/NotificationItemView.java
+++ b/src/com/android/launcher3/notification/NotificationItemView.java
@@ -83,12 +83,20 @@
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (mMainView.getNotificationInfo() == null) {
+            // The notification hasn't been populated yet.
+            return false;
+        }
         getParent().requestDisallowInterceptTouchEvent(true);
         return mSwipeHelper.onInterceptTouchEvent(ev);
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
+        if (mMainView.getNotificationInfo() == null) {
+            // The notification hasn't been populated yet.
+            return false;
+        }
         return mSwipeHelper.onTouchEvent(ev) || super.onTouchEvent(ev);
     }