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

Commit 31c35df6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove keyguard state callback onViewDetached." into sc-dev am: d232ab98 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15273145

Change-Id: I3a5021aab88299f34488bcd1c0d2ee62db9d8302
parents 249c602e d232ab98

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+15 −12
Original line number Diff line number Diff line
@@ -79,18 +79,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
                dozeParameters, unlockedScreenOffAnimationController, /* animateYPos= */ true);

        mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;

        mSmartspaceTransitionController = smartspaceTransitionController;



        mKeyguardStateController.addCallback(new KeyguardStateController.Callback() {

            @Override

            public void onKeyguardShowingChanged() {

                // If we explicitly re-show the keyguard, make sure that all the child views are

                // visible. They might have been animating out as part of the SmartSpace shared

                // element transition.

                if (keyguardStateController.isShowing()) {

                    mView.setChildrenAlphaExcludingClockView(1f);

                }

            }

        });

    }



    @Override
@@ -102,12 +90,14 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
    protected void onViewAttached() {

        mKeyguardUpdateMonitor.registerCallback(mInfoCallback);

        mConfigurationController.addCallback(mConfigurationListener);

        mKeyguardStateController.addCallback(mKeyguardStateControllerCallback);

    }



    @Override

    protected void onViewDetached() {

        mKeyguardUpdateMonitor.removeCallback(mInfoCallback);

        mConfigurationController.removeCallback(mConfigurationListener);

        mKeyguardStateController.removeCallback(mKeyguardStateControllerCallback);

    }



    /**
@@ -276,6 +266,19 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
        }

    };



    private KeyguardStateController.Callback mKeyguardStateControllerCallback =

            new KeyguardStateController.Callback() {

        @Override

        public void onKeyguardShowingChanged() {

            // If we explicitly re-show the keyguard, make sure that all the child views are

            // visible. They might have been animating out as part of the SmartSpace shared

            // element transition.

            if (mKeyguardStateController.isShowing()) {

                mView.setChildrenAlphaExcludingClockView(1f);

            }

        }

    };



    /**

     * Rect that specifies how KSV should be clipped, on its parent's coordinates.

     */