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

Commit be601fbd authored by Heemin Seog's avatar Heemin Seog Committed by Android (Google) Code Review
Browse files

Merge "Delay registering of callbacks until bouncer is created"

parents 0d8e7959 e2e77a0d

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

+18 −9
Original line number Original line Diff line number Diff line
@@ -96,6 +96,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    private static String TAG = "StatusBarKeyguardViewManager";

    private static String TAG = "StatusBarKeyguardViewManager";





    protected final Context mContext;

    protected final Context mContext;

    private final ConfigurationController mConfigurationController;

    private final NavigationModeController mNavigationModeController;

    private final NotificationShadeWindowController mNotificationShadeWindowController;

    private final NotificationShadeWindowController mNotificationShadeWindowController;

    private final BouncerExpansionCallback mExpansionCallback = new BouncerExpansionCallback() {

    private final BouncerExpansionCallback mExpansionCallback = new BouncerExpansionCallback() {

        @Override

        @Override
@@ -209,21 +211,14 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        mContext = context;

        mContext = context;

        mViewMediatorCallback = callback;

        mViewMediatorCallback = callback;

        mLockPatternUtils = lockPatternUtils;

        mLockPatternUtils = lockPatternUtils;

        mConfigurationController = configurationController;

        mNavigationModeController = navigationModeController;

        mNotificationShadeWindowController = notificationShadeWindowController;

        mNotificationShadeWindowController = notificationShadeWindowController;

        mKeyguardStateController = keyguardStateController;

        mKeyguardStateController = keyguardStateController;

        mMediaManager = notificationMediaManager;

        mMediaManager = notificationMediaManager;

        mKeyguardUpdateManager = keyguardUpdateMonitor;

        mKeyguardUpdateManager = keyguardUpdateMonitor;

        mKeyguardUpdateManager.registerCallback(mUpdateMonitorCallback);

        mStatusBarStateController = sysuiStatusBarStateController;

        mStatusBarStateController = sysuiStatusBarStateController;

        mStatusBarStateController.addCallback(this);

        configurationController.addCallback(this);

        mGesturalNav = QuickStepContract.isGesturalMode(

                navigationModeController.addListener(this));

        mDockManager = dockManager;

        mDockManager = dockManager;

        if (mDockManager != null) {

            mDockManager.addListener(mDockEventListener);

            mIsDocked = mDockManager.isDocked();

        }

    }

    }





    public void registerStatusBar(StatusBar statusBar,

    public void registerStatusBar(StatusBar statusBar,
@@ -247,6 +242,20 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        notificationPanelViewController.addExpansionListener(this);

        notificationPanelViewController.addExpansionListener(this);

        mBypassController = bypassController;

        mBypassController = bypassController;

        mNotificationContainer = notificationContainer;

        mNotificationContainer = notificationContainer;



        registerListeners();

    }



    private void registerListeners() {

        mKeyguardUpdateManager.registerCallback(mUpdateMonitorCallback);

        mStatusBarStateController.addCallback(this);

        mConfigurationController.addCallback(this);

        mGesturalNav = QuickStepContract.isGesturalMode(

                mNavigationModeController.addListener(this));

        if (mDockManager != null) {

            mDockManager.addListener(mDockEventListener);

            mIsDocked = mDockManager.isDocked();

        }

    }

    }





    @Override

    @Override