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

Commit 39823383 authored by Iavor-Valentin Iftime's avatar Iavor-Valentin Iftime Committed by Android (Google) Code Review
Browse files

Merge changes from topic "polite_notif_refinements" into main 

* changes:
  Add cross-app notification cooldown
  Move vibrate while unlocked behind a flag
parents 64997f2a aefcef11

core/java/com/android/internal/config/sysui/SystemUiSystemPropertiesFlags.java

+2 −8
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ public class SystemUiSystemPropertiesFlags { 
        // TODO b/291899544: for released flags, use resource config values

        /** Value used by polite notif. feature */

        public static final Flag NOTIF_COOLDOWN_T1 = devFlag(

                "persist.debug.sysui.notification.notif_cooldown_t1", 5000);

                "persist.debug.sysui.notification.notif_cooldown_t1", 60000);

        /** Value used by polite notif. feature */

        public static final Flag NOTIF_COOLDOWN_T2 = devFlag(

                "persist.debug.sysui.notification.notif_cooldown_t2", 3000);

                "persist.debug.sysui.notification.notif_cooldown_t2", 5000);

        /** Value used by polite notif. feature */

        public static final Flag NOTIF_VOLUME1 = devFlag(

                "persist.debug.sysui.notification.notif_volume1", 30);
@@ -80,12 +80,6 @@ public class SystemUiSystemPropertiesFlags { 
        /** Value used by polite notif. feature. -1 to ignore the counter */

        public static final Flag NOTIF_COOLDOWN_COUNTER_RESET = devFlag(

                "persist.debug.sysui.notification.notif_cooldown_counter_reset", 10);

        /**

         * Value used by polite notif. feature: cooldown behavior/strategy. Valid values: rule1,

         * rule2

         */

        public static final Flag NOTIF_COOLDOWN_RULE = devFlag(

                "persist.debug.sysui.notification.notif_cooldown_rule", "rule1");



        /** b/303716154: For debugging only: use short bitmap duration. */

        public static final Flag DEBUG_SHORT_BITMAP_DURATION = devFlag(

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

+209 −111

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java

+153 −36

File changed.

Preview size limit exceeded, changes collapsed.