NightDisplayController -> ColorDisplayController

Now that it controls both night display and color mode,
the NightDisplayController should reflect its expanded
purpose.

Bug: 68258004
Test: make RunSettingsRoboTests -j100
Change-Id: If0ad2539b44daf821fdba83b81de1199ad1ecc21

diff --git a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java b/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
index bfcab7f..4d885ae 100644 (file)
--- a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
+++ b/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
@@ -18,20 +18,20 @@ package com.android.settings.dashboard.conditional;
 
 import android.graphics.drawable.Icon;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.display.NightDisplaySettings;
 
 public final class NightDisplayCondition extends Condition
-        implements NightDisplayController.Callback {
+        implements ColorDisplayController.Callback {
 
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
 
     NightDisplayCondition(ConditionManager manager) {
         super(manager);
-        mController = new NightDisplayController(manager.getContext());
+        mController = new ColorDisplayController(manager.getContext());
         mController.setListener(this);
     }
 

diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java
index 9f18fd8..e3fb65d 100644 (file)
--- a/src/com/android/settings/display/ColorModePreferenceFragment.java
+++ b/src/com/android/settings/display/ColorModePreferenceFragment.java
@@ -17,7 +17,7 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.VisibleForTesting;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto;
 
 import com.android.settings.R;
@@ -36,12 +36,12 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
     @VisibleForTesting
     static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated";
 
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mController = new NightDisplayController(context);
+        mController = new ColorDisplayController(context);
     }
 
     @Override
@@ -64,10 +64,10 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
 
     @Override
     protected String getDefaultKey() {
-        if (mController.getColorMode() == NightDisplayController.COLOR_MODE_SATURATED) {
+        if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_SATURATED) {
             return KEY_COLOR_MODE_SATURATED;
         }
-        if (mController.getColorMode() == NightDisplayController.COLOR_MODE_BOOSTED) {
+        if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_BOOSTED) {
             return KEY_COLOR_MODE_BOOSTED;
         }
         return KEY_COLOR_MODE_NATURAL;
@@ -77,13 +77,13 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
     protected boolean setDefaultKey(String key) {
         switch (key) {
             case KEY_COLOR_MODE_NATURAL:
-                mController.setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
+                mController.setColorMode(ColorDisplayController.COLOR_MODE_NATURAL);
                 break;
             case KEY_COLOR_MODE_BOOSTED:
-                mController.setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
+                mController.setColorMode(ColorDisplayController.COLOR_MODE_BOOSTED);
                 break;
             case KEY_COLOR_MODE_SATURATED:
-                mController.setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
+                mController.setColorMode(ColorDisplayController.COLOR_MODE_SATURATED);
                 break;
         }
         return true;

diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java
index b966530..ea39f75 100644 (file)
--- a/src/com/android/settings/display/NightDisplayPreference.java
+++ b/src/com/android/settings/display/NightDisplayPreference.java
@@ -18,7 +18,7 @@ import android.content.Context;
 import android.support.v14.preference.SwitchPreference;
 import android.util.AttributeSet;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.settings.R;
 
 import java.text.DateFormat;
@@ -27,15 +27,15 @@ import java.util.Calendar;
 import java.util.TimeZone;
 
 public class NightDisplayPreference extends SwitchPreference
-        implements NightDisplayController.Callback {
+        implements ColorDisplayController.Callback {
 
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
     private DateFormat mTimeFormatter;
 
     public NightDisplayPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        mController = new NightDisplayController(context);
+        mController = new ColorDisplayController(context);
         mTimeFormatter = android.text.format.DateFormat.getTimeFormat(context);
         mTimeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
@@ -78,12 +78,12 @@ public class NightDisplayPreference extends SwitchPreference
         final String autoModeSummary;
         switch (autoMode) {
             default:
-            case NightDisplayController.AUTO_MODE_DISABLED:
+            case ColorDisplayController.AUTO_MODE_DISABLED:
                 autoModeSummary = context.getString(isActivated
                         ? R.string.night_display_summary_on_auto_mode_never
                         : R.string.night_display_summary_off_auto_mode_never);
                 break;
-            case NightDisplayController.AUTO_MODE_CUSTOM:
+            case ColorDisplayController.AUTO_MODE_CUSTOM:
                 if (isActivated) {
                     autoModeSummary = context.getString(
                             R.string.night_display_summary_on_auto_mode_custom,
@@ -94,7 +94,7 @@ public class NightDisplayPreference extends SwitchPreference
                             getFormattedTimeString(mController.getCustomStartTime()));
                 }
                 break;
-            case NightDisplayController.AUTO_MODE_TWILIGHT:
+            case ColorDisplayController.AUTO_MODE_TWILIGHT:
                 autoModeSummary = context.getString(isActivated
                         ? R.string.night_display_summary_on_auto_mode_twilight
                         : R.string.night_display_summary_off_auto_mode_twilight);

diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java
index f42e324..643f1d4 100644 (file)
--- a/src/com/android/settings/display/NightDisplayPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayPreferenceController.java
@@ -15,7 +15,7 @@ package com.android.settings.display;
 
 import android.content.Context;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -30,7 +30,7 @@ public class NightDisplayPreferenceController extends AbstractPreferenceControll
 
     @Override
     public boolean isAvailable() {
-        return NightDisplayController.isAvailable(mContext);
+        return ColorDisplayController.isAvailable(mContext);
     }
 
     @Override

diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 5879297..ab94720 100644 (file)
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -25,7 +25,7 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.TwoStatePreference;
 import android.widget.TimePicker;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.widget.SeekBarPreference;
@@ -40,7 +40,7 @@ import java.util.TimeZone;
  * Settings screen for Night display.
  */
 public class NightDisplaySettings extends SettingsPreferenceFragment
-        implements NightDisplayController.Callback, Preference.OnPreferenceChangeListener {
+        implements ColorDisplayController.Callback, Preference.OnPreferenceChangeListener {
 
     private static final String KEY_NIGHT_DISPLAY_AUTO_MODE = "night_display_auto_mode";
     private static final String KEY_NIGHT_DISPLAY_START_TIME = "night_display_start_time";
@@ -51,7 +51,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
     private static final int DIALOG_START_TIME = 0;
     private static final int DIALOG_END_TIME = 1;
 
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
     private DateFormat mTimeFormatter;
 
     private DropDownPreference mAutoModePreference;
@@ -65,7 +65,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
         super.onCreate(savedInstanceState);
 
         final Context context = getContext();
-        mController = new NightDisplayController(context);
+        mController = new ColorDisplayController(context);
 
         mTimeFormatter = android.text.format.DateFormat.getTimeFormat(context);
         mTimeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -98,9 +98,9 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
                 getString(R.string.night_display_auto_mode_twilight)
         });
         mAutoModePreference.setEntryValues(new CharSequence[] {
-                String.valueOf(NightDisplayController.AUTO_MODE_DISABLED),
-                String.valueOf(NightDisplayController.AUTO_MODE_CUSTOM),
-                String.valueOf(NightDisplayController.AUTO_MODE_TWILIGHT)
+                String.valueOf(ColorDisplayController.AUTO_MODE_DISABLED),
+                String.valueOf(ColorDisplayController.AUTO_MODE_CUSTOM),
+                String.valueOf(ColorDisplayController.AUTO_MODE_TWILIGHT)
         });
         mAutoModePreference.setOnPreferenceChangeListener(this);
         mActivatedPreference.setOnPreferenceChangeListener(this);
@@ -192,7 +192,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
     public void onAutoModeChanged(int autoMode) {
         mAutoModePreference.setValue(String.valueOf(autoMode));
 
-        final boolean showCustomSchedule = autoMode == NightDisplayController.AUTO_MODE_CUSTOM;
+        final boolean showCustomSchedule = autoMode == ColorDisplayController.AUTO_MODE_CUSTOM;
         mStartTimePreference.setVisible(showCustomSchedule);
         mEndTimePreference.setVisible(showCustomSchedule);
     }

diff --git a/tests/robotests/src/com/android/internal/app/NightDisplayController.java b/tests/robotests/src/com/android/internal/app/ColorDisplayController.java
similarity index 97%
rename from tests/robotests/src/com/android/internal/app/NightDisplayController.java
rename to tests/robotests/src/com/android/internal/app/ColorDisplayController.java
index b20de68..74e7d8a 100644 (file)
--- a/tests/robotests/src/com/android/internal/app/NightDisplayController.java
+++ b/tests/robotests/src/com/android/internal/app/ColorDisplayController.java
@@ -19,7 +19,7 @@ package com.android.internal.app;
  * Fake controller to make robolectric test compile. Should be removed when Robolectric supports
  * API 25.
  */
-public class NightDisplayController {
+public class ColorDisplayController {
 
     public static final int AUTO_MODE_DISABLED = 0;
     public static final int AUTO_MODE_CUSTOM = 1;

diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
index fb9bb9f..dc3d27a 100644 (file)
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
 
 import android.os.Bundle;
 
-import com.android.internal.app.NightDisplayController;
+import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.TestConfig;
@@ -52,7 +52,7 @@ public class ColorModePreferenceFragmentTest {
     private ColorModePreferenceFragment mFragment;
 
     @Mock
-    private NightDisplayController mController;
+    private ColorDisplayController mController;
 
     @Before
     public void setup() {
@@ -88,7 +88,7 @@ public class ColorModePreferenceFragmentTest {
     @Test
     public void getKey_natural() {
         Mockito.when(mController.getColorMode()).thenReturn(
-            NightDisplayController.COLOR_MODE_NATURAL);
+                ColorDisplayController.COLOR_MODE_NATURAL);
 
         assertThat(mFragment.getDefaultKey())
                 .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
@@ -98,7 +98,7 @@ public class ColorModePreferenceFragmentTest {
     @Test
     public void getKey_boosted() {
         Mockito.when(mController.getColorMode()).thenReturn(
-            NightDisplayController.COLOR_MODE_BOOSTED);
+                ColorDisplayController.COLOR_MODE_BOOSTED);
 
         assertThat(mFragment.getDefaultKey())
                 .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
@@ -108,7 +108,7 @@ public class ColorModePreferenceFragmentTest {
     @Test
     public void getKey_saturated() {
         Mockito.when(mController.getColorMode()).thenReturn(
-            NightDisplayController.COLOR_MODE_SATURATED);
+                ColorDisplayController.COLOR_MODE_SATURATED);
 
         assertThat(mFragment.getDefaultKey())
             .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
@@ -118,21 +118,21 @@ public class ColorModePreferenceFragmentTest {
     @Test
     public void setKey_natural() {
         mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
-        verify(mController).setColorMode(NightDisplayController.COLOR_MODE_NATURAL);
+        verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_NATURAL);
     }
 
     @Config(shadows = {SettingsShadowSystemProperties.class})
     @Test
     public void setKey_boosted() {
         mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
-        verify(mController).setColorMode(NightDisplayController.COLOR_MODE_BOOSTED);
+        verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_BOOSTED);
     }
 
     @Config(shadows = {SettingsShadowSystemProperties.class})
     @Test
     public void setKey_saturated() {
         mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
-        verify(mController).setColorMode(NightDisplayController.COLOR_MODE_SATURATED);
+        verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_SATURATED);
     }
 
     @Test