diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-09-20 19:15:29 -0700 |
---|---|---|
committer | Svetoslav Ganov <svetoslavganov@google.com> | 2012-09-20 19:15:33 -0700 |
commit | 43af40be48aeb58cca7733a80bfb7a6424ec1f17 (patch) | |
tree | 3cfa2d0b6b8fa300262b6c9bf2d33506ef99e76e | |
parent | 9e143f5e9d836d2d3dd0b2f59f7d14327ade0193 (diff) | |
download | packages_apps_settings-43af40be48aeb58cca7733a80bfb7a6424ec1f17.zip packages_apps_settings-43af40be48aeb58cca7733a80bfb7a6424ec1f17.tar.gz packages_apps_settings-43af40be48aeb58cca7733a80bfb7a6424ec1f17.tar.bz2 |
Remove accessibility category from developer options.
1. There is a temporary accessibility option in developer options with
one item for enabling automatic zoom out and panning. This is not a
developer option in general and should not be there.
bug:7207305
Change-Id: Ib146ccb3704dd94d635cc668b71c007fbd8d29b3
-rw-r--r-- | res/values/strings.xml | 9 | ||||
-rw-r--r-- | res/xml/development_prefs.xml | 12 | ||||
-rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 21 |
3 files changed, 1 insertions, 41 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 97c0726..a399c47 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3946,15 +3946,6 @@ <string name="show_all_anrs_summary">Show App Not Responding dialog for background apps</string> - <!-- Preference category for accessibility debugging development settings. [CHAR LIMIT=25] --> - <string name="debug_accessibility_category">Accessibility</string> - - <!-- Accessibility debug setting: automatically update magnification state [CHAR LIMIT=50] --> - <string name="display_magnification_auto_update">Auto update magnification</string> - <!-- Accessibility debug setting: automatically update magnification state summary [CHAR LIMIT=100] --> - <string name="display_magnification_auto_update_summary">Zoom out on rotation or activity - start and pan to popped up windows.</string> - <!-- Activity title for network data usage summary. [CHAR LIMIT=25] --> <string name="data_usage_summary_title">Data usage</string> <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] --> diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 575f802..a4f6ee2 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"/> - </PreferenceCategory> - - <PreferenceCategory android:key="debug_accessibility_category" - android:title="@string/debug_accessibility_category"> - - <CheckBoxPreference - android:key="accessibility_display_magnification_auto_update" - android:title="@string/display_magnification_auto_update" - android:summary="@string/display_magnification_auto_update_summary"/> - - </PreferenceCategory> + </PreferenceCategory> </PreferenceScreen> diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index f590ea6..09d7f9b 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; |