commit 333e41932b2f3c2966237157b5a06e90f8ee404c
author Tony Wickham <twickham@google.com> Tue Jun 23 21:47:30 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 23 21:47:30 2020 +0000
tree 25b66c2fdf516e5a43698d690bf10890c2f26200
parent cadb94983be5ab558202041a053eb4b67ccf3c01
parent bf68d13368245730d466b879d8cd18681c66c3e2

Store newGestureState before onConsumerAboutToBeSwitched clears it am: b47a99e3cc am: fa5559ff64 am: b2676f22d9 am: bf68d13368

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11972618

Change-Id: Id271c5227db2067c4db596f219d56dc37c06b305

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index ee49acc..a3705fd 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -490,8 +490,9 @@
                 // Clone the previous gesture state since onConsumerAboutToBeSwitched might trigger
                 // onConsumerInactive and wipe the previous gesture state
                 GestureState prevGestureState = new GestureState(mGestureState);
-                mGestureState = createGestureState(mGestureState);
+                GestureState newGestureState = createGestureState(mGestureState);
                 mConsumer.onConsumerAboutToBeSwitched();
+                mGestureState = newGestureState;
                 mConsumer = newConsumer(prevGestureState, mGestureState, event);
 
                 ActiveGestureLog.INSTANCE.addLog("setInputConsumer: " + mConsumer.getName());