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

Merge "Add A11y Slices" into pi-dev am: bc4c392ff4

Browse Source 
am: c82cf95105

Change-Id: Iabff6994e9a4eb67d2702eb949f6e60939db0508
This commit is contained in:
Matthew Fritze
2018-04-17 18:54:46 -07:00
committed by android-build-merger
parent fdd3081b66 c82cf95105
commit e2d07ea458
14 changed files with 467 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,6 +344,21 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
return super.onPreferenceTreeClick(preference);
}
public static CharSequence getServiceSummary(Context context, AccessibilityServiceInfo info,
boolean serviceEnabled) {
final String serviceState = serviceEnabled
? context.getString(R.string.accessibility_summary_state_enabled)
: context.getString(R.string.accessibility_summary_state_disabled);
final CharSequence serviceSummary = info.loadSummary(context.getPackageManager());
final String stateSummaryCombo = context.getString(
R.string.preference_summary_default_combination,
serviceState, serviceSummary);
return (TextUtils.isEmpty(serviceSummary))
? serviceState
: stateSummaryCombo;
}
private void handleToggleTextContrastPreferenceClick() {
Settings.Secure.putInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED,
@@ -545,15 +560,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
preference.setSummary(R.string.accessibility_summary_state_stopped);
description = getString(R.string.accessibility_description_state_stopped);
} else {
final String serviceState = serviceEnabled ?
getString(R.string.accessibility_summary_state_enabled) :
getString(R.string.accessibility_summary_state_disabled);
final CharSequence serviceSummary = info.loadSummary(getPackageManager());
final String stateSummaryCombo = getString(
R.string.preference_summary_default_combination,
serviceState, serviceSummary);
preference.setSummary((TextUtils.isEmpty(serviceSummary)) ? serviceState
: stateSummaryCombo);
final CharSequence serviceSummary = getServiceSummary(getContext(), info,
serviceEnabled);
preference.setSummary(serviceSummary);
}
// Disable all accessibility services that are not permitted.