commit 906572b127e57aac01bfe1a45ddcc7f053883f47
author Fan Zhang <zhfan@google.com> Tue Feb 27 10:30:11 2018 -0800
committer Fan Zhang <zhfan@google.com> Tue Feb 27 22:30:12 2018 -0800
tree 4c6dc5b3ea31e6de1ecf5818bef255fe7b9c6a02
parent 6a6cc310cf0b8067683fdcd38ac524370e09ec65

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

src/com/android/settings/gestures/GesturesSettingPreferenceController.java

diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
index 8b2fcc0..3a74a8c 100644
--- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
+++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
@@ -61,7 +61,7 @@
     }
 
     @Override
-    public String getSummary() {
+    public CharSequence getSummary() {
         if (!mFeatureProvider.isSensorAvailable(mContext)) {
             return "";
         }
@@ -72,13 +72,13 @@
                 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