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

Merge "Resolved accessibility service preference summary strings to use a common resource."

Browse Source
This commit is contained in:
Saige McVea
2017-03-24 22:56:03 +00:00
committed by Android (Google) Code Review
parent 661dc1229c 6413604bbd
commit 5bbf987d1a
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -4140,6 +4140,13 @@
<!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] --> <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->
<string name="accessibility_autoclick_delay_preference_title">Delay before click</string> <string name="accessibility_autoclick_delay_preference_title">Delay before click</string>
<!-- Summary text for accessibility service preferences, or preferences including a short description (eg. "ON / High accuracy mode"). -->
<string name="accessibility_summary_default_combination"><xliff:g id="state" example="ON">%1$s</xliff:g> / <xliff:g id="description" example="High accuracy mode">%2$s</xliff:g></string>
<!-- Preference's state when enabled. Note: UPPERCASE -->
<string name="accessibility_summary_state_enabled">ON</string>
<!-- Preference's state when disabled. Note: UPPERCASE -->
<string name="accessibility_summary_state_disabled">OFF</string>
<!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] --> <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
<string name="enable_quick_setting">Show in Quick Settings</string> <string name="enable_quick_setting">Show in Quick Settings</string>
<!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] --> <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->

16
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -470,12 +470,15 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
preference.setIcon(icon); preference.setIcon(icon);
final boolean serviceEnabled = accessibilityEnabled final boolean serviceEnabled = accessibilityEnabled
&& enabledServices.contains(componentName); && enabledServices.contains(componentName);
String serviceState = serviceEnabled ? final String serviceState = serviceEnabled ?
getString(R.string.accessibility_feature_state_on) : getString(R.string.accessibility_summary_state_enabled) :
getString(R.string.accessibility_feature_state_off); getString(R.string.accessibility_summary_state_disabled);
String serviceSummary = info.loadSummary(getPackageManager()); final String serviceSummary = info.loadSummary(getPackageManager());
serviceSummary = (TextUtils.isEmpty(serviceSummary)) ? serviceState : final String stateSummaryCombo = getString(
serviceSummary; R.string.accessibility_summary_default_combination,
serviceState, serviceSummary);
preference.setSummary((TextUtils.isEmpty(serviceSummary)) ? serviceState
: stateSummaryCombo);
// Disable all accessibility services that are not permitted. // Disable all accessibility services that are not permitted.
boolean serviceAllowed = boolean serviceAllowed =
@@ -492,7 +495,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
preference.setEnabled(true); preference.setEnabled(true);
} }
preference.setSummary(serviceSummary);
preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName()); preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
preference.setPersistent(true); preference.setPersistent(true);