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

Commit 41c264ba authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Add importance to notification guts."

parents 5747b3a8 ead00aac

api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -33268,11 +33268,11 @@ package android.service.notification { 
    method public int getSuppressedVisualEffects();

    method public boolean isAmbient();

    method public boolean matchesInterruptionFilter();

    field public static final int IMPORTANCE_DEFAULT = 0; // 0x0

    field public static final int IMPORTANCE_HIGH = 1; // 0x1

    field public static final int IMPORTANCE_LOW = -1; // 0xffffffff

    field public static final int IMPORTANCE_MAX = 2; // 0x2

    field public static final int IMPORTANCE_NONE = -2; // 0xfffffffe

    field public static final int IMPORTANCE_DEFAULT = 2; // 0x2

    field public static final int IMPORTANCE_HIGH = 3; // 0x3

    field public static final int IMPORTANCE_LOW = 1; // 0x1

    field public static final int IMPORTANCE_MAX = 4; // 0x4

    field public static final int IMPORTANCE_NONE = 0; // 0x0

    field public static final int IMPORTANCE_UNSPECIFIED = -1000; // 0xfffffc18

  }

























api/system-current.txt



+5
−5




























Original line number
Diff line number
Diff line








@@ -35402,11 +35402,11 @@ package android.service.notification {













    method public int getSuppressedVisualEffects();















    method public boolean isAmbient();















    method public boolean matchesInterruptionFilter();













    field public static final int IMPORTANCE_DEFAULT = 0; // 0x0













    field public static final int IMPORTANCE_HIGH = 1; // 0x1













    field public static final int IMPORTANCE_LOW = -1; // 0xffffffff













    field public static final int IMPORTANCE_MAX = 2; // 0x2













    field public static final int IMPORTANCE_NONE = -2; // 0xfffffffe













    field public static final int IMPORTANCE_DEFAULT = 2; // 0x2













    field public static final int IMPORTANCE_HIGH = 3; // 0x3













    field public static final int IMPORTANCE_LOW = 1; // 0x1













    field public static final int IMPORTANCE_MAX = 4; // 0x4













    field public static final int IMPORTANCE_NONE = 0; // 0x0















    field public static final int IMPORTANCE_UNSPECIFIED = -1000; // 0xfffffc18















  }







































api/test-current.txt



+5
−5




























Original line number
Diff line number
Diff line








@@ -33270,11 +33270,11 @@ package android.service.notification {













    method public int getSuppressedVisualEffects();















    method public boolean isAmbient();















    method public boolean matchesInterruptionFilter();













    field public static final int IMPORTANCE_DEFAULT = 0; // 0x0













    field public static final int IMPORTANCE_HIGH = 1; // 0x1













    field public static final int IMPORTANCE_LOW = -1; // 0xffffffff













    field public static final int IMPORTANCE_MAX = 2; // 0x2













    field public static final int IMPORTANCE_NONE = -2; // 0xfffffffe













    field public static final int IMPORTANCE_DEFAULT = 2; // 0x2













    field public static final int IMPORTANCE_HIGH = 3; // 0x3













    field public static final int IMPORTANCE_LOW = 1; // 0x1













    field public static final int IMPORTANCE_MAX = 4; // 0x4













    field public static final int IMPORTANCE_NONE = 0; // 0x0















    field public static final int IMPORTANCE_UNSPECIFIED = -1000; // 0xfffffc18















  }







































core/java/android/service/notification/NotificationListenerService.java



+5
−5




























Original line number
Diff line number
Diff line








@@ -833,29 +833,29 @@ public abstract class NotificationListenerService extends Service {













        /**















         * A notification with no importance: shows nowhere, is blocked.















         */













        public static final int IMPORTANCE_NONE = -2;













        public static final int IMPORTANCE_NONE = 0;































        /**















         * Low notification importance: only shows in the shade, below the fold.















         */













        public static final int IMPORTANCE_LOW = -1;













        public static final int IMPORTANCE_LOW = 1;































        /**















         * Default notification importance: shows everywhere, but is not intrusive.















         */













        public static final int IMPORTANCE_DEFAULT = 0;













        public static final int IMPORTANCE_DEFAULT = 2;































        /**















         * Higher notification importance: shows everywhere, makes noise,















         * but does not visually intrude.















         */













        public static final int IMPORTANCE_HIGH = 1;













        public static final int IMPORTANCE_HIGH = 3;































        /**















         * Highest notification importance: shows everywhere, makes noise,















         * and also visually intrudes.















         */













        public static final int IMPORTANCE_MAX = 2;













        public static final int IMPORTANCE_MAX = 4;































        private String mKey;















        private int mRank = -1;

































core/res/res/values/strings.xml



+3
−0




























Original line number
Diff line number
Diff line








@@ -3955,6 +3955,9 @@













    <string name="battery_saver_description">To help improve battery life, battery saver reduces your device’s performance and limits vibration, location services, and most background data. Email, messaging, and other apps that rely on syncing may not update unless you open them.\n\nBattery saver turns off automatically when your device is charging.</string>













































    <!-- [CHAR LIMIT=100] Notification importance slider title -->













    <string name="notification_importance_title">Importance</string>





























    <!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description -->















    <string name="notification_importance_blocked">Blocked: Never show these notifications</string>