Merge "Remove On/Off string from Night light slice" into qt-dev
diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index 1be8434..5bb70fc 100644
--- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -93,7 +93,7 @@
@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
--- a/src/com/android/settings/display/NightDisplayTimeFormatter.java
+++ b/src/com/android/settings/display/NightDisplayTimeFormatter.java
@@ -52,7 +52,7 @@
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) {