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

Commit e5ccb239 authored by Angela Wang's avatar Angela Wang
Browse files

Adds hearing device local ambient volume system settings 

Flag: com.android.settingslib.flags.hearing_devices_ambient_volume_control
Bug: 357878944
Test: atest SettingsBackupTest
Change-Id: I214f905bdced61226946a54661d5a8b4cd517866
parent e67e086b

core/java/android/provider/Settings.java

+22 −0
Original line number Diff line number Diff line
@@ -6332,6 +6332,27 @@ public final class Settings { 
        public static final String SCREEN_FLASH_NOTIFICATION_COLOR =

                "screen_flash_notification_color_global";

























        /**













         * A semi-colon separated list of Bluetooth hearing devices' local ambient volume.













         * Each entry is encoded as a key=value list, separated by commas. Ex:













         *













         * "addr=XX:XX:XX:00:11,ambient=20,group_ambient=30;addr=XX:XX:XX:00:22,ambient=50"













         *













         * The following keys are supported:













         * <pre>













         * addr                 (String)













         * ambient              (int)













         * group_ambient        (int)













         * control_expanded     (boolean)













         * </pre>













         *













         * Each entry must contains "addr" attribute, otherwise it'll be ignored.













         * @hide













         */













        public static final String HEARING_DEVICE_LOCAL_AMBIENT_VOLUME =













                "hearing_device_local_ambient_volume";



























        /**















         * IMPORTANT: If you add a new public settings you also have to add it to















         * PUBLIC_SETTINGS below. If the new setting is hidden you have to add










@@ -6476,6 +6497,7 @@ public final class Settings {













            PRIVATE_SETTINGS.add(DEFAULT_DEVICE_FONT_SCALE);















            PRIVATE_SETTINGS.add(MOUSE_REVERSE_VERTICAL_SCROLLING);















            PRIVATE_SETTINGS.add(MOUSE_SWAP_PRIMARY_BUTTON);













            PRIVATE_SETTINGS.add(HEARING_DEVICE_LOCAL_AMBIENT_VOLUME);















        }





























        /**

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -263,5 +263,6 @@ public class SystemSettingsValidators {













        VALIDATORS.put(System.NOTIFICATION_COOLDOWN_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(System.NOTIFICATION_COOLDOWN_ALL, BOOLEAN_VALIDATOR);















        VALIDATORS.put(System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(System.HEARING_DEVICE_LOCAL_AMBIENT_VOLUME, ANY_STRING_VALIDATOR);















    }















}
























packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -944,7 +944,8 @@ public class SettingsBackupTest {













                        Settings.System.WEAR_ACCESSIBILITY_GESTURE_ENABLED_DURING_OOBE,















                        Settings.System.WEAR_TTS_PREWARM_ENABLED,















                        Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ,













                        Settings.System.MULTI_AUDIO_FOCUS_ENABLED // form-factor/OEM specific













                        Settings.System.MULTI_AUDIO_FOCUS_ENABLED, // form-factor/OEM specific













                        Settings.System.HEARING_DEVICE_LOCAL_AMBIENT_VOLUME // internal cache















                );















        if (!Flags.backUpSmoothDisplayAndForcePeakRefreshRate()) {















            settings.add(Settings.System.MIN_REFRESH_RATE);