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

Commit 906572b1 authored by Fan Zhang's avatar Fan Zhang
Browse files

Change PreferenceController#getSummary return type.

Return CharSequence instead of String.

All user visible string should be modeled as CharSequence.

Bug: 73950519
Test: robotest
Change-Id: I30befef0c33f94351d4a2774e283bd1ed804aa8b
parent 6a6cc310
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -82,19 +82,19 @@ public abstract class VibrationIntensityPreferenceController extends BasePrefere
    }

    @Override
    public String getSummary() {
    public CharSequence getSummary() {
        final int intensity = Settings.System.getInt(mContext.getContentResolver(),
                mSettingKey, getDefaultIntensity());

        switch (intensity) {
            case Vibrator.VIBRATION_INTENSITY_OFF:
                return mContext.getString(R.string.accessibility_vibration_intensity_off);
                return mContext.getText(R.string.accessibility_vibration_intensity_off);
            case Vibrator.VIBRATION_INTENSITY_LOW:
                return mContext.getString(R.string.accessibility_vibration_intensity_low);
                return mContext.getText(R.string.accessibility_vibration_intensity_low);
            case Vibrator.VIBRATION_INTENSITY_MEDIUM:
                return mContext.getString(R.string.accessibility_vibration_intensity_medium);
                return mContext.getText(R.string.accessibility_vibration_intensity_medium);
            case Vibrator.VIBRATION_INTENSITY_HIGH:
                return mContext.getString(R.string.accessibility_vibration_intensity_high);
                return mContext.getText(R.string.accessibility_vibration_intensity_high);
            default:
                return "";
        }
+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class AppPermissionsPreferenceController extends AbstractPreferenceContro

    @Override
    public void updateState(Preference preference) {
        final String summary = getSummary();
        final CharSequence summary = getSummary();
        if (summary != null) {
            preference.setSummary(summary);
        }
@@ -76,7 +76,7 @@ public class AppPermissionsPreferenceController extends AbstractPreferenceContro
       Location, Microphone, Camera, Sms, Contacts, and Phone
     */
    @Override
    public String getSummary() {
    public CharSequence getSummary() {
        final Set<String> permissions = getAllPermissionsInGroups();
        Set<String> grantedPermissionGroups = getGrantedPermissionGroups(permissions);
        CharSequence summary = null;
+2 −2
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePre
    }

    @Override
    public String getSummary() {
    public CharSequence getSummary() {
        int summaryResId = isDefaultApp() ? R.string.yes : R.string.no;
        return mContext.getString(summaryResId);
        return mContext.getText(summaryResId);
    }

    @Override
+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class DrawOverlayDetailPreferenceController extends AppInfoPreferenceCont
    }

    @Override
    public String getSummary() {
        return DrawOverlayDetails.getSummary(mContext, mParent.getAppEntry()).toString();
    public CharSequence getSummary() {
        return DrawOverlayDetails.getSummary(mContext, mParent.getAppEntry());
    }
}
+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ public class WriteSystemSettingsPreferenceController extends AppInfoPreferenceCo
    }

    @Override
    public String getSummary() {
        return WriteSettingsDetails.getSummary(mContext, mParent.getAppEntry()).toString();
    public CharSequence getSummary() {
        return WriteSettingsDetails.getSummary(mContext, mParent.getAppEntry());

    }
}
Loading