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

Commit af08c157 authored by Jason Monk's avatar Jason Monk
Browse files

Make StatusBarStateController be a CallbackController 

For consistency and for future utilities

Test: existing tests pass
Change-Id: I059054c581277e1f117b894038ce8caafea9d98c
parent 647d36f3

packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class FalsingManager implements SensorEventListener { 
                UserHandle.USER_ALL);



        updateConfiguration();

        Dependency.get(StatusBarStateController.class).addListener(mStateListener);

        Dependency.get(StatusBarStateController.class).addCallback(mStateListener);

    }



    public static FalsingManager getInstance(Context context) {

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class KeyguardIndicationController implements StateListener { 
                new IntentFilter(Intent.ACTION_TIME_TICK), null,

                Dependency.get(Dependency.TIME_TICK_HANDLER));



        Dependency.get(StatusBarStateController.class).addListener(this);

        Dependency.get(StatusBarStateController.class).addCallback(this);

    }



    /**
@@ -167,7 +167,7 @@ public class KeyguardIndicationController implements StateListener { 
     */

    public void destroy() {

        mContext.unregisterReceiver(mTickReceiver);

        Dependency.get(StatusBarStateController.class).removeListener(this);

        Dependency.get(StatusBarStateController.class).removeCallback(this);

    }



    /**

packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public class NotificationLockscreenUserManagerImpl implements 
        mCurrentUserId = ActivityManager.getCurrentUser();

        mBarService = IStatusBarService.Stub.asInterface(

                ServiceManager.getService(Context.STATUS_BAR_SERVICE));

        Dependency.get(StatusBarStateController.class).addListener(this);

        Dependency.get(StatusBarStateController.class).addCallback(this);

        mLockPatternUtils = new LockPatternUtils(context);

        mKeyguardManager = context.getSystemService(KeyguardManager.class);

    }

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+2 −2
Original line number Diff line number Diff line
@@ -121,13 +121,13 @@ public class NotificationShelf extends ActivatableNotificationView implements 
    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        Dependency.get(StatusBarStateController.class)

                .addListener(mStateListener, StatusBarStateController.RANK_SHELF);

                .addCallback(mStateListener, StatusBarStateController.RANK_SHELF);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        Dependency.get(StatusBarStateController.class).removeListener(mStateListener);

        Dependency.get(StatusBarStateController.class).removeCallback(mStateListener);

    }



    public void bind(AmbientState ambientState, NotificationStackScrollLayout hostLayout) {

packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class NotificationViewHierarchyManager { 
                res.getBoolean(R.bool.config_alwaysExpandNonGroupedNotifications);

        mStatusBarStateListener = new StatusBarStateListener(mBubbleController);

        mEntryManager.setStatusBarStateListener(mStatusBarStateListener);

        Dependency.get(StatusBarStateController.class).addListener(mStatusBarStateListener);

        Dependency.get(StatusBarStateController.class).addCallback(mStatusBarStateListener);

    }



    public void setUpWithPresenter(NotificationPresenter presenter,