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

Commit 0b8174ad authored by Gus Prevas's avatar Gus Prevas
Browse files

Restores implementation of isPresenterLocked(). 

ag/5710281 removed the implementation of isPresenterLocked() on
StatusBarNotificationPresenter.  This method is defined as a default
method on NotificationPresenter which by default returns false; it is
not called from anywhere in SystemUI - only in ARC - so the deleted
implementation is currently unused.  However, since the method is
present on the interface, it's better to have the correct implementation
in case it gets used in the future.  Since both known implementations of
NotificationPresenter override isPresenterLocked(), the default
implementation is removed.

Test: n/a
Change-Id: Ia5aa383fde81002f13e0d892989e7ee1bc4e5cfe
parent 0b243df3

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

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public interface NotificationPresenter extends ExpandableNotificationRow.OnExpan 
    /**

     * True if the presenter is currently locked.

     */

    default boolean isPresenterLocked() { return false; }

    boolean isPresenterLocked();



    /**

     * Called when the row states are updated by {@link NotificationViewHierarchyManager}.

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

+1 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


        mPresenter = new StatusBarNotificationPresenter(mContext, mNotificationPanel,

                mHeadsUpManager, mStatusBarWindow, mStackScroller, mDozeScrimController,

                mScrimController, mActivityLaunchAnimator);

                mScrimController, mActivityLaunchAnimator, mStatusBarKeyguardViewManager);



        mAppOpsController.addCallback(APP_OPS, this);

        mNotificationListener.setUpWithPresenter(mPresenter);

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

+10 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ public class StatusBarNotificationPresenter implements NotificationPresenter { 
    private final AccessibilityManager mAccessibilityManager;

    private final KeyguardManager mKeyguardManager;

    private final ActivityLaunchAnimator mActivityLaunchAnimator;

    private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private final int mMaxAllowedKeyguardNotifications;

    private final IStatusBarService mBarService;

    private boolean mReinflateNotificationsOnUserSwitched;
@@ -113,13 +114,15 @@ public class StatusBarNotificationPresenter implements NotificationPresenter { 
            ViewGroup stackScroller,

            DozeScrimController dozeScrimController,

            ScrimController scrimController,

            ActivityLaunchAnimator activityLaunchAnimator) {

            ActivityLaunchAnimator activityLaunchAnimator,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager) {

        mContext = context;

        mNotificationPanel = panel;

        mHeadsUpManager = headsUp;

        mCommandQueue = getComponent(context, CommandQueue.class);

        mAboveShelfObserver = new AboveShelfObserver(stackScroller);

        mActivityLaunchAnimator = activityLaunchAnimator;

        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

        mAboveShelfObserver.setListener(statusBarWindow.findViewById(

                R.id.notification_container_parent));

        mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
@@ -367,6 +370,12 @@ public class StatusBarNotificationPresenter implements NotificationPresenter { 
        return mVrMode;

    }



    @Override

    public boolean isPresenterLocked() {

        return mStatusBarKeyguardViewManager.isShowing()

                && mStatusBarKeyguardViewManager.isSecure();

    }



    private void onLockedNotificationImportanceChange(OnDismissAction dismissAction) {

        mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);

        mActivityStarter.dismissKeyguardThenExecute(dismissAction, null,

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class StatusBarNotificationPresenterTest extends SysuiTestCase { 
                mock(NotificationPanelView.class), mock(HeadsUpManagerPhone.class),

                statusBarWindowView, mock(NotificationListContainerViewGroup.class),

                mock(DozeScrimController.class), mock(ScrimController.class),

                mock(ActivityLaunchAnimator.class));

                mock(ActivityLaunchAnimator.class), mock(StatusBarKeyguardViewManager.class));

    }



    @Test