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

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

@@ -470,12 +470,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 =
@@ -492,7 +495,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
preference.setEnabled(true);
}
preference.setSummary(serviceSummary);
preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
preference.setPersistent(true);