diff options
7 files changed, 21 insertions, 20 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 290ae4ac0e55..4af657dab0cd 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7330,7 +7330,7 @@ public final class Settings { "hearing_aid_media_routing"; /** - * System sounds routing value for hearing aid. It routes system sounds to hearing aid + * Notification routing value for hearing aid. It routes notification sounds to hearing aid * or device speaker. * <ul> * <li> 0 = Default @@ -7339,8 +7339,8 @@ public final class Settings { * </ul> * @hide */ - public static final String HEARING_AID_SYSTEM_SOUNDS_ROUTING = - "hearing_aid_system_sounds_routing"; + public static final String HEARING_AID_NOTIFICATION_ROUTING = + "hearing_aid_notification_routing"; /** * Setting to indicate that on device captions are enabled. diff --git a/core/proto/android/providers/settings/secure.proto b/core/proto/android/providers/settings/secure.proto index 9ca1849dedc2..104c023f550d 100644 --- a/core/proto/android/providers/settings/secure.proto +++ b/core/proto/android/providers/settings/secure.proto @@ -93,7 +93,7 @@ message SecureSettingsProto { optional SettingProto hearing_aid_ringtone_routing = 46 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto hearing_aid_call_routing = 47 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto hearing_aid_media_routing = 48 [ (android.privacy).dest = DEST_AUTOMATIC ]; - optional SettingProto hearing_aid_system_sounds_routing = 49 [ (android.privacy).dest = DEST_AUTOMATIC ]; + optional SettingProto hearing_aid_notification_routing = 49 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto accessibility_magnification_joystick_enabled = 50 [ (android.privacy).dest = DEST_AUTOMATIC ]; // Settings for font scaling optional SettingProto accessibility_font_scaling_has_been_changed = 51 [ (android.privacy).dest = DEST_AUTOMATIC ]; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidAudioRoutingConstants.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidAudioRoutingConstants.java index d8475b3f22af..ca0cad759a08 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidAudioRoutingConstants.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidAudioRoutingConstants.java @@ -39,21 +39,22 @@ public final class HearingAidAudioRoutingConstants { public static final int[] MEDIA_ROUTING_ATTRIBUTES = new int[] { // Stands for STRATEGY_MEDIA, including USAGE_GAME, USAGE_ASSISTANT, // USAGE_ASSISTANCE_NAVIGATION_GUIDANCE, USAGE_ASSISTANCE_SONIFICATION - AudioAttributes.USAGE_MEDIA + AudioAttributes.USAGE_MEDIA, + // Stands for STRATEGY_ACCESSIBILITY + AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY, + // Stands for STRATEGY_DTMF + AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING, }; - public static final int[] RINGTONE_ROUTING_ATTRIBUTE = new int[] { + public static final int[] RINGTONE_ROUTING_ATTRIBUTES = new int[] { // Stands for STRATEGY_SONIFICATION, including USAGE_ALARM AudioAttributes.USAGE_NOTIFICATION_RINGTONE }; - public static final int[] SYSTEM_SOUNDS_ROUTING_ATTRIBUTES = new int[] { + public static final int[] NOTIFICATION_ROUTING_ATTRIBUTES = new int[] { // Stands for STRATEGY_SONIFICATION_RESPECTFUL, including USAGE_NOTIFICATION_EVENT AudioAttributes.USAGE_NOTIFICATION, - // Stands for STRATEGY_ACCESSIBILITY - AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY, - // Stands for STRATEGY_DTMF - AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING, + }; @Retention(RetentionPolicy.SOURCE) diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java index 111a2c1a07ea..4094ce8f708a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidDeviceManager.java @@ -312,7 +312,7 @@ public class HearingAidDeviceManager { Settings.Secure.HEARING_AID_RINGTONE_ROUTING, HearingAidAudioRoutingConstants.RoutingValue.AUTO); final int systemSoundsRoutingValue = Settings.Secure.getInt(mContentResolver, - Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING, + Settings.Secure.HEARING_AID_NOTIFICATION_ROUTING, HearingAidAudioRoutingConstants.RoutingValue.AUTO); setPreferredDeviceRoutingStrategies( @@ -322,10 +322,10 @@ public class HearingAidDeviceManager { HearingAidAudioRoutingConstants.MEDIA_ROUTING_ATTRIBUTES, hearingDeviceAttributes, mediaRoutingValue); setPreferredDeviceRoutingStrategies( - HearingAidAudioRoutingConstants.RINGTONE_ROUTING_ATTRIBUTE, + HearingAidAudioRoutingConstants.RINGTONE_ROUTING_ATTRIBUTES, hearingDeviceAttributes, ringtoneRoutingValue); setPreferredDeviceRoutingStrategies( - HearingAidAudioRoutingConstants.SYSTEM_SOUNDS_ROUTING_ATTRIBUTES, + HearingAidAudioRoutingConstants.NOTIFICATION_ROUTING_ATTRIBUTES, hearingDeviceAttributes, systemSoundsRoutingValue); } @@ -338,10 +338,10 @@ public class HearingAidDeviceManager { HearingAidAudioRoutingConstants.MEDIA_ROUTING_ATTRIBUTES, /* hearingDevice = */ null, HearingAidAudioRoutingConstants.RoutingValue.AUTO); setPreferredDeviceRoutingStrategies( - HearingAidAudioRoutingConstants.RINGTONE_ROUTING_ATTRIBUTE, + HearingAidAudioRoutingConstants.RINGTONE_ROUTING_ATTRIBUTES, /* hearingDevice = */ null, HearingAidAudioRoutingConstants.RoutingValue.AUTO); setPreferredDeviceRoutingStrategies( - HearingAidAudioRoutingConstants.SYSTEM_SOUNDS_ROUTING_ATTRIBUTES, + HearingAidAudioRoutingConstants.NOTIFICATION_ROUTING_ATTRIBUTES, /* hearingDevice = */ null, HearingAidAudioRoutingConstants.RoutingValue.AUTO); } diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index 2167a8ad8fdb..5004f251cfd3 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -247,7 +247,7 @@ public class SecureSettings { Settings.Secure.HEARING_AID_RINGTONE_ROUTING, Settings.Secure.HEARING_AID_CALL_ROUTING, Settings.Secure.HEARING_AID_MEDIA_ROUTING, - Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING, + Settings.Secure.HEARING_AID_NOTIFICATION_ROUTING, Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 868623f5c537..0b0e182746e5 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -396,7 +396,7 @@ public class SecureSettingsValidators { new DiscreteValueValidator(new String[] {"0", "1", "2"})); VALIDATORS.put(Secure.HEARING_AID_MEDIA_ROUTING, new DiscreteValueValidator(new String[] {"0", "1", "2"})); - VALIDATORS.put(Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING, + VALIDATORS.put(Secure.HEARING_AID_NOTIFICATION_ROUTING, new DiscreteValueValidator(new String[] {"0", "1", "2"})); VALIDATORS.put(Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_EDGE_HAPTIC_ENABLED, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 5afcd5db1b5f..1670a705f939 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1866,8 +1866,8 @@ class SettingsProtoDumpUtil { Settings.Secure.HEARING_AID_MEDIA_ROUTING, SecureSettingsProto.Accessibility.HEARING_AID_MEDIA_ROUTING); dumpSetting(s, p, - Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING, - SecureSettingsProto.Accessibility.HEARING_AID_SYSTEM_SOUNDS_ROUTING); + Settings.Secure.HEARING_AID_NOTIFICATION_ROUTING, + SecureSettingsProto.Accessibility.HEARING_AID_NOTIFICATION_ROUTING); dumpSetting(s, p, Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, SecureSettingsProto.Accessibility.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED); |