| commit | 532b962a034762b231c0fbb95e145459897e45d5 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Sat Aug 15 00:20:36 2020 +0000 |
| committer | Tony Wickham <twickham@google.com> | Sat Aug 15 00:20:44 2020 +0000 |
| tree | 31bdb7439cc193b89b3512bc329a8d760ca1b534 | |
| parent | 87be28a67b12c5b12a89155c794c0ddd438e8750 [diff] | |
| parent | 107fe60f6ef5b3336ece35122650d9ccc1c69913 [diff] |
resolve merge conflicts of 107fe60f6ef5b3336ece35122650d9ccc1c69913 to ub-launcher3-master Change-Id: I9a1c52e66edd627fd54cc3cb423fa28a6175f8ac
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java index dc7ba97..591d3ca 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -165,6 +165,11 @@ mMotionPauseDetector.clear(); 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