From 37d04f748f6c6ebc26c21337a82848c84489a2c9 Mon Sep 17 00:00:00 2001 From: Svetoslav Ganov Date: Fri, 15 Jul 2011 14:26:46 -0700 Subject: [PATCH] Adding temporary setting for enabling touch exploration. Change-Id: I81cef6f3bf4e533da1082bf836a74e38fe718af3 --- res/values/strings.xml | 2 ++ res/xml/accessibility_settings.xml | 4 ++++ .../android/settings/AccessibilitySettings.java | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 29122910927..8f61014ce46 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2693,6 +2693,8 @@ found in the list of installed applications. Power button ends call During a call, pressing Power ends call instead of turning off screen + + Touch exploration Settings diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 90aef847ff6..feb5fb13440 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -56,6 +56,10 @@ android:entries="@array/long_press_timeout_selector_titles" android:entryValues="@array/long_press_timeout_selector_values" android:defaultValue="@string/long_press_timeout_selector_default_value"/> + diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java index bbb36787922..52d5e92f538 100644 --- a/src/com/android/settings/AccessibilitySettings.java +++ b/src/com/android/settings/AccessibilitySettings.java @@ -74,6 +74,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements private static final String POWER_BUTTON_ENDS_CALL_CHECKBOX = "power_button_ends_call"; + private static final String TOUCH_EXPLORATION_ENABLED_CHECKBOX = + "touch_exploration_enabled"; + private static final String KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX = "key_toggle_accessibility_service_checkbox"; @@ -92,6 +95,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements private PreferenceCategory mPowerButtonCategory; private CheckBoxPreference mPowerButtonEndsCallCheckBox; + private CheckBoxPreference mTouchExplorationEnabledCheckBox; private PreferenceGroup mAccessibilityServicesCategory; @@ -127,6 +131,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements mPowerButtonEndsCallCheckBox = (CheckBoxPreference) findPreference( POWER_BUTTON_ENDS_CALL_CHECKBOX); + mTouchExplorationEnabledCheckBox = (CheckBoxPreference) findPreference( + TOUCH_EXPLORATION_ENABLED_CHECKBOX); + mLongPressTimeoutListPreference = (ListPreference) findPreference( KEY_LONG_PRESS_TIMEOUT_LIST_PREFERENCE); @@ -154,6 +161,10 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements getPreferenceScreen().removePreference(mPowerButtonCategory); } + boolean touchExplorationEnabled = (Settings.Secure.getInt(getContentResolver(), + Settings.Secure.TOUCH_EXPLORATION_REQUESTED, 0) == 1); + mTouchExplorationEnabledCheckBox.setChecked(touchExplorationEnabled); + mLongPressTimeoutListPreference.setOnPreferenceChangeListener(this); } @@ -295,6 +306,10 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, (isChecked ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF)); + } else if (TOUCH_EXPLORATION_ENABLED_CHECKBOX.equals(key)) { + final int touchExplorationState = ((CheckBoxPreference) preference).isChecked() ? 1 : 0; + Settings.Secure.putInt(getContentResolver(), + Settings.Secure.TOUCH_EXPLORATION_REQUESTED, touchExplorationState); } else if (TOGGLE_ACCESSIBILITY_SCRIPT_INJECTION_CHECKBOX.equals(key)) { handleToggleAccessibilityScriptInjection((CheckBoxPreference) preference); } else if (preference instanceof CheckBoxPreference) {