Merge "Settings for the screen magnification feature." into jb-mr1-dev (d4b711e6) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+42 −11

Original line number	Diff line number	Diff line
		@@ -2976,30 +2976,52 @@
		<string name="accessibility_settings">Accessibility</string>
		<!-- Settings title for accessibility settings screen -->
		<string name="accessibility_settings_title">Accessibility settings</string>

		<!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
		<string name="accessibility_services_title">Services</string>

		<!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
		<string name="accessibility_system_title">System</string>
		<!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
		<string name="accessibility_screen_magnification_title">Screen magnification</string>
		<!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
		<string name="accessibility_screen_magnification_summary">
		When screen magnification is on, you can:\n
		\n
		Temporary zoom-in: Triple-tap & hold.\n
		Toggle permanent zoom state: Triple-tap & release.\n
		\n
		Adjust zoomed area: Triple-tap & hold to zoom, then drag your finger across the screen.\n
		Pan when zoomed-in: Drag two or more fingers across the screen.\n
		\n
		Adjust zoom level when zoomed-out: Triple-tap & hold to zoom, then drag one or more fingers.\n
		Adjust zoom level when zoomed-in: Pinch with two or more fingers.\n
		</string>

		<!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
		<string name="accessibility_toggle_large_text_title">Large text</string>
		<string name="accessibility_toggle_large_text_preference_title">Large text</string>
		<!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
		<string name="accessibility_toggle_screen_magnification_preference_title">Screen magnification</string>
		<!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
		<string name="accessibility_toggle_screen_magnification_auto_update_preference_title">Auto
		update screen magnification</string>
		<!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
		<string name="accessibility_toggle_screen_magnification_auto_update_preference_summary">Update
		screen magnification on app transitions</string>
		<!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
		<string name="accessibility_power_button_ends_call_title">Power button ends call</string>
		<string name="accessibility_power_button_ends_call_prerefence_title">Power button ends call</string>
		<!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
		<string name="accessibility_speak_password_title">Speak passwords</string>
		<string name="accessibility_toggle_speak_password_preference_title">Speak passwords</string>
		<!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
		<string name="accessibility_long_press_timeout_title">Touch & hold delay</string>
		<string name="accessibility_long_press_timeout_preference_title">Touch & hold delay</string>
		<!-- Title for accessibility preference to install accessibility scripts from Google. [CHAR LIMIT=35] -->
		<string name="accessibility_script_injection_title">Enhance web accessibility</string>
		<string name="accessibility_toggle_script_injection_preference_title">Enhance web accessibility</string>

		<!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
		<string name="accessibility_menu_item_settings">Settings</string>

		<!-- Summary for the enabled state of an accessiblity serivce. [CHAR LIMIT=10] -->
		<string name="accessibility_service_state_on">On</string>
		<!-- Summary for the disabled state of an accessiblity serivce. [CHAR LIMIT=10] -->
		<string name="accessibility_service_state_off">Off</string>
		<!-- Summary for the enabled state of an accessiblity feature. [CHAR LIMIT=10] -->
		<string name="accessibility_feature_state_on">On</string>
		<!-- Summary for the disabled state of an accessiblity feature. [CHAR LIMIT=10] -->
		<string name="accessibility_feature_state_off">Off</string>

		<!-- Summary for the allowed state of script injection. [CHAR LIMIT=15] -->
		<string name="accessibility_script_injection_allowed">Allowed</string>
		@@ -3855,6 +3877,15 @@
		<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] -->

res/xml/accessibility_settings.xml

+12 −7

Original line number	Diff line number	Diff line
		@@ -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"/>

		<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"

res/xml/development_prefs.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -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>

src/com/android/settings/AccessibilitySettings.java

+256 −182

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/DevelopmentSettings.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,8 @@ 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";

		@@ -142,6 +144,7 @@ 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;
		@@ -237,6 +240,9 @@ public class DevelopmentSettings extends PreferenceFragment
		mAllPrefs.add(hdcpChecking);
		}
		removeHdcpOptionsForProduction();

		mDisplayMangificationAutoUpdate = findAndInitCheckboxPref(
		ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE_KEY);
		}

		private CheckBoxPreference findAndInitCheckboxPref(String key) {
		@@ -370,6 +376,7 @@ public class DevelopmentSettings extends PreferenceFragment
		updateImmediatelyDestroyActivitiesOptions();
		updateAppProcessLimitOptions();
		updateShowAllANRsOptions();
		updateDisplayMagnificationAutoUpdate();
		}

		private void resetDangerousOptions() {
		@@ -623,6 +630,12 @@ 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);
		@@ -756,6 +769,12 @@ 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();
		@@ -909,6 +928,8 @@ public class DevelopmentSettings extends PreferenceFragment
		writeShowHwLayersUpdatesOptions();
		} else if (preference == mDebugLayout) {
		writeDebugLayoutOptions();
		} else if (preference == mDisplayMangificationAutoUpdate) {
		writeDisplayMagnificationAutoUpdate();
		}

		return false;