Remove On/Off string from Night light slice

We only deleted On/Off string from the subtitle of night light slice in
the settings search result, and still keep On/Off string for Night Light
preference.

Fixes: 130364160
Test: visual
Change-Id: Ibe7f2752f099a4ab0d4a01a205e4e8ce0a226f55

diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index 1be8434..5bb70fc 100644 (file)
--- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -93,7 +93,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
 
     @Override
     public CharSequence getSummary() {
-        return mTimeFormatter.getAutoModeTimeSummary(mContext, mColorDisplayManager);
+        return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager);
     }
 
     private void updateStateInternal() {

diff --git a/src/com/android/settings/display/NightDisplayTimeFormatter.java b/src/com/android/settings/display/NightDisplayTimeFormatter.java
index 1b5b146..1449ac1 100644 (file)
--- a/src/com/android/settings/display/NightDisplayTimeFormatter.java
+++ b/src/com/android/settings/display/NightDisplayTimeFormatter.java
@@ -52,7 +52,7 @@ public class NightDisplayTimeFormatter {
         return context.getString(summaryFormatResId, getAutoModeSummary(context, manager));
     }
 
-    private String getAutoModeSummary(Context context, ColorDisplayManager manager) {
+    public String getAutoModeSummary(Context context, ColorDisplayManager manager) {
         final boolean isActivated = manager.isNightDisplayActivated();
         final int autoMode = manager.getNightDisplayAutoMode();
         if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {