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

Merge 25Q1 (ab/12770256) to aosp-main-future

Browse Source 
Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3
This commit is contained in:
Xin Li
2025-02-26 11:59:26 -08:00
parent 188402ad16 97072e434d
commit 5bfde9fbf5
1291 changed files with 58828 additions and 22728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -99,7 +99,9 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
AdbClearKeysDialogHost, LogPersistDialogHost,
BluetoothRebootDialog.OnRebootDialogListener,
AbstractBluetoothPreferenceController.Callback,
NfcRebootDialog.OnNfcRebootDialogConfirmedListener, BluetoothSnoopLogHost {
NfcRebootDialog.OnNfcRebootDialogConfirmedListener,
BluetoothSnoopLogHost,
BluetoothLeAudioModePreferenceController.OnModeChangeListener {
private static final String TAG = "DevSettingsDashboard";
@VisibleForTesting static final int REQUEST_BIOMETRIC_PROMPT = 100;
@@ -498,6 +500,10 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
getDevelopmentOptionsController(
BluetoothLeAudioModePreferenceController.class);
leAudioModeController.onRebootDialogConfirmed();
final BluetoothLeAudioUiPreferenceController leAudioUiController =
getDevelopmentOptionsController(BluetoothLeAudioUiPreferenceController.class);
leAudioUiController.onRebootDialogConfirmed();
}
@Override
@@ -520,6 +526,10 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
getDevelopmentOptionsController(
BluetoothLeAudioModePreferenceController.class);
leAudioModeController.onRebootDialogCanceled();
final BluetoothLeAudioUiPreferenceController leAudioUiController =
getDevelopmentOptionsController(BluetoothLeAudioUiPreferenceController.class);
leAudioUiController.onRebootDialogCanceled();
}
@Override
@@ -741,6 +751,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new BluetoothMapVersionPreferenceController(context));
controllers.add(new BluetoothLeAudioPreferenceController(context, fragment));
controllers.add(new BluetoothLeAudioModePreferenceController(context, fragment));
controllers.add(new BluetoothLeAudioUiPreferenceController(context, fragment));
controllers.add(new BluetoothLeAudioDeviceDetailsPreferenceController(context));
controllers.add(new BluetoothLeAudioAllowListPreferenceController(context));
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
@@ -855,6 +866,15 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
}
}
@Override
public void onBroadcastDisabled() {
for (AbstractPreferenceController controller : mPreferenceControllers) {
if (controller instanceof BluetoothLeAudioUiPreferenceController) {
((BluetoothLeAudioUiPreferenceController) controller).onBroadcastDisabled();
}
}
}
/**
* For Search.
*/