Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[HA Audio Output] Change category according to the audio definition" into main

Browse Source
This commit is contained in:
Jason Hsu
2023-12-15 13:23:46 +00:00
committed by Android (Google) Code Review
parent 132252da27 a9e89031b6
commit cb9870b087
6 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
}