commit fa5559ff647327644f5fa1251b8f1241bff3f0ce
author Tony Wickham <twickham@google.com> Tue Jun 23 21:02:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 23 21:02:51 2020 +0000
tree ab9aab03a0dd74ab8a5e54bdbbd4ade93c021bba
parent 3309850150035755968b36502d5a04fa3ef2175f
parent b47a99e3ccdacc77eba8c4b05b2785e1f7f0ab18

Store newGestureState before onConsumerAboutToBeSwitched clears it am: b47a99e3cc

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

Change-Id: I8d0a8f74ee677e5063c6ff84288bc7bd8e7a517c

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());