diff --git a/res/values/strings.xml b/res/values/strings.xml
index 97c07260b20..a399c47a343 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3946,15 +3946,6 @@
Show App Not Responding dialog
for background apps
-
- Accessibility
-
-
- Auto update magnification
-
- Zoom out on rotation or activity
- start and pan to popped up windows.
-
Data usage
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 575f8020bb4..a4f6ee20e74 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -200,16 +200,6 @@
android:title="@string/show_all_anrs"
android:summary="@string/show_all_anrs_summary"/>
-
-
-
-
-
-
-
+
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index f590ea6988c..09d7f9bf5f1 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -98,8 +98,6 @@ public class DevelopmentSettings extends PreferenceFragment
private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
- private static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE_KEY =
- "accessibility_display_magnification_auto_update";
private static final String ENABLE_TRACES_KEY = "enable_traces";
@@ -144,7 +142,6 @@ public class DevelopmentSettings extends PreferenceFragment
private CheckBoxPreference mShowHwScreenUpdates;
private CheckBoxPreference mShowHwLayersUpdates;
private CheckBoxPreference mDebugLayout;
- private CheckBoxPreference mDisplayMangificationAutoUpdate;
private ListPreference mWindowAnimationScale;
private ListPreference mTransitionAnimationScale;
private ListPreference mAnimatorDurationScale;
@@ -240,9 +237,6 @@ public class DevelopmentSettings extends PreferenceFragment
mAllPrefs.add(hdcpChecking);
}
removeHdcpOptionsForProduction();
-
- mDisplayMangificationAutoUpdate = findAndInitCheckboxPref(
- ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE_KEY);
}
private CheckBoxPreference findAndInitCheckboxPref(String key) {
@@ -376,7 +370,6 @@ public class DevelopmentSettings extends PreferenceFragment
updateImmediatelyDestroyActivitiesOptions();
updateAppProcessLimitOptions();
updateShowAllANRsOptions();
- updateDisplayMagnificationAutoUpdate();
}
private void resetDangerousOptions() {
@@ -630,12 +623,6 @@ public class DevelopmentSettings extends PreferenceFragment
pokeSystemProperties();
}
- private void writeDisplayMagnificationAutoUpdate() {
- Settings.Secure.putInt(getActivity().getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE,
- mDisplayMangificationAutoUpdate.isChecked() ? 1 : 0);
- }
-
private void updateCpuUsageOptions() {
updateCheckBox(mShowCpuUsage, Settings.System.getInt(getActivity().getContentResolver(),
Settings.System.SHOW_PROCESSES, 0) != 0);
@@ -769,12 +756,6 @@ public class DevelopmentSettings extends PreferenceFragment
getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
}
- private void updateDisplayMagnificationAutoUpdate() {
- updateCheckBox(mDisplayMangificationAutoUpdate,
- Settings.Secure.getInt(getActivity().getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE, 0) != 0);
- }
-
private void updateEnableTracesOptions() {
long flags = SystemProperties.getLong(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS, 0);
String[] values = mEnableTracesPref.getEntryValues();
@@ -928,8 +909,6 @@ public class DevelopmentSettings extends PreferenceFragment
writeShowHwLayersUpdatesOptions();
} else if (preference == mDebugLayout) {
writeDebugLayoutOptions();
- } else if (preference == mDisplayMangificationAutoUpdate) {
- writeDisplayMagnificationAutoUpdate();
}
return false;