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

Commit 7f9c473f authored by Ned Burns's avatar Ned Burns Committed by Automerger Merge Worker
Browse files

Merge "Hide silent notifications when AOD animation starts" into sc-dev am:... 

Merge "Hide silent notifications when AOD animation starts" into sc-dev am: 8d524432 am: fda32e1a

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

Change-Id: Ie8619818e3354258cfe4828d377f16fa4000e585
parents e26f1e4f fda32e1a

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

+2 −1
Original line number Diff line number Diff line
@@ -435,7 +435,8 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle 
        final int N = mListContainer.getContainerChildCount();



        int visibleNotifications = 0;

        boolean onKeyguard = mStatusBarStateController.getState() == StatusBarState.KEYGUARD;

        boolean onKeyguard =

                mStatusBarStateController.getCurrentOrUpcomingState() == StatusBarState.KEYGUARD;

        Stack<ExpandableNotificationRow> stack = new Stack<>();

        for (int i = N - 1; i >= 0; i--) {

            View child = mListContainer.getContainerChildAt(i);

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

+12 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public class StatusBarStateControllerImpl implements SysuiStatusBarStateControll 
    private final UiEventLogger mUiEventLogger;

    private int mState;

    private int mLastState;

    private int mUpcomingState;

    private boolean mLeaveOpenOnKeyguardHide;

    private boolean mKeyguardRequested;
@@ -169,6 +170,7 @@ public class StatusBarStateControllerImpl implements SysuiStatusBarStateControll 
            }

            mLastState = mState;

            mState = state;

            mUpcomingState = state;

            mUiEventLogger.log(StatusBarStateEvent.fromState(mState));

            for (RankedListener rl : new ArrayList<>(mListeners)) {

                rl.mListener.onStateChanged(mState);
@@ -183,6 +185,16 @@ public class StatusBarStateControllerImpl implements SysuiStatusBarStateControll 
        return true;

    }



    @Override

    public void setUpcomingState(int nextState) {

        mUpcomingState = nextState;

    }



    @Override

    public int getCurrentOrUpcomingState() {

        return mUpcomingState;

    }



    @Override

    public boolean isDozing() {

        return mIsDozing;

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

+14 −0
Original line number Diff line number Diff line
@@ -73,6 +73,20 @@ public interface SysuiStatusBarStateController extends StatusBarStateController 
     */

    boolean setState(int state, boolean force);



    /**

     * Provides a hint that the status bar has started to transition to another

     * {@link StatusBarState}. This suggests that a matching call to setState() with the same value

     * will happen in the near future, although that may not happen if the animation is canceled,

     * etc.

     */

    void setUpcomingState(int state);



    /**

     * If the status bar is in the process of transitioning to a new state, returns that state.

     * Otherwise, returns the current state.

     */

    int getCurrentOrUpcomingState();



    /**

     * Update the dozing state from {@link StatusBar}'s perspective

     * @param isDozing well, are we dozing?

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

+2 −0
Original line number Diff line number Diff line
@@ -4437,6 +4437,8 @@ public class NotificationPanelViewController extends PanelViewController { 
     */

    public void showAodUi() {

        setDozing(true /* dozing */, false /* animate */, null);

        mStatusBarStateController.setUpcomingState(KEYGUARD);

        mEntryManager.updateNotifications("showAodUi");

        mStatusBarStateListener.onStateChanged(KEYGUARD);

        mStatusBarStateListener.onDozeAmountChanged(1f, 1f);

        setExpandedFraction(1f);