summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-08-06 10:55:11 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2012-09-07 16:07:57 -0700
commitdecf36e6a50d81ef0955235da99001e500e7cbe2 (patch)
tree0a82adda7b24f9bde896750a75d51739bbf0ff5c /res/xml
parent96c2f8c50865e823e710be4d92f1589f978f03c2 (diff)
downloadpackages_apps_settings-decf36e6a50d81ef0955235da99001e500e7cbe2.zip
packages_apps_settings-decf36e6a50d81ef0955235da99001e500e7cbe2.tar.gz
packages_apps_settings-decf36e6a50d81ef0955235da99001e500e7cbe2.tar.bz2
Settings for the screen magnification feature.
1. Screen magnification on the device has to he explicitly enabled by the user before allowing a global gesture related interactions. The feature toggle setting is in Settings->Accessibility and it is a separate screen with instructions how to use the feature and a toggle switch. 2. Added a setting in developer options for toggling the magnification auto update feature. If this features is on the screen is zoomed out or rotation or activity start. Also if the feature is enabled the magnified viewport will scroll to show popped up windows. bug:5587727 Change-Id: Ic45a21d3a3928e2f5aac034751801f090b261488
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/accessibility_settings.xml19
-rw-r--r--res/xml/development_prefs.xml10
2 files changed, 22 insertions, 7 deletions
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index bf93eb5..e86dff6 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -27,14 +27,19 @@
android:key="system_category"
android:title="@string/accessibility_system_title">
+ <PreferenceScreen
+ android:fragment="com.android.settings.AccessibilitySettings$ToggleScreenMagnificationPreferenceFragment"
+ android:key="screen_magnification_preference_screen"
+ android:title="@string/accessibility_screen_magnification_title"/>
+
<CheckBoxPreference
android:key="toggle_large_text_preference"
- android:title="@string/accessibility_toggle_large_text_title"
+ android:title="@string/accessibility_toggle_large_text_preference_title"
android:persistent="false"/>
<CheckBoxPreference
android:key="toggle_power_button_ends_call_preference"
- android:title="@string/accessibility_power_button_ends_call_title"
+ android:title="@string/accessibility_power_button_ends_call_prerefence_title"
android:persistent="false"/>
<CheckBoxPreference
@@ -44,15 +49,15 @@
<CheckBoxPreference
android:key="toggle_speak_password_preference"
- android:title="@string/accessibility_speak_password_title"
+ android:title="@string/accessibility_toggle_speak_password_preference_title"
android:persistent="false"/>
- <PreferenceScreen android:key="tts_settings"
+ <PreferenceScreen android:key="tts_settings_preference"
android:fragment="com.android.settings.tts.TextToSpeechSettings"
- android:title="@string/tts_settings_title" />
+ android:title="@string/tts_settings_title"/>
<ListPreference android:key="select_long_press_timeout_preference"
- android:title="@string/accessibility_long_press_timeout_title"
+ android:title="@string/accessibility_long_press_timeout_preference_title"
android:entries="@array/long_press_timeout_selector_titles"
android:entryValues="@array/long_press_timeout_selector_values"
android:persistent="false"/>
@@ -60,7 +65,7 @@
<!-- We want a dialog with no title, so use an empty string to avoid a fall back to the preference title. -->
<com.android.settings.AccessibilityEnableScriptInjectionPreference
android:key="toggle_script_injection_preference"
- android:title="@string/accessibility_script_injection_title"
+ android:title="@string/accessibility_toggle_script_injection_preference_title"
android:dialogTitle=""
android:dialogIcon="@android:drawable/ic_dialog_alert"
android:dialogMessage="@string/accessibility_script_injection_security_warning_summary"
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 34c0ae3..575f802 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -202,4 +202,14 @@
</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>
+
</PreferenceScreen>