mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 18:58:19 +00:00
Merge "Remove redundant instances of depth controller." into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f898ee474c
@@ -1065,6 +1065,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
new SurfaceControl.Transaction().remove(dimLayer).apply()));
|
||||
}
|
||||
|
||||
backgroundRadiusAnim.addListener(
|
||||
AnimatorListeners.forEndCallback(depthController::dispose));
|
||||
|
||||
return backgroundRadiusAnim;
|
||||
}
|
||||
|
||||
|
||||
@@ -84,8 +84,7 @@ public class DepthController extends BaseDepthController implements StateHandler
|
||||
|
||||
@Override
|
||||
public void onViewDetachedFromWindow(View view) {
|
||||
CrossWindowBlurListeners.getInstance().removeListener(mCrossWindowBlurListener);
|
||||
mLauncher.getScrimView().removeOpaquenessListener(mOpaquenessListener);
|
||||
removeSecondaryListeners();
|
||||
}
|
||||
};
|
||||
rootView.addOnAttachStateChangeListener(mOnAttachListener);
|
||||
@@ -95,6 +94,27 @@ public class DepthController extends BaseDepthController implements StateHandler
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Cleans up after this controller so it can be garbage collected without leaving traces.
|
||||
*/
|
||||
public void dispose() {
|
||||
removeSecondaryListeners();
|
||||
|
||||
if (mLauncher.getRootView() != null && mOnAttachListener != null) {
|
||||
mLauncher.getRootView().removeOnAttachStateChangeListener(mOnAttachListener);
|
||||
mOnAttachListener = null;
|
||||
}
|
||||
}
|
||||
|
||||
private void removeSecondaryListeners() {
|
||||
if (mCrossWindowBlurListener != null) {
|
||||
CrossWindowBlurListeners.getInstance().removeListener(mCrossWindowBlurListener);
|
||||
}
|
||||
if (mOpaquenessListener != null) {
|
||||
mLauncher.getScrimView().removeOpaquenessListener(mOpaquenessListener);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets if the underlying activity is started or not
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user