PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove mOnRecentsScrollListener when continuing quick switch gesture" into sc-dev am: 1eea52296b

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

Change-Id: I69f77a897b43b3990a85bf1f1381c64c178f380a
This commit is contained in:
Tony Wickham
2021-05-13 20:01:06 +00:00
committed by Automerger Merge Worker
parent 8acafe1292 1eea52296b
commit bbc5dfffc0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+6 -1
View File
@@ -1378,7 +1378,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
private void invalidateHandlerWithLauncher() { private void invalidateHandlerWithLauncher() {
endLauncherTransitionController(); endLauncherTransitionController();
mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
mRecentsView.onGestureAnimationEnd(); mRecentsView.onGestureAnimationEnd();
resetLauncherListeners(); resetLauncherListeners();
} }
@@ -1393,12 +1392,18 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
} }
} }
/**
* Unlike invalidateHandlerWithLauncher, this is called even when switching consumers, e.g. on
* continued quick switch gesture, which cancels the previous handler but doesn't invalidate it.
*/
private void resetLauncherListeners() { private void resetLauncherListeners() {
// Reset the callback for deferred activity launches // Reset the callback for deferred activity launches
if (!LIVE_TILE.get()) { if (!LIVE_TILE.get()) {
mActivityInterface.setOnDeferredActivityLaunchCallback(null); mActivityInterface.setOnDeferredActivityLaunchCallback(null);
} }
mActivity.getRootView().setOnApplyWindowInsetsListener(null); mActivity.getRootView().setOnApplyWindowInsetsListener(null);
mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
} }
private void resetStateForAnimationCancel() { private void resetStateForAnimationCancel() {