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

Commit 4869effb 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 

am: e86e611f

Change-Id: Id13f41ae6cb32d575193732136489bbac0702a3c
parents 897b93aa e86e611f

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 */));

        }