Change String to CharSequence in #loadSummary.
Per API council review, localized strings should return CharSequence. Changes here
account for the different type returned.
Test: ag/1813674
Bug: 37723508
Change-Id: I7dacab8af48932db031de22835b65eba30393956
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index ac618d0..9f5e031 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -477,7 +477,7 @@
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 CharSequence serviceSummary = info.loadSummary(getPackageManager());
final String stateSummaryCombo = getString(
R.string.accessibility_summary_default_combination,
serviceState, serviceSummary);
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index 8b6d52a..37f6546 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -67,7 +67,7 @@
candidates.add(new DefaultAppInfo(mPm,
UserHandle.myUserId(),
installedServiceInfo.getComponentName(),
- installedServiceInfo.loadSummary(mPm.getPackageManager()),
+ (String) installedServiceInfo.loadSummary(mPm.getPackageManager()),
true /* enabled */));
}