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

Commit 9031554c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AOD: show AOD1 instead of AOD2 on double tap"

parents 646b7817 b2a87290

packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ public class VisualStabilityManager implements OnHeadsUpChangedListener { 
     * @param pulsing whether we are currently pulsing for ambient display.

     */

    public void setPulsing(boolean pulsing) {

        if (mPulsing == pulsing) {

            return;

        }

        mPulsing = pulsing;

        updateReorderingAllowed();

    }

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

+6 −2
Original line number Diff line number Diff line
@@ -5005,9 +5005,13 @@ public class StatusBar extends SystemUI implements DemoMode, 
                @Override

                public void onPulseStarted() {

                    callback.onPulseStarted();

                    if (!mHeadsUpManager.getAllEntries().isEmpty()) {

                        // Only pulse the stack scroller if there's actually something to show.

                        // Otherwise just show the always-on screen.

                        mStackScroller.setPulsing(true);

                        mVisualStabilityManager.setPulsing(true);

                    }

                }



                @Override

                public void onPulseFinished() {

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+3 −0
Original line number Diff line number Diff line
@@ -4004,6 +4004,9 @@ public class NotificationStackScrollLayout extends ViewGroup 
    }



    public void setPulsing(boolean pulsing) {

        if (mPulsing == pulsing) {

            return;

        }

        mPulsing = pulsing;

        updateNotificationAnimationStates();

        updateContentHeight();