PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[HA Audio Output] Change category according to the audio definition

Browse Source 
Root Cause: According to the audio definition, system sounds are UI touch sounds, unlock sounds, etc., so they are controlled by Media strategy.

Solution: Move system sounds, accessibility sounds, DTMF sounds into Media category. Notification category contains notification sounds only.

Bug: 293251163
Test: manual test
Change-Id: Ied3db95dacbd2c0985bdbfccec5575bb5988fc5b
This commit is contained in:
jasonwshsu
2023-11-21 02:40:21 +08:00
committed by Jason Hsu
parent 28bbbf783b
commit a9e89031b6
6 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -160,10 +160,10 @@
<string name="bluetooth_ringtone_title">Ringtone and alarms</string>
<!-- Bluetooth audio output settings. Title of the option managing call audio path. [CHAR LIMIT=30] -->
<string name="bluetooth_call_title">Audio during calls</string>
<!-- Bluetooth audio output settings. Title of the option managing media audio path. [CHAR LIMIT=30] -->
<string name="bluetooth_media_title">Media</string>
<!-- Bluetooth audio output settings. Title of the option managing system sounds related audio path. [CHAR LIMIT=60] -->
<string name="bluetooth_system_sounds_title">Notifications and other system sounds</string>
<!-- Bluetooth audio output settings. Title of the option managing media and system sounds related audio path. [CHAR LIMIT=30] -->
<string name="bluetooth_media_title">Media and system sounds</string>
<!-- Bluetooth audio output settings. Title of the option managing notification audio path. [CHAR LIMIT=60] -->
<string name="bluetooth_notification_title">Notifications</string>
<!-- Description for text in accessibility hearing aids footer. [CHAR LIMIT=NONE] -->
<string name="bluetooth_audio_routing_footer_summary">By default, audio output is determined by individual apps</string>

6
res/xml/accessibility_audio_routing_fragment.xml
View File

@@ -46,10 +46,10 @@
android:entries="@array/bluetooth_audio_routing_titles"
android:entryValues="@array/bluetooth_audio_routing_values"
android:summary="%s"
android:key="audio_routing_system_sounds"
android:key="audio_routing_notification"
android:persistent="false"
android:title="@string/bluetooth_system_sounds_title"
settings:controller="com.android.settings.accessibility.HearingDeviceSystemSoundsRoutingPreferenceController" />
android:title="@string/bluetooth_notification_title"
settings:controller="com.android.settings.accessibility.HearingDeviceNotificationRoutingPreferenceController" />
<com.android.settings.accessibility.AccessibilityFooterPreference
android:key="hearing_device_footer"

4
src/com/android/settings/accessibility/HearingDeviceCallRoutingPreferenceController.java
View File

@@ -20,7 +20,6 @@ import android.content.Context;
import android.provider.Settings;
import com.android.settings.Utils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.HearingAidAudioRoutingConstants;
/**
@@ -28,9 +27,6 @@ import com.android.settingslib.bluetooth.HearingAidAudioRoutingConstants;
*/
public class HearingDeviceCallRoutingPreferenceController extends
HearingDeviceAudioRoutingBasePreferenceController {
private CachedBluetoothDevice mHearingDevice;
public HearingDeviceCallRoutingPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}

4
src/com/android/settings/accessibility/HearingDeviceMediaRoutingPreferenceController.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.provider.Settings;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.HearingAidAudioRoutingConstants;
/**
@@ -27,9 +26,6 @@ import com.android.settingslib.bluetooth.HearingAidAudioRoutingConstants;
*/
public class HearingDeviceMediaRoutingPreferenceController extends
HearingDeviceAudioRoutingBasePreferenceController {
private CachedBluetoothDevice mHearingDevice;
public HearingDeviceMediaRoutingPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}

15
src/com/android/settings/accessibility/HearingDeviceSystemSoundsRoutingPreferenceController.java → src/com/android/settings/accessibility/HearingDeviceNotificationRoutingPreferenceController.java
View File

@@ -19,39 +19,36 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.provider.Settings;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.HearingAidAudioRoutingConstants;
/**
* The controller of the hearing device system sounds routing list preference.
* The controller of the hearing device notification routing list preference.
*/
public class HearingDeviceSystemSoundsRoutingPreferenceController extends
public class HearingDeviceNotificationRoutingPreferenceController extends
HearingDeviceAudioRoutingBasePreferenceController {
private CachedBluetoothDevice mHearingDevice;
public HearingDeviceSystemSoundsRoutingPreferenceController(Context context,
public HearingDeviceNotificationRoutingPreferenceController(Context context,
String preferenceKey) {
super(context, preferenceKey);
}
@Override
protected int[] getSupportedAttributeList() {
return HearingAidAudioRoutingConstants.SYSTEM_SOUNDS_ROUTING_ATTRIBUTES;
return HearingAidAudioRoutingConstants.NOTIFICATION_ROUTING_ATTRIBUTES;
}
@Override
protected void saveRoutingValue(Context context, int routingValue) {
Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING, routingValue);
Settings.Secure.HEARING_AID_NOTIFICATION_ROUTING, routingValue);
}
@Override
protected int restoreRoutingValue(Context context) {
return Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
Settings.Secure.HEARING_AID_NOTIFICATION_ROUTING,
HearingAidAudioRoutingConstants.RoutingValue.AUTO);
}
}

5
src/com/android/settings/accessibility/HearingDeviceRingtoneRoutingPreferenceController.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.accessibility;
import android.content.Context;
import android.provider.Settings;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.HearingAidAudioRoutingConstants;
/**
@@ -28,15 +27,13 @@ import com.android.settingslib.bluetooth.HearingAidAudioRoutingConstants;
public class HearingDeviceRingtoneRoutingPreferenceController extends
HearingDeviceAudioRoutingBasePreferenceController {
private CachedBluetoothDevice mHearingDevice;
public HearingDeviceRingtoneRoutingPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
protected int[] getSupportedAttributeList() {
return HearingAidAudioRoutingConstants.RINGTONE_ROUTING_ATTRIBUTE;
return HearingAidAudioRoutingConstants.RINGTONE_ROUTING_ATTRIBUTES;
}