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

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

Browse Source 
Test: Manual

Bug: 34682532

Change-Id: Idf617fb5008181a0739689e40fef6b3a86aaf72b
This commit is contained in:
Saige McVea
2017-03-23 15:57:44 -07:00
parent 510a1a696a
commit 6413604bbd
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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