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

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

Merge "Optionally supress status bar notifications in dnd"

parents 9131b2f1 c861a3dd

core/res/res/values/config.xml

+4 −1
Original line number Diff line number Diff line
@@ -2372,7 +2372,7 @@ 
         obtain user consent to access their location through other means. -->

    <string-array name="config_disabledUntilUsedPreinstalledCarrierApps" translatable="false" />



    <!-- The list of classes that should be added to the notification ranking pipline.

    <!-- The list of classes that should be added to the notification ranking pipeline.

     See {@link com.android.server.notification.NotificationSignalExtractor}

      If you add a new extractor to this list make sure to update

      NotificationManagerService.handleRankingSort()-->
@@ -2384,11 +2384,14 @@ 
        <!-- depends on AdjustmentExtractor-->

        <item>com.android.server.notification.ValidateNotificationPeople</item>

        <item>com.android.server.notification.PriorityExtractor</item>

        <!-- depends on PriorityExtractor -->

        <item>com.android.server.notification.ZenModeExtractor</item>

        <item>com.android.server.notification.ImportanceExtractor</item>

        <!-- depends on ImportanceExtractor-->

        <item>com.android.server.notification.NotificationIntrusivenessExtractor</item>

        <item>com.android.server.notification.VisibilityExtractor</item>

        <item>com.android.server.notification.BadgeExtractor</item>



    </string-array>



    <!-- Flag indicating that this device does not rotate and will always remain in its default

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

+5 −0
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ public class NotificationIconAreaController implements DarkReceiver { 
            return false;

        }



        // showAmbient == show in shade but not shelf

        if (!showAmbient && notificationData.shouldSuppressScreenOn(entry.key)) {

            return false;

        }



        return true;

    }

services/core/java/com/android/server/notification/BadgeExtractor.java

+5 −0
Original line number Diff line number Diff line
@@ -61,4 +61,9 @@ public class BadgeExtractor implements NotificationSignalExtractor { 
    public void setConfig(RankingConfig config) {

        mConfig = config;

    }



    @Override

    public void setZenHelper(ZenModeHelper helper) {



    }

}

services/core/java/com/android/server/notification/ImportanceExtractor.java

+5 −0
Original line number Diff line number Diff line
@@ -50,4 +50,9 @@ public class ImportanceExtractor implements NotificationSignalExtractor { 
    public void setConfig(RankingConfig config) {

        mConfig = config;

    }



    @Override

    public void setZenHelper(ZenModeHelper helper) {



    }

}

services/core/java/com/android/server/notification/NotificationAdjustmentExtractor.java

+5 −0
Original line number Diff line number Diff line
@@ -44,4 +44,9 @@ public class NotificationAdjustmentExtractor implements NotificationSignalExtrac 
    public void setConfig(RankingConfig config) {

        // config is not used

    }



    @Override

    public void setZenHelper(ZenModeHelper helper) {



    }

}