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

Commit 88fc0c33 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed that silent notifications weren't showing on AOD" into qt-r1-dev am: 2738aa3f 

am: 0ff59873

Change-Id: I917ede5dfee40333c39ebf046714f03d0cfac0eb
parents bfda3a2b 0ff59873

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

+3 −18
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ import android.content.Context; 
import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.Rect;

import android.provider.Settings;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -32,7 +31,6 @@ import com.android.systemui.statusbar.notification.NotificationUtils; 
import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.tuner.TunerService;



import java.util.ArrayList;

import java.util.Objects;
@@ -58,7 +56,6 @@ public class NotificationIconAreaController implements DarkReceiver, 
    private final KeyguardBypassController mBypassController;

    private final DozeParameters mDozeParameters;



    private boolean mShowSilentOnLockscreen = true;

    private int mIconSize;

    private int mIconHPadding;

    private int mIconTint = Color.WHITE;
@@ -101,11 +98,6 @@ public class NotificationIconAreaController implements DarkReceiver, 


        initializeNotificationAreaViews(context);

        reloadAodColor();



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

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

            mShowSilentOnLockscreen = "1".equals(newValue);

        }, Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS);

    }



    protected View inflateIconArea(LayoutInflater inflater) {
@@ -238,7 +230,7 @@ public class NotificationIconAreaController implements DarkReceiver, 
    }



    protected boolean shouldShowNotificationIcon(NotificationEntry entry,

            boolean showAmbient, boolean showLowPriority, boolean hideDismissed,

            boolean showAmbient, boolean hideDismissed,

            boolean hideRepliedMessages, boolean hideCurrentMedia, boolean hideCenteredIcon,

            boolean hidePulsing, boolean onlyShowCenteredIcon) {
@@ -257,9 +249,6 @@ public class NotificationIconAreaController implements DarkReceiver, 
        if (hideCurrentMedia && entry.key.equals(mMediaManager.getMediaNotificationKey())) {

            return false;

        }

        if (!showLowPriority && !entry.isHighPriority()) {

            return false;

        }

        if (!entry.isTopLevelChild()) {

            return false;

        }
@@ -297,7 +286,6 @@ public class NotificationIconAreaController implements DarkReceiver, 
    private void updateShelfIcons() {

        updateIconsForLayout(entry -> entry.expandedIcon, mShelfIcons,

                true /* showAmbient */,

                true /* showLowPriority */,

                false /* hideDismissed */,

                false /* hideRepliedMessages */,

                false /* hideCurrentMedia */,
@@ -309,7 +297,6 @@ public class NotificationIconAreaController implements DarkReceiver, 
    public void updateStatusBarIcons() {

        updateIconsForLayout(entry -> entry.icon, mNotificationIcons,

                false /* showAmbient */,

                true /* showLowPriority */,

                true /* hideDismissed */,

                true /* hideRepliedMessages */,

                false /* hideCurrentMedia */,
@@ -321,7 +308,6 @@ public class NotificationIconAreaController implements DarkReceiver, 
    private void updateCenterIcon() {

        updateIconsForLayout(entry -> entry.centeredIcon, mCenteredIcon,

                false /* showAmbient */,

                true /* showLowPriority */,

                false /* hideDismissed */,

                false /* hideRepliedMessages */,

                false /* hideCurrentMedia */,
@@ -333,7 +319,6 @@ public class NotificationIconAreaController implements DarkReceiver, 
    public void updateAodNotificationIcons() {

        updateIconsForLayout(entry -> entry.aodIcon, mAodIcons,

                false /* showAmbient */,

                mShowSilentOnLockscreen /* showLowPriority */,

                true /* hideDismissed */,

                true /* hideRepliedMessages */,

                true /* hideCurrentMedia */,
@@ -353,7 +338,7 @@ public class NotificationIconAreaController implements DarkReceiver, 
     * @param hidePulsing should pulsing notifications be hidden

     */

    private void updateIconsForLayout(Function<NotificationEntry, StatusBarIconView> function,

            NotificationIconContainer hostLayout, boolean showAmbient, boolean showLowPriority,

            NotificationIconContainer hostLayout, boolean showAmbient,

            boolean hideDismissed, boolean hideRepliedMessages, boolean hideCurrentMedia,

            boolean hideCenteredIcon, boolean hidePulsing, boolean onlyShowCenteredIcon) {

        ArrayList<StatusBarIconView> toShow = new ArrayList<>(
@@ -364,7 +349,7 @@ public class NotificationIconAreaController implements DarkReceiver, 
            View view = mNotificationScrollLayout.getChildAt(i);

            if (view instanceof ExpandableNotificationRow) {

                NotificationEntry ent = ((ExpandableNotificationRow) view).getEntry();

                if (shouldShowNotificationIcon(ent, showAmbient, showLowPriority, hideDismissed,

                if (shouldShowNotificationIcon(ent, showAmbient, hideDismissed,

                        hideRepliedMessages, hideCurrentMedia, hideCenteredIcon, hidePulsing,

                        onlyShowCenteredIcon)) {

                    StatusBarIconView iconView = function.apply(ent);