Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e86e611f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: ad597344

Change-Id: Id636a6558f38673749255d01a30190fa762b7619
parents f52bfd03 ad597344

src/com/android/settings/accessibility/AccessibilitySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/accessibility/ShortcutServicePickerFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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 */));

        }