commit | 107fe60f6ef5b3336ece35122650d9ccc1c69913 | [log] [tgz] |
---|---|---|
author | Tony Wickham <twickham@google.com> | Wed Aug 12 12:30:00 2020 -0700 |
committer | Tony Wickham <twickham@google.com> | Fri Aug 14 22:49:18 2020 +0000 |
tree | c8afa18a412c491b071678b8d1832e285b43d638 | |
parent | 6c1a88f1720a102d8a3ef94073754b7cd163d6a8 [diff] |
Ensure we clearState() when going to Overview from home We need to do this before potentially starting another interaction during the animation, or we could end up in an inconsistent state. Fixes: 160759508 Change-Id: Ia28dceddcc258679fc0b968f5a83fae5ef3f5acb
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java index dbff20a..8f0f683 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -136,6 +136,11 @@ public void onDragEnd(float velocity) { super.onDragEnd(velocity); mNormalToHintOverviewScrimAnimator = null; + if (mLauncher.isInState(OVERVIEW)) { + // Normally we would cleanup the state based on mCurrentAnimation, but since we stop + // using that when we pause to go to Overview, we need to clean up ourselves. + clearState(); + } } @Override