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

Commit ccee4218 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup Controllers/Fragments"

parents 2dda5a56 bb451a38

src/com/android/settings/development/BugReportPreferenceControllerV2.java

+0 −10
Original line number Diff line number Diff line
@@ -44,14 +44,4 @@ public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceC 
    public String getPreferenceKey() {

        return KEY_BUGREPORT;

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        // intentional no-op

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        // intentional no-op

    }

}

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+0 −7
Original line number Diff line number Diff line
@@ -358,14 +358,11 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new HdcpCheckingPreferenceController(context));

        controllers.add(new BluetoothSnoopLogPreferenceController(context));

        controllers.add(new OemUnlockPreferenceController(context, activity, fragment));

        // running services

        controllers.add(new FileEncryptionPreferenceController(context));

        controllers.add(new PictureColorModePreferenceController(context, lifecycle));

        controllers.add(new WebViewAppPreferenceControllerV2(context));

        controllers.add(new CoolColorTemperaturePreferenceController(context));

        controllers.add(new DisableAutomaticUpdatesPreferenceController(context));

        // system ui demo mode

        // quick settings developer tiles

        controllers.add(new AdbPreferenceController(context, fragment));

        controllers.add(new ClearAdbKeysPreferenceController(context, fragment));

        controllers.add(new LocalTerminalPreferenceController(context));
@@ -380,7 +377,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));

        controllers.add(new CameraLaserSensorPreferenceControllerV2(context));

        controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context));

        // feature flags

        controllers.add(new WifiDisplayCertificationPreferenceController(context));

        controllers.add(new WifiVerboseLoggingPreferenceController(context));

        controllers.add(new WifiAggressiveHandoverPreferenceController(context));
@@ -411,7 +407,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new TransitionAnimationScalePreferenceController(context));

        controllers.add(new AnimatorDurationScalePreferenceController(context));

        controllers.add(new SecondaryDisplayPreferenceController(context));

        // smallest width

        controllers.add(new ForceGpuRenderingPreferenceController(context));

        controllers.add(new GpuViewUpdatesPreferenceController(context));

        controllers.add(new HardwareLayersUpdatesPreferenceController(context));
@@ -426,10 +421,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new ProfileGpuRenderingPreferenceController(context));

        controllers.add(new KeepActivitiesPreferenceController(context));

        controllers.add(new BackgroundProcessLimitPreferenceController(context));

        // background check

        controllers.add(new AppsNotRespondingPreferenceController(context));

        controllers.add(new NotificationChannelWarningsPreferenceController(context));

        // inactive apps

        controllers.add(new AllowAppsOnExternalPreferenceController(context));

        controllers.add(new ResizableActivityPreferenceController(context));

        controllers.add(new FreeformWindowsPreferenceController(context));

src/com/android/settings/development/FileEncryptionPreferenceController.java

+0 −10
Original line number Diff line number Diff line
@@ -86,16 +86,6 @@ public class FileEncryptionPreferenceController extends 
                mContext.getResources().getString(R.string.convert_to_file_encryption_done));

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        // intentional no-op

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        // intentional no-op

    }



    private IStorageManager getStorageManager() {

        try {

            return IStorageManager.Stub.asInterface(

src/com/android/settings/development/LocalBackupPasswordPreferenceController.java

+0 −10
Original line number Diff line number Diff line
@@ -55,16 +55,6 @@ public class LocalBackupPasswordPreferenceController extends 
        updatePasswordSummary(preference);

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        // intentional no-op

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        // intentional no-op

    }



    private void updatePasswordSummary(Preference preference) {

        preference.setEnabled(isAdminUser() && mBackupManager != null);

        if (mBackupManager == null) {

src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java

+0 −10
Original line number Diff line number Diff line
@@ -58,16 +58,6 @@ public class ShortcutManagerThrottlingPreferenceController extends 
        return true;

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        // intentional no-op

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        // intentional no-op

    }



    private void resetShortcutManagerThrottling() {

        if (mShortcutService == null) {

            return;