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

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

Merge "[Misc] Only create KeyguardStatusBarViewController once inside... 

Merge "[Misc] Only create KeyguardStatusBarViewController once inside NotificationPanelViewController." into sc-v2-dev am: 9175a4b7

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

Change-Id: I2b8734330d4f02bf3b2bc2d6ae62a49fa0f6c45e
parents fd36648c 9175a4b7

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java

+0 −6
Original line number Diff line number Diff line
@@ -107,12 +107,6 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView> 


    @Override

    protected void onViewDetached() {

        destroy();

    }



    @Override

    public void destroy() {

        super.destroy();

        mConfigurationController.removeCallback(mConfigurationListener);

        unsubscribeFromTunerUpdates();

        mCurrentUserTracker.stopTracking();

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java

+0 −11
Original line number Diff line number Diff line
@@ -159,17 +159,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 


    @Override

    protected void onViewDetached() {

        destroy();

    }



    @Override

    public void destroy() {

        // Don't receive future #onViewAttached calls so that we don't accidentally have two

        // controllers registered for the same view.

        // TODO(b/194181195): This shouldn't be necessary.

        super.destroy();

        mBatteryMeterViewController.destroy();



        mConfigurationController.removeCallback(mConfigurationListener);

        mAnimationScheduler.removeCallback(mAnimationCallback);

        mUserInfoController.removeCallback(mOnUserInfoChangedListener);

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+6 −13
Original line number Diff line number Diff line
@@ -881,10 +881,14 @@ public class NotificationPanelViewController extends PanelViewController { 
            }

        }



        mKeyguardStatusBarViewController =

                mKeyguardStatusBarViewComponentFactory.build(mKeyguardStatusBar)

                        .getKeyguardStatusBarViewController();

        mKeyguardStatusBarViewController.init();



        updateViewControllers(

                mView.findViewById(R.id.keyguard_status_view),

                userAvatarView,

                mKeyguardStatusBar,

                keyguardUserSwitcherView);

        mNotificationContainerParent = mView.findViewById(R.id.notification_container_parent);

        NotificationStackScrollLayout stackScrollLayout = mView.findViewById(
@@ -976,7 +980,6 @@ public class NotificationPanelViewController extends PanelViewController { 


    private void updateViewControllers(KeyguardStatusView keyguardStatusView,

            UserAvatarView userAvatarView,

            KeyguardStatusBarView keyguardStatusBarView,

            KeyguardUserSwitcherView keyguardUserSwitcherView) {

        // Re-associate the KeyguardStatusViewController

        KeyguardStatusViewComponent statusViewComponent =
@@ -984,16 +987,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        mKeyguardStatusViewController = statusViewComponent.getKeyguardStatusViewController();

        mKeyguardStatusViewController.init();



        KeyguardStatusBarViewComponent statusBarViewComponent =

                mKeyguardStatusBarViewComponentFactory.build(keyguardStatusBarView);

        if (mKeyguardStatusBarViewController != null) {

            // TODO(b/194181195): This shouldn't be necessary.

            mKeyguardStatusBarViewController.destroy();

        }

        mKeyguardStatusBarViewController =

                statusBarViewComponent.getKeyguardStatusBarViewController();

        mKeyguardStatusBarViewController.init();



        if (mKeyguardUserSwitcherController != null) {

            // Try to close the switcher so that callbacks are triggered if necessary.

            // Otherwise, NPV can get into a state where some of the views are still hidden
@@ -1153,7 +1146,7 @@ public class NotificationPanelViewController extends PanelViewController { 


        mBigClockContainer.removeAllViews();

        updateViewControllers(mView.findViewById(R.id.keyguard_status_view), userAvatarView,

                mKeyguardStatusBar, keyguardUserSwitcherView);

                keyguardUserSwitcherView);



        // Update keyguard bottom area

        int index = mView.indexOfChild(mKeyguardBottomArea);

packages/SystemUI/src/com/android/systemui/util/ViewController.java

+0 −10
Original line number Diff line number Diff line
@@ -109,16 +109,6 @@ public abstract class ViewController<T extends View> { 
        }

    }



    /**

     * Destroys this controller so that it never receives view attach and detach events again.

     * Does nothing if the view is null.

     */

    public void destroy() {

        if (mView != null) {

            mView.removeOnAttachStateChangeListener(mOnAttachStateListener);

        }

    }



    /**

     * Called when the view is attached and a call to {@link #init()} has been made in either order.

     */