PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NightDisplayController -> ColorDisplayController

Browse Source 
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
This commit is contained in:
Christine Franks
2017-11-01 18:23:43 -07:00
parent 187ff21a7c
commit 4f03562716
7 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
View File

@@ -18,20 +18,20 @@ package com.android.settings.dashboard.conditional;
import android.graphics.drawable.Icon; 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.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.display.NightDisplaySettings; import com.android.settings.display.NightDisplaySettings;
public final class NightDisplayCondition extends Condition public final class NightDisplayCondition extends Condition
implements NightDisplayController.Callback { implements ColorDisplayController.Callback {
private NightDisplayController mController; private ColorDisplayController mController;
NightDisplayCondition(ConditionManager manager) { NightDisplayCondition(ConditionManager manager) {
super(manager); super(manager);
mController = new NightDisplayController(manager.getContext()); mController = new ColorDisplayController(manager.getContext());
mController.setListener(this); mController.setListener(this);
} }

16
src/com/android/settings/display/ColorModePreferenceFragment.java
View File

@@ -17,7 +17,7 @@ import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.support.annotation.VisibleForTesting; 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.internal.logging.nano.MetricsProto;
import com.android.settings.R; import com.android.settings.R;
@@ -36,12 +36,12 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
@VisibleForTesting @VisibleForTesting
static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated"; static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated";
private NightDisplayController mController; private ColorDisplayController mController;
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
super.onAttach(context); super.onAttach(context);
mController = new NightDisplayController(context); mController = new ColorDisplayController(context);
} }
@Override @Override
@@ -64,10 +64,10 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
@Override @Override
protected String getDefaultKey() { protected String getDefaultKey() {
if (mController.getColorMode() == NightDisplayController.COLOR_MODE_SATURATED) { if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_SATURATED) {
return KEY_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_BOOSTED;
} }
return KEY_COLOR_MODE_NATURAL; return KEY_COLOR_MODE_NATURAL;
@@ -77,13 +77,13 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
protected boolean setDefaultKey(String key) { protected boolean setDefaultKey(String key) {
switch (key) { switch (key) {
case KEY_COLOR_MODE_NATURAL: case KEY_COLOR_MODE_NATURAL:
mController.setColorMode(NightDisplayController.COLOR_MODE_NATURAL); mController.setColorMode(ColorDisplayController.COLOR_MODE_NATURAL);
break; break;
case KEY_COLOR_MODE_BOOSTED: case KEY_COLOR_MODE_BOOSTED:
mController.setColorMode(NightDisplayController.COLOR_MODE_BOOSTED); mController.setColorMode(ColorDisplayController.COLOR_MODE_BOOSTED);
break; break;
case KEY_COLOR_MODE_SATURATED: case KEY_COLOR_MODE_SATURATED:
mController.setColorMode(NightDisplayController.COLOR_MODE_SATURATED); mController.setColorMode(ColorDisplayController.COLOR_MODE_SATURATED);
break; break;
} }
return true; return true;

14
src/com/android/settings/display/NightDisplayPreference.java
View File

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

4
src/com/android/settings/display/NightDisplayPreferenceController.java
View File

@@ -15,7 +15,7 @@ package com.android.settings.display;
import android.content.Context; 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.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
@@ -30,7 +30,7 @@ public class NightDisplayPreferenceController extends AbstractPreferenceControll
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return NightDisplayController.isAvailable(mContext); return ColorDisplayController.isAvailable(mContext);
} }
@Override @Override

16
src/com/android/settings/display/NightDisplaySettings.java
View File

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

2
tests/robotests/src/com/android/internal/app/NightDisplayController.java → tests/robotests/src/com/android/internal/app/ColorDisplayController.java
View File

@@ -19,7 +19,7 @@ package com.android.internal.app;
* Fake controller to make robolectric test compile. Should be removed when Robolectric supports * Fake controller to make robolectric test compile. Should be removed when Robolectric supports
* API 25. * API 25.
*/ */
public class NightDisplayController { public class ColorDisplayController {
public static final int AUTO_MODE_DISABLED = 0; public static final int AUTO_MODE_DISABLED = 0;
public static final int AUTO_MODE_CUSTOM = 1; public static final int AUTO_MODE_CUSTOM = 1;

16
tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
View File

@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import android.os.Bundle; 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.internal.logging.nano.MetricsProto;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
@@ -52,7 +52,7 @@ public class ColorModePreferenceFragmentTest {
private ColorModePreferenceFragment mFragment; private ColorModePreferenceFragment mFragment;
@Mock @Mock
private NightDisplayController mController; private ColorDisplayController mController;
@Before @Before
public void setup() { public void setup() {
@@ -88,7 +88,7 @@ public class ColorModePreferenceFragmentTest {
@Test @Test
public void getKey_natural() { public void getKey_natural() {
Mockito.when(mController.getColorMode()).thenReturn( Mockito.when(mController.getColorMode()).thenReturn(
NightDisplayController.COLOR_MODE_NATURAL); ColorDisplayController.COLOR_MODE_NATURAL);
assertThat(mFragment.getDefaultKey()) assertThat(mFragment.getDefaultKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL); .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
@@ -98,7 +98,7 @@ public class ColorModePreferenceFragmentTest {
@Test @Test
public void getKey_boosted() { public void getKey_boosted() {
Mockito.when(mController.getColorMode()).thenReturn( Mockito.when(mController.getColorMode()).thenReturn(
NightDisplayController.COLOR_MODE_BOOSTED); ColorDisplayController.COLOR_MODE_BOOSTED);
assertThat(mFragment.getDefaultKey()) assertThat(mFragment.getDefaultKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED); .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
@@ -108,7 +108,7 @@ public class ColorModePreferenceFragmentTest {
@Test @Test
public void getKey_saturated() { public void getKey_saturated() {
Mockito.when(mController.getColorMode()).thenReturn( Mockito.when(mController.getColorMode()).thenReturn(
NightDisplayController.COLOR_MODE_SATURATED); ColorDisplayController.COLOR_MODE_SATURATED);
assertThat(mFragment.getDefaultKey()) assertThat(mFragment.getDefaultKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED); .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
@@ -118,21 +118,21 @@ public class ColorModePreferenceFragmentTest {
@Test @Test
public void setKey_natural() { public void setKey_natural() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_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}) @Config(shadows = {SettingsShadowSystemProperties.class})
@Test @Test
public void setKey_boosted() { public void setKey_boosted() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_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}) @Config(shadows = {SettingsShadowSystemProperties.class})
@Test @Test
public void setKey_saturated() { public void setKey_saturated() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED); mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
verify(mController).setColorMode(NightDisplayController.COLOR_MODE_SATURATED); verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_SATURATED);
} }
@Test @Test