Introduce LogPersistPreferenceControllerV2

- Create new LogPersistPreferenceControllerV2
 - Deprecate LogPersistPreferenceController
 - Add DisableLogPersistWarningDialog
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I8ff49ec4ece15cad2d0c60bd21488e3f5d55ee98
This commit is contained in:
jeffreyhuang
2017-10-09 16:22:40 -07:00
parent cafce68bc2
commit 60ab063ea3
8 changed files with 333 additions and 2 deletions

View File

@@ -52,7 +52,7 @@ import java.util.List;
public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
AdbClearKeysDialogHost {
AdbClearKeysDialogHost, LogPersistDialogHost {
private static final String TAG = "DevSettingsDashboard";
@@ -179,6 +179,20 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controller.onClearAdbKeysConfirmed();
}
@Override
public void onDisableLogPersistDialogConfirmed() {
final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController(
LogPersistPreferenceControllerV2.class);
controller.onDisableLogPersistDialogConfirmed();
}
@Override
public void onDisableLogPersistDialogRejected() {
final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController(
LogPersistPreferenceControllerV2.class);
controller.onDisableLogPersistDialogRejected();
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
boolean handledResult = false;
@@ -270,7 +284,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new WaitForDebuggerPreferenceController(context));
controllers.add(new VerifyAppsOverUsbPreferenceControllerV2(context));
controllers.add(new LogdSizePreferenceControllerV2(context));
// store logger data persistently on device
controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle));
controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context));