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

Browse Source
This commit is contained in:
Jeff Sharkey
2017-05-01 17:52:22 +00:00
committed by Android (Google) Code Review
parent b2d85af91e 2cc818acce
commit ad597344a2
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 ? final String serviceState = serviceEnabled ?
getString(R.string.accessibility_summary_state_enabled) : getString(R.string.accessibility_summary_state_enabled) :
getString(R.string.accessibility_summary_state_disabled); getString(R.string.accessibility_summary_state_disabled);
final String serviceSummary = info.loadSummary(getPackageManager()); final CharSequence serviceSummary = info.loadSummary(getPackageManager());
final String stateSummaryCombo = getString( final String stateSummaryCombo = getString(
R.string.accessibility_summary_default_combination, R.string.accessibility_summary_default_combination,
serviceState, serviceSummary); 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, candidates.add(new DefaultAppInfo(mPm,
UserHandle.myUserId(), UserHandle.myUserId(),
installedServiceInfo.getComponentName(), installedServiceInfo.getComponentName(),
installedServiceInfo.loadSummary(mPm.getPackageManager()), (String) installedServiceInfo.loadSummary(mPm.getPackageManager()),
true /* enabled */)); true /* enabled */));
} }