diff options
6 files changed, 4 insertions, 51 deletions
diff --git a/src/com/android/settings/development/BugReportPreferenceControllerV2.java b/src/com/android/settings/development/BugReportPreferenceControllerV2.java index 38dece86a2..5876f84090 100644 --- a/src/com/android/settings/development/BugReportPreferenceControllerV2.java +++ b/src/com/android/settings/development/BugReportPreferenceControllerV2.java @@ -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 - } } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index c80416b323..fa89ba40f7 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -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)); diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java index 0a6b4fa991..3249bcfae5 100644 --- a/src/com/android/settings/development/FileEncryptionPreferenceController.java +++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java @@ -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( diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java index e52b073cd1..51690ffbd3 100644 --- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java +++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java @@ -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) { diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java index 0ef2561d9b..a0e6592165 100644 --- a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java +++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java @@ -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; diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java index b2731ea5bf..40e2fbd76f 100644 --- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -90,17 +90,17 @@ public class ShowTapsPreferenceControllerTest { public void onPreferenceChange_preferenceChecked_shouldEnableShowTaps() { mController.onPreferenceChange(mPreference, true /* new value */); - int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), + final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), Settings.System.SHOW_TOUCHES, -1 /* default */); assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_ON); } @Test - public void onPreferenceChange__preferenceUnchecked_shouldDisableCameraLaserSensor() { + public void onPreferenceChange__preferenceUnchecked_shouldDisableShowTaps() { mController.onPreferenceChange(mPreference, false /* new value */); - int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), + final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), Settings.System.SHOW_TOUCHES, -1 /* default */); assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF); @@ -117,7 +117,7 @@ public class ShowTapsPreferenceControllerTest { public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() { mController.onDeveloperOptionsSwitchDisabled(); - int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), + final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), Settings.System.SHOW_TOUCHES, -1 /* default */); assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF); |