Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e89dc361 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

rename v2 controllers

 - Remove v2 postfix on controllers now that v1 dev options have been
 removed

Bug: 34203528
Test: compiles and tests still pass
Change-Id: I7a937e914293233801dbd1d9536b7b47ee70d591
parent eeffbf62
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;

public class BugReportInPowerPreferenceControllerV2 extends
public class BugReportInPowerPreferenceController extends
        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
        PreferenceControllerMixin {

@@ -48,7 +48,7 @@ public class BugReportInPowerPreferenceControllerV2 extends
    private final UserManager mUserManager;
    private SwitchPreference mPreference;

    public BugReportInPowerPreferenceControllerV2(Context context) {
    public BugReportInPowerPreferenceController(Context context) {
        super(context);
        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
        mPackageManager = new PackageManagerWrapper(context.getPackageManager());
+2 −2
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ import android.os.UserManager;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;

public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceController implements
public class BugReportPreferenceController extends DeveloperOptionsPreferenceController implements
        PreferenceControllerMixin {

    private static final String KEY_BUGREPORT = "bugreport";

    private final UserManager mUserManager;

    public BugReportPreferenceControllerV2(Context context) {
    public BugReportPreferenceController(Context context) {
        super(context);

        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;

public class CameraLaserSensorPreferenceControllerV2 extends
public class CameraLaserSensorPreferenceController extends
        DeveloperOptionsPreferenceController implements
        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

@@ -51,7 +51,7 @@ public class CameraLaserSensorPreferenceControllerV2 extends

    private SwitchPreference mPreference;

    public CameraLaserSensorPreferenceControllerV2(Context context) {
    public CameraLaserSensorPreferenceController(Context context) {
        super(context);
    }

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;

public class ConnectivityMonitorPreferenceControllerV2 extends
public class ConnectivityMonitorPreferenceController extends
        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
        PreferenceControllerMixin {

@@ -55,7 +55,7 @@ public class ConnectivityMonitorPreferenceControllerV2 extends

    private SwitchPreference mPreference;

    public ConnectivityMonitorPreferenceControllerV2(Context context) {
    public ConnectivityMonitorPreferenceController(Context context) {
        super(context);
    }

+12 −12
Original line number Diff line number Diff line
@@ -257,15 +257,15 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra

    @Override
    public void onDisableLogPersistDialogConfirmed() {
        final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController(
                LogPersistPreferenceControllerV2.class);
        final LogPersistPreferenceController controller = getDevelopmentOptionsController(
                LogPersistPreferenceController.class);
        controller.onDisableLogPersistDialogConfirmed();
    }

    @Override
    public void onDisableLogPersistDialogRejected() {
        final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController(
                LogPersistPreferenceControllerV2.class);
        final LogPersistPreferenceController controller = getDevelopmentOptionsController(
                LogPersistPreferenceController.class);
        controller.onDisableLogPersistDialogRejected();
    }

@@ -362,7 +362,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
            BluetoothA2dpConfigStore bluetoothA2dpConfigStore) {
        final List<AbstractPreferenceController> controllers = new ArrayList<>();
        controllers.add(new MemoryUsagePreferenceController(context));
        controllers.add(new BugReportPreferenceControllerV2(context));
        controllers.add(new BugReportPreferenceController(context));
        controllers.add(new LocalBackupPasswordPreferenceController(context));
        controllers.add(new StayAwakePreferenceController(context, lifecycle));
        controllers.add(new HdcpCheckingPreferenceController(context));
@@ -370,23 +370,23 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
        controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
        controllers.add(new FileEncryptionPreferenceController(context));
        controllers.add(new PictureColorModePreferenceController(context, lifecycle));
        controllers.add(new WebViewAppPreferenceControllerV2(context));
        controllers.add(new WebViewAppPreferenceController(context));
        controllers.add(new CoolColorTemperaturePreferenceController(context));
        controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
        controllers.add(new AdbPreferenceController(context, fragment));
        controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
        controllers.add(new LocalTerminalPreferenceController(context));
        controllers.add(new BugReportInPowerPreferenceControllerV2(context));
        controllers.add(new BugReportInPowerPreferenceController(context));
        controllers.add(new MockLocationAppPreferenceController(context, fragment));
        controllers.add(new DebugViewAttributesPreferenceController(context));
        controllers.add(new SelectDebugAppPreferenceController(context, fragment));
        controllers.add(new WaitForDebuggerPreferenceController(context));
        controllers.add(new EnableGpuDebugLayersPreferenceController(context));
        controllers.add(new VerifyAppsOverUsbPreferenceControllerV2(context));
        controllers.add(new LogdSizePreferenceControllerV2(context));
        controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle));
        controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
        controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
        controllers.add(new VerifyAppsOverUsbPreferenceController(context));
        controllers.add(new LogdSizePreferenceController(context));
        controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
        controllers.add(new ConnectivityMonitorPreferenceController(context));
        controllers.add(new CameraLaserSensorPreferenceController(context));
        controllers.add(new WifiDisplayCertificationPreferenceController(context));
        controllers.add(new WifiVerboseLoggingPreferenceController(context));
        controllers.add(new WifiAggressiveHandoverPreferenceController(context));
Loading