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

Merge "Clear back callback in SystemUiProxy." into tm-dev am: b6ff87bb99

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

Change-Id: Ie4c9579e315c5add2531d85c1f971ba56f05f622
This commit is contained in:
Shan Huang
2022-03-14 17:02:50 +00:00
committed by Automerger Merge Worker
parent 9142cd1aa2 b6ff87bb99
commit 4be5acc273
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/SystemUiProxy.java
+5 -4
View File
@@ -99,7 +99,7 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
private ILauncherUnlockAnimationController mPendingLauncherUnlockAnimationController;
private IRecentTasksListener mRecentTasksListener;
private final ArrayList<RemoteTransitionCompat> mRemoteTransitions = new ArrayList<>();
private IOnBackInvokedCallback mBackToLaunchCallback;
private IOnBackInvokedCallback mBackToLauncherCallback;
// Used to dedupe calls to SystemUI
private int mLastShelfHeight;
@@ -200,8 +200,8 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
if (mRecentTasksListener != null && mRecentTasks != null) {
registerRecentTasksListener(mRecentTasksListener);
}
if (mBackAnimation != null && mBackToLaunchCallback != null) {
setBackToLauncherCallback(mBackToLaunchCallback);
if (mBackAnimation != null && mBackToLauncherCallback != null) {
setBackToLauncherCallback(mBackToLauncherCallback);
}
if (mPendingSetNavButtonAlpha != null) {
@@ -836,7 +836,7 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
/** Sets the launcher {@link android.window.IOnBackInvokedCallback} to shell */
public void setBackToLauncherCallback(IOnBackInvokedCallback callback) {
mBackToLaunchCallback = callback;
mBackToLauncherCallback = callback;
if (mBackAnimation == null) {
return;
}
@@ -849,6 +849,7 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
/** Clears the previously registered {@link IOnBackInvokedCallback}. */
public void clearBackToLauncherCallback() {
mBackToLauncherCallback = null;
if (mBackAnimation == null) {
return;
}