Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 100ea1d7 authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Automerger Merge Worker
Browse files

Merge "Remove redundant instances of depth controller." into udc-dev am: f898ee47 

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



Change-Id: I69c0ac061d4f16af0058b4c082cf271471d970d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da823e5e f898ee47

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+3 −0
Original line number Diff line number Diff line
@@ -1065,6 +1065,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                    new SurfaceControl.Transaction().remove(dimLayer).apply()));

        }



        backgroundRadiusAnim.addListener(

                AnimatorListeners.forEndCallback(depthController::dispose));



        return backgroundRadiusAnim;

    }

quickstep/src/com/android/launcher3/statehandlers/DepthController.java

+22 −2
Original line number Diff line number Diff line
@@ -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

     */