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

Add a new NFC developer setting option for NFCSNOOP am: a2f8944942

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: Ic96878e632ec919f2486263a5cb479486b9d4c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack Yu
2023-02-22 18:30:37 +00:00
committed by Automerger Merge Worker
parent f9d1535640 a2f8944942
commit 81f481fac4
5 changed files with 262 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,9 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
implements OnMainSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
AdbClearKeysDialogHost, LogPersistDialogHost,
BluetoothRebootDialog.OnRebootDialogListener,
AbstractBluetoothPreferenceController.Callback, BluetoothSnoopLogHost {
AbstractBluetoothPreferenceController.Callback,
BluetoothSnoopLogHost,
NfcRebootDialog.OnNfcRebootDialogConfirmedListener {
private static final String TAG = "DevSettingsDashboard";
@@ -410,6 +412,20 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllerPbap.onSettingChanged();
}
@Override
public void onNfcRebootDialogConfirmed() {
final NfcSnoopLogPreferenceController controller =
getDevelopmentOptionsController(NfcSnoopLogPreferenceController.class);
controller.onNfcRebootDialogConfirmed();
}
@Override
public void onNfcRebootDialogCanceled() {
final NfcSnoopLogPreferenceController controller =
getDevelopmentOptionsController(NfcSnoopLogPreferenceController.class);
controller.onNfcRebootDialogCanceled();
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
boolean handledResult = false;
@@ -574,6 +590,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new BluetoothLeAudioHwOffloadPreferenceController(context, fragment));
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
controllers.add(new NfcStackDebugLogPreferenceController(context));
controllers.add(new NfcSnoopLogPreferenceController(context, fragment));
controllers.add(new ShowTapsPreferenceController(context));
controllers.add(new PointerLocationPreferenceController(context));
controllers.add(new ShowSurfaceUpdatesPreferenceController(context));