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

Commit 146dc265 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev 

* commit '9a2d5742':
  Fixed when the notification effects are being cleared
parents e45761ff 9a2d5742

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

+6 −4
Original line number Diff line number Diff line
@@ -1636,11 +1636,13 @@ public abstract class BaseStatusBar extends SystemUI implements 
    protected void handleVisibleToUserChanged(boolean visibleToUser) {

        try {

            if (visibleToUser) {

                boolean clearNotificationEffects = !isPanelFullyCollapsed() &&

                    (mShowLockscreenNotifications ||

                        (mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED));

                boolean pinnedHeadsUp = mHeadsUpManager.hasPinnedHeadsUp();

                boolean clearNotificationEffects =

                    ((mShowLockscreenNotifications && mState == StatusBarState.KEYGUARD) ||

                            (!pinnedHeadsUp && (mState == StatusBarState.SHADE

                                    || mState == StatusBarState.SHADE_LOCKED)));

                int notificationLoad = mNotificationData.getActiveNotifications().size();

                if (mHeadsUpManager.hasPinnedHeadsUp() && isPanelFullyCollapsed())  {

                if (pinnedHeadsUp && isPanelFullyCollapsed())  {

                    notificationLoad = 1;

                } else {

                    MetricsLogger.histogram(mContext, "note_load", notificationLoad);

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

+3 −6
Original line number Diff line number Diff line
@@ -3742,12 +3742,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        // down on the lockscreen), clear notification LED, vibration,

        // ringing.

        // Other transitions are covered in handleVisibleToUserChanged().

        if (state != mState && mVisible && state == StatusBarState.SHADE_LOCKED) {

            try {

                mBarService.clearNotificationEffects();

            } catch (RemoteException e) {

                // Ignore.

            }

        if (state != mState && mVisible && (state == StatusBarState.SHADE_LOCKED

                || (state == StatusBarState.SHADE && isGoingToNotificationShade()))) {

            clearNotificationEffects();

        }

        mState = state;

        mGroupManager.setStatusBarState(state);