commit 47e7816c134446915692a67940a0cca00bb96c75
author Tony Wickham <twickham@google.com> Tue Jun 23 21:16:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 23 21:16:35 2020 +0000
tree 44bb2e3e7f52c6df871da969fa56e8158354692f
parent 5a0ca31e20654e944d1432964f0ca7b9dca9e5c4
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: I94f70b23dc70eafcd73830309007c6314db0c791

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