commit cb2473cf3f7f16feaff8078e3d04be59ec74d6b3
author Tracy Zhou <tracyzhou@google.com> Tue Jun 23 23:09:09 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 23 23:09:09 2020 +0000
tree f5f2c67f61d3b98210e4dfa513dc87ea4b01c676
parent b47a99e3ccdacc77eba8c4b05b2785e1f7f0ab18
parent 0c8823896677f91e16b5fcbd374a3d2ca3e801d3

Merge "Disable grid option feature in ThemePicker" into rvc-dev

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