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

16 files changed, 41 insertions, 40 deletions

diff --git a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
index e12c60aa0f..0e24a10651 100644
--- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
@@ -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 "";
         }
diff --git a/src/com/android/settings/applications/AppPermissionsPreferenceController.java b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
index 610012355b..9bd8c0b339 100644
--- a/src/com/android/settings/applications/AppPermissionsPreferenceController.java
+++ b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
@@ -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;
diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
index 7d3f946a4a..8952de0b6b 100644
--- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
+++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
@@ -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
diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceController.java
index 02f52b60e3..21c619519d 100644
--- a/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceController.java
@@ -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());
     }
 }
diff --git a/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceController.java b/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceController.java
index 73e7675520..ec69b85a9f 100644
--- a/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceController.java
@@ -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());
 
     }
 }
diff --git a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
index dccc310156..1070ae9df6 100644
--- a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
+++ b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
@@ -51,11 +51,11 @@ public class BackupSettingsActivityPreferenceController extends BasePreferenceCo
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         final boolean backupEnabled = mBackupManager.isBackupEnabled();
 
         return backupEnabled
-                ? mContext.getString(R.string.accessibility_feature_state_on)
-                : mContext.getString(R.string.accessibility_feature_state_off);
+                ? mContext.getText(R.string.accessibility_feature_state_on)
+                : mContext.getText(R.string.accessibility_feature_state_off);
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
index bf13e07b06..f2f220a326 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -113,7 +113,7 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         String deviceName = getDeviceName();
         if (TextUtils.isEmpty(deviceName)) {
             return super.getSummary();
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
index cea0147cec..262d6b3bf0 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
@@ -72,7 +72,7 @@ public class BluetoothDeviceRenamePreferenceController extends
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         return getDeviceName();
     }
 
diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
index 0f1dea1536..6d0302fed1 100644
--- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
@@ -67,7 +67,7 @@ public class DeviceNamePreferenceController extends BasePreferenceController
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         return mDeviceName;
     }
 
diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java
index 83efefd84f..f139f31c10 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverController.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverController.java
@@ -103,7 +103,7 @@ public class BatterySaverController extends TogglePreferenceController
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         final boolean mode = mPowerManager.isPowerSaveMode();
         final int format = mode ? R.string.battery_saver_on_summary
                 : R.string.battery_saver_off_summary;
diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
index 8b2fcc084a..3a74a8cf09 100644
--- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
+++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
@@ -61,7 +61,7 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         if (!mFeatureProvider.isSensorAvailable(mContext)) {
             return "";
         }
@@ -72,13 +72,13 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
                 contentResolver, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1) != 0;
 
         if (mFeatureProvider.isSupported(mContext) && assistGestureEnabled) {
-            return mContext.getString(
+            return mContext.getText(
                     R.string.language_input_gesture_summary_on_with_assist);
         }
         if (assistGestureSilenceEnabled) {
-            return mContext.getString(
+            return mContext.getText(
                     R.string.language_input_gesture_summary_on_non_assist);
         }
-        return mContext.getString(R.string.language_input_gesture_summary_off);
+        return mContext.getText(R.string.language_input_gesture_summary_off);
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java
index 5ec60c2d93..1247659545 100644
--- a/src/com/android/settings/notification/HeaderPreferenceController.java
+++ b/src/com/android/settings/notification/HeaderPreferenceController.java
@@ -78,7 +78,7 @@ public class HeaderPreferenceController extends NotificationPreferenceController
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         if (mChannel != null) {
            if (mChannelGroup != null && mChannelGroup.getGroup() != null
                 && !TextUtils.isEmpty(mChannelGroup.getGroup().getName())) {
diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java
index 1f85c4cccb..7fb67349f0 100644
--- a/src/com/android/settings/print/PrintSettingPreferenceController.java
+++ b/src/com/android/settings/print/PrintSettingPreferenceController.java
@@ -93,7 +93,7 @@ public class PrintSettingPreferenceController extends BasePreferenceController i
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         final List<PrintJob> printJobs = mPrintManager.getPrintJobs();
 
         int numActivePrintJobs = 0;
@@ -112,7 +112,7 @@ public class PrintSettingPreferenceController extends BasePreferenceController i
             final List<PrintServiceInfo> services =
                     mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
             if (services == null || services.isEmpty()) {
-                return mContext.getString(R.string.print_settings_summary_no_service);
+                return mContext.getText(R.string.print_settings_summary_no_service);
             } else {
                 final int count = services.size();
                 return mContext.getResources().getQuantityString(
diff --git a/src/com/android/settings/security/ScreenPinningPreferenceController.java b/src/com/android/settings/security/ScreenPinningPreferenceController.java
index 305d07699b..36b25a385c 100644
--- a/src/com/android/settings/security/ScreenPinningPreferenceController.java
+++ b/src/com/android/settings/security/ScreenPinningPreferenceController.java
@@ -38,11 +38,11 @@ public class ScreenPinningPreferenceController extends BasePreferenceController
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         return Settings.System.getInt(mContext.getContentResolver(),
                 Settings.System.LOCK_TO_APP_ENABLED, 0) != 0
-                ? mContext.getString(R.string.switch_on_text)
-                : mContext.getString(R.string.switch_off_text);
+                ? mContext.getText(R.string.switch_on_text)
+                : mContext.getText(R.string.switch_off_text);
     }
 
     @Override
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index a01ea1bd0e..35bc07e341 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -57,7 +57,7 @@ public class SliceBuilderUtils {
         final Icon icon = Icon.createWithResource(context, sliceData.getIconResource());
         final BasePreferenceController controller = getPreferenceController(context, sliceData);
 
-        final String subtitleText = getSubtitleText(context, controller, sliceData);
+        final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
 
         final RowBuilder builder = new RowBuilder(context, sliceData.getUri())
                 .setTitle(sliceData.getTitle())
@@ -120,9 +120,9 @@ public class SliceBuilderUtils {
     }
 
     @VisibleForTesting
-    static String getSubtitleText(Context context, AbstractPreferenceController controller,
+    static CharSequence getSubtitleText(Context context, AbstractPreferenceController controller,
             SliceData sliceData) {
-        String summaryText = sliceData.getSummary();
+        CharSequence summaryText = sliceData.getSummary();
         if (isValidSummary(context, summaryText)) {
             return summaryText;
         }
@@ -138,13 +138,14 @@ public class SliceBuilderUtils {
         return sliceData.getScreenTitle();
     }
 
-    private static boolean isValidSummary(Context context, String summary) {
-        if (summary == null || TextUtils.isEmpty(summary.trim())) {
+    private static boolean isValidSummary(Context context, CharSequence summary) {
+        if (summary == null || TextUtils.isEmpty(summary.toString().trim())) {
             return false;
         }
 
-        final String placeHolder = context.getString(R.string.summary_placeholder);
-        final String doublePlaceHolder = context.getString(R.string.summary_two_lines_placeholder);
+        final CharSequence placeHolder = context.getText(R.string.summary_placeholder);
+        final CharSequence doublePlaceHolder =
+                context.getText(R.string.summary_two_lines_placeholder);
 
         return !(TextUtils.equals(summary, placeHolder)
                 || TextUtils.equals(summary, doublePlaceHolder));
diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java
index 20f43ef086..134166f36a 100644
--- a/src/com/android/settings/system/SystemUpdatePreferenceController.java
+++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java
@@ -88,16 +88,16 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         final Bundle updateInfo = mUpdateManager.retrieveSystemUpdateInfo();
-        String summary = mContext.getString(R.string.android_version_summary,
+        CharSequence summary = mContext.getString(R.string.android_version_summary,
                 Build.VERSION.RELEASE);
         switch (updateInfo.getInt(SystemUpdateManager.KEY_STATUS)) {
             case SystemUpdateManager.STATUS_WAITING_DOWNLOAD:
             case SystemUpdateManager.STATUS_IN_PROGRESS:
             case SystemUpdateManager.STATUS_WAITING_INSTALL:
             case SystemUpdateManager.STATUS_WAITING_REBOOT:
-                summary = mContext.getString(R.string.android_version_pending_update_summary);
+                summary = mContext.getText(R.string.android_version_pending_update_summary);
                 break;
             case SystemUpdateManager.STATUS_UNKNOWN:
                 Log.d(TAG, "Update statue unknown");