PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding temporary setting for enabling touch exploration."

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-07-18 12:57:35 -07:00
committed by Android (Google) Code Review
parent 2d719ce9dc 37d04f748f
commit 93a727d5d5
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -2724,6 +2724,8 @@ found in the list of installed applications.</string>
<string name="accessibility_power_button_ends_call">Power button ends call</string>
<!-- Accessibility settings: power button behavior summary text -->
<string name="accessibility_power_button_ends_call_summary">During a call, pressing Power ends call instead of turning off screen</string>
<!-- Accessibility settings: touch exploration state -->
<string name="accessibility_touch_exploration_enabled">Touch exploration</string>
<!-- Accessibility settings: button for lauching settings for an accessibility service -->
<string name="settings_button">Settings</string>

4
res/xml/accessibility_settings.xml
View File

@@ -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"/>
<CheckBoxPreference
android:key="touch_exploration_enabled"
android:title="@string/accessibility_touch_exploration_enabled"
android:persistent="false" />
</PreferenceCategory>
</PreferenceScreen>

15
src/com/android/settings/AccessibilitySettings.java
View File

@@ -75,6 +75,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";
@@ -93,6 +96,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
private PreferenceCategory mPowerButtonCategory;
private CheckBoxPreference mPowerButtonEndsCallCheckBox;
private CheckBoxPreference mTouchExplorationEnabledCheckBox;
private PreferenceGroup mAccessibilityServicesCategory;
@@ -128,6 +132,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);
@@ -155,6 +162,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);
}
@@ -296,6 +307,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) {