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

Commit f41f3984 authored by Jacky Kao's avatar Jacky Kao Committed by Android (Google) Code Review
Browse files

Merge "Adds APIs to let live caption can access the data in the DB (1/n)"

parents 040fa1e1 b5764cd8

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -6537,6 +6537,16 @@ public final class Settings { 
        @Readable

        public static final String ODI_CAPTIONS_ENABLED = "odi_captions_enabled";

























        /**













         * Setting to indicate live caption button show or hide in the volume













         * rocker.













         *













         * @hide













         */













        public static final String ODI_CAPTIONS_VOLUME_UI_ENABLED =













                "odi_captions_volume_ui_enabled";



























        /**















         * On Android 8.0 (API level 26) and higher versions of the platform,















         * a 64-bit number (expressed as a hexadecimal string), unique to

































core/proto/android/providers/settings/secure.proto



+1
−0




























Original line number
Diff line number
Diff line








@@ -85,6 +85,7 @@ message SecureSettingsProto {













        optional SettingProto accessibility_floating_menu_icon_type = 39 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto accessibility_floating_menu_opacity = 40 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto accessibility_floating_menu_fade_enabled = 41 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto odi_captions_volume_ui_enabled = 42 [ (android.privacy).dest = DEST_AUTOMATIC ];















    }















    optional Accessibility accessibility = 2;

















































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -188,6 +188,7 @@ public class SecureSettings {













        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_ICON_TYPE,















        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY,















        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,













        Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,















        Settings.Secure.NOTIFICATION_BUBBLES,















        Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED,















        Settings.Secure.LOCKSCREEN_SHOW_CONTROLS,

































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



+2
−0




























Original line number
Diff line number
Diff line








@@ -321,5 +321,7 @@ public class SecureSettingsValidators {













            }















            return true;















        });













        VALIDATORS.put(Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED, BOOLEAN_VALIDATOR);





























    }















}
























packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -1813,6 +1813,9 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,















                SecureSettingsProto.Accessibility.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED);













        dumpSetting(s, p,













                Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,













                SecureSettingsProto.Accessibility.ODI_CAPTIONS_VOLUME_UI_ENABLED);















        p.end(accessibilityToken);































        final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP);