commit b2676f22d9af5d3407fc580720cdaf24440a4681
author Tony Wickham <twickham@google.com> Tue Jun 23 21:16:26 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 23 21:16:26 2020 +0000
tree ab9aab03a0dd74ab8a5e54bdbbd4ade93c021bba
parent 633f0ca00d0bc642db070792101ddf711954f995
parent fa5559ff647327644f5fa1251b8f1241bff3f0ce

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

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

Change-Id: I3a0fd6a4af4c210a1b91635f438b310a68e7a39d

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 bfdddbd..6e0b517 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -480,8 +480,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());