Merge "NightDisplayController -> ColorDisplayController" (a760cc12) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/dashboard/conditional/NightDisplayCondition.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}

src/com/android/settings/display/ColorModePreferenceFragment.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -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;

src/com/android/settings/display/NightDisplayPreference.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -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);

src/com/android/settings/display/NightDisplayPreferenceController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

src/com/android/settings/display/NightDisplaySettings.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -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);
		}