commit 79f40becb3ab618d0484fe37c95fbd090315a68c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 22 21:54:35 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 22 21:54:35 2018 +0000
tree 7108260bba289837eecc0c259c682fd47dff2ea3
parent 647d8f5bd15ff3fb0f0e05b98b01acc403030305
parent 5c86b5d9cd4543e6d04f8ef7fb1ba8f1c881c7ff

Merge "Synchronizing invalidating interaction handler with the eventQueue." into ub-launcher3-master

src/com/android/launcher3/logging/UserEventDispatcher.java

diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
index db3826b..627115d 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -240,7 +240,7 @@
 
     public void logActionOnControl(int action, int controlType, @Nullable View controlInContainer,
                                    int parentContainerType) {
-        final LauncherEvent event = controlInContainer == null
+        final LauncherEvent event = (controlInContainer == null && parentContainerType < 0)
                 ? newLauncherEvent(newTouchAction(action), newTarget(Target.Type.CONTROL))
                 : newLauncherEvent(newTouchAction(action), newTarget(Target.Type.CONTROL),
                         newTarget(Target.Type.CONTAINER));