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

Commit da5c12fb authored by Swizel Cardozo's avatar Swizel Cardozo Committed by Android (Google) Code Review
Browse files

Merge "Add consistent notification blocking string constant to Settings. This... 

Merge "Add consistent notification blocking string constant to Settings. This setting can now be accessed as Settings.Global.Wearable.CONSISTENT_NOTIFICATION_BLOCKING_ENABLED" into main
parents b7bf44c7 bc9241e4

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ import java.net.URISyntaxException; 
import java.util.HashMap;

import java.util.HashSet;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.Set;
@@ -19690,6 +19691,15 @@ public final class Settings { 
            @Readable

            public static final String WRIST_DETECTION_AUTO_LOCKING_ENABLED =

                    "wear_wrist_detection_auto_locking_enabled";













            /**













             * Whether consistent notification blocking experience is enabled.













             *













             * @hide













             */













            @Readable













            public static final String CONSISTENT_NOTIFICATION_BLOCKING_ENABLED =













                    "consistent_notification_blocking_enabled";















        }















    }







































packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -93,6 +93,7 @@ public class GlobalSettings {













        Settings.Global.Wearable.CLOCKWORK_AUTO_TIME,















        Settings.Global.Wearable.CLOCKWORK_AUTO_TIME_ZONE,















        Settings.Global.Wearable.CLOCKWORK_24HR_TIME,













        Settings.Global.Wearable.CONSISTENT_NOTIFICATION_BLOCKING_ENABLED,















        Settings.Global.Wearable.MUTE_WHEN_OFF_BODY_ENABLED,















        Settings.Global.Wearable.AMBIENT_ENABLED,















        Settings.Global.Wearable.AMBIENT_TILT_TO_WAKE,

































packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -450,6 +450,8 @@ public class GlobalSettingsValidators {













        VALIDATORS.put(Global.Wearable.WEAR_POWER_ANOMALY_SERVICE_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.CONNECTIVITY_KEEP_DATA_ON, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.WRIST_DETECTION_AUTO_LOCKING_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(













                Global.Wearable.CONSISTENT_NOTIFICATION_BLOCKING_ENABLED, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Global.FORCE_ENABLE_PSS_PROFILING, BOOLEAN_VALIDATOR);















    }















}