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

Commit 8bb1334e authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixes an issue where the wrong icons where ambient" into qt-r1-dev 

am: d434adf1

Change-Id: I90c6974eeb43f68b2cccc7b2f4d84b36c5eb3b2e
parents 5c7cdd53 d434adf1

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

+8 −8
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME 
import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator.ExpandAnimationParameters;

import static com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm.ANCHOR_SCROLLING;

import static com.android.systemui.statusbar.notification.stack.StackStateAnimator.ANIMATION_DURATION_SWIPE;

import static com.android.systemui.statusbar.phone.NotificationIconAreaController.LOW_PRIORITY;

import static com.android.systemui.statusbar.phone.NotificationIconAreaController.HIGH_PRIORITY;

import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;



import static java.lang.annotation.RetentionPolicy.SOURCE;
@@ -186,7 +186,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
    private int mCurrentStackHeight = Integer.MAX_VALUE;

    private final Paint mBackgroundPaint = new Paint();

    private final boolean mShouldDrawNotificationBackground;

    private boolean mLowPriorityBeforeSpeedBump;

    private boolean mHighPriorityBeforeSpeedBump;

    private final boolean mAllowLongPress;

    private boolean mDismissRtl;
@@ -583,12 +583,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 


        TunerService tunerService = Dependency.get(TunerService.class);

        tunerService.addTunable((key, newValue) -> {

            if (key.equals(LOW_PRIORITY)) {

                mLowPriorityBeforeSpeedBump = "1".equals(newValue);

            if (key.equals(HIGH_PRIORITY)) {

                mHighPriorityBeforeSpeedBump = "1".equals(newValue);

            } else if (key.equals(Settings.Secure.NOTIFICATION_DISMISS_RTL)) {

                updateDismissRtlSetting("1".equals(newValue));

            }

        }, LOW_PRIORITY, Settings.Secure.NOTIFICATION_DISMISS_RTL);

        }, HIGH_PRIORITY, Settings.Secure.NOTIFICATION_DISMISS_RTL);



        mEntryManager.addNotificationEntryListener(new NotificationEntryListener() {

            @Override
@@ -5692,10 +5692,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
            ExpandableNotificationRow row = (ExpandableNotificationRow) view;

            currentIndex++;

            boolean beforeSpeedBump;

            if (mLowPriorityBeforeSpeedBump) {

                beforeSpeedBump = !row.getEntry().ambient;

            } else {

            if (mHighPriorityBeforeSpeedBump) {

                beforeSpeedBump = row.getEntry().isHighPriority();

            } else {

                beforeSpeedBump = !row.getEntry().ambient;

            }

            if (beforeSpeedBump) {

                speedBumpIndex = currentIndex;

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import java.util.function.Function; 
public class NotificationIconAreaController implements DarkReceiver,

        StatusBarStateController.StateListener {



    public static final String LOW_PRIORITY = "low_priority";

    public static final String HIGH_PRIORITY = "high_priority";

    private static final long AOD_ICONS_APPEAR_DURATION = 200;



    private final ContrastColorUtil mContrastColorUtil;