commit 5f057a99d6f871f4588f73d05c2f581e1d2aac81
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 23 01:50:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 23 01:50:05 2020 +0000
tree f1c1b2018efa2c62eef4e15d55385b75271b6792
parent 7273d3c346dce2400e9f281ec9dcb6465fd02892
parent 7551b6191fbd65cc5e74f67bc8a0ca559e63fd5d

Merge "Store newGestureState before onConsumerAboutToBeSwitched clears it" into ub-launcher3-rvc-dev am: 7551b6191f

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

Change-Id: If316db050aa0794fb43b892b424598c1ff4e7bbc

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