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

Merge "Change String to CharSequence in #loadSummary." into oc-dev am: ad597344a2

Browse Source 
am: e86e611f76

Change-Id: Id13f41ae6cb32d575193732136489bbac0702a3c
This commit is contained in:
Jeff Sharkey
2017-05-01 18:22:36 +00:00
committed by android-build-merger
parent 897b93aa8b e86e611f76
commit 4869effb72
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -478,7 +478,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
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);

2
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -69,7 +69,7 @@ public class ShortcutServicePickerFragment extends DefaultAppPickerFragment {
candidates.add(new DefaultAppInfo(mPm,
UserHandle.myUserId(),
installedServiceInfo.getComponentName(),
installedServiceInfo.loadSummary(mPm.getPackageManager()),
(String) installedServiceInfo.loadSummary(mPm.getPackageManager()),
true /* enabled */));
}