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

Merge "Introduce ClearAdbKeysPreferenceController"

Browse Source
This commit is contained in:
Jeffrey Huang
2017-10-03 16:48:56 +00:00
committed by Android (Google) Code Review
parent ecf5b81163 97dbff233d
commit aded3c3bce
6 changed files with 422 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,8 @@ import java.util.Arrays;
import java.util.List;
public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost {
implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
AdbClearKeysDialogHost {
private static final String TAG = "DevSettingsDashboard";
@@ -170,6 +171,13 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controller.onAdbDialogDismissed();
}
@Override
public void onAdbClearKeysDialogConfirmed() {
final ClearAdbKeysPreferenceController controller = getDevelopmentOptionsController(
ClearAdbKeysPreferenceController.class);
controller.onClearAdbKeysConfirmed();
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
boolean handledResult = false;
@@ -252,7 +260,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
// system ui demo mode
// quick settings developer tiles
controllers.add(new AdbPreferenceController(context, fragment));
// revoke usb debugging authorizations
controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
controllers.add(new LocalTerminalPreferenceController(context));
controllers.add(new BugReportInPowerPreferenceControllerV2(context));
// select mock location app