| commit | bf68d13368245730d466b879d8cd18681c66c3e2 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Tue Jun 23 21:30:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 21:30:41 2020 +0000 |
| tree | 44bb2e3e7f52c6df871da969fa56e8158354692f | |
| parent | 7f004c66c7d0ede9a0711a4244f3f507d89dbdeb [diff] | |
| parent | b2676f22d9af5d3407fc580720cdaf24440a4681 [diff] |
Store newGestureState before onConsumerAboutToBeSwitched clears it am: b47a99e3cc am: fa5559ff64 am: b2676f22d9 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11972618 Change-Id: Ia7e682c0715ae83844f15c40dbc49fd18e38ee82
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());