From: Tony Wickham <twickham@google.com>
Date: Thu, 16 Feb 2017 00:03:27 +0000 (-0800)
Subject: Ignore touches before notification is populated
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7aefaae5d9e0938e5268238d397d40d8959dc7ba;p=android-x86%2Fpackages-apps-Launcher3.git

Ignore touches before notification is populated

Bug: 35398757
Change-Id: I24f1b66787af7c7caeb325e9a1f3e6ef86e62b81
---

diff --git a/src/com/android/launcher3/notification/NotificationItemView.java b/src/com/android/launcher3/notification/NotificationItemView.java
index 639447dc3..c9b3940b8 100644
--- a/src/com/android/launcher3/notification/NotificationItemView.java
+++ b/src/com/android/launcher3/notification/NotificationItemView.java
@@ -83,12 +83,20 @@ public class NotificationItemView extends PopupItemView implements LogContainerP
 
     @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);
     }