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

Merge "Correctly disposing of LauncherUnlockAnimationController" into udc-dev am: 60ad6b5abb

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

Change-Id: I3897787b6d00b06dde8a0b0f62e049005290fe3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sebastián Franco
2023-04-03 23:10:39 +00:00
committed by Automerger Merge Worker
parent 9a97324372 60ad6b5abb
commit b951e44d2c
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/SystemUiProxy.java
+7 -21
View File
@@ -218,29 +218,15 @@ public class SystemUiProxy implements ISystemUiProxy {
mUnfoldAnimation = unfoldAnimation; mUnfoldAnimation = unfoldAnimation;
linkToDeath(); linkToDeath();
// re-attach the listeners once missing due to setProxy has not been initialized yet. // re-attach the listeners once missing due to setProxy has not been initialized yet.
if (mPipAnimationListener != null && mPip != null) { setPipAnimationListener(mPipAnimationListener);
setPipAnimationListener(mPipAnimationListener); registerSplitScreenListener(mSplitScreenListener);
} setStartingWindowListener(mStartingWindowListener);
if (mSplitScreenListener != null && mSplitScreen != null) { setLauncherUnlockAnimationController(mLauncherUnlockAnimationController);
registerSplitScreenListener(mSplitScreenListener);
}
if (mStartingWindowListener != null && mStartingWindow != null) {
setStartingWindowListener(mStartingWindowListener);
}
if (mSysuiUnlockAnimationController != null && mLauncherUnlockAnimationController != null) {
setLauncherUnlockAnimationController(mLauncherUnlockAnimationController);
}
new LinkedHashMap<>(mRemoteTransitions).forEach(this::registerRemoteTransition); new LinkedHashMap<>(mRemoteTransitions).forEach(this::registerRemoteTransition);
setupTransactionQueue(); setupTransactionQueue();
if (mRecentTasksListener != null && mRecentTasks != null) { registerRecentTasksListener(mRecentTasksListener);
registerRecentTasksListener(mRecentTasksListener); setBackToLauncherCallback(mBackToLauncherCallback, mBackToLauncherRunner);
} setUnfoldAnimationListener(mUnfoldAnimationListener);
if (mBackAnimation != null && mBackToLauncherCallback != null) {
setBackToLauncherCallback(mBackToLauncherCallback, mBackToLauncherRunner);
}
if (unfoldAnimation != null && mUnfoldAnimationListener != null) {
setUnfoldAnimationListener(mUnfoldAnimationListener);
}
} }
public void clearProxy() { public void clearProxy() {