Merge "Use ColorDisplayManager for night display" (17e11906) · Commits · e / os / android_packages_apps_Settings

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -67,8 +67,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);

		final LayoutPreference preference = (LayoutPreference) screen.findPreference(
		getPreferenceKey());
		final LayoutPreference preference = screen.findPreference(getPreferenceKey());
		mTurnOnButton = preference.findViewById(R.id.night_display_turn_on_button);
		mTurnOnButton.setOnClickListener(mListener);
		mTurnOffButton = preference.findViewById(R.id.night_display_turn_off_button);
		@@ -106,14 +105,14 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
		final int autoMode = mController.getAutoMode();

		String buttonText;
		if (autoMode == ColorDisplayController.AUTO_MODE_CUSTOM) {
		if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {
		buttonText = mContext.getString(isActivated
		? R.string.night_display_activation_off_custom
		: R.string.night_display_activation_on_custom,
		mTimeFormatter.getFormattedTimeString(isActivated
		? mController.getCustomStartTime()
		: mController.getCustomEndTime()));
		} else if (autoMode == ColorDisplayController.AUTO_MODE_TWILIGHT) {
		} else if (autoMode == ColorDisplayManager.AUTO_MODE_TWILIGHT) {
		buttonText = mContext.getString(isActivated
		? R.string.night_display_activation_off_twilight
		: R.string.night_display_activation_on_twilight);

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

+8 −9

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import androidx.preference.DropDownPreference;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.internal.app.ColorDisplayController;
		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;

		@@ -31,11 +30,11 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont
		implements Preference.OnPreferenceChangeListener {

		private DropDownPreference mPreference;
		private ColorDisplayController mController;
		private ColorDisplayManager mManager;

		public NightDisplayAutoModePreferenceController(Context context, String key) {
		super(context, key);
		mController = new ColorDisplayController(context);
		mManager = context.getSystemService(ColorDisplayManager.class);
		}

		@Override
		@@ -48,7 +47,7 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);

		mPreference = (DropDownPreference) screen.findPreference(getPreferenceKey());
		mPreference = screen.findPreference(getPreferenceKey());

		mPreference.setEntries(new CharSequence[]{
		mContext.getString(R.string.night_display_auto_mode_never),
		@@ -56,19 +55,19 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont
		mContext.getString(R.string.night_display_auto_mode_twilight)
		});
		mPreference.setEntryValues(new CharSequence[]{
		String.valueOf(ColorDisplayController.AUTO_MODE_DISABLED),
		String.valueOf(ColorDisplayController.AUTO_MODE_CUSTOM),
		String.valueOf(ColorDisplayController.AUTO_MODE_TWILIGHT)
		String.valueOf(ColorDisplayManager.AUTO_MODE_DISABLED),
		String.valueOf(ColorDisplayManager.AUTO_MODE_CUSTOM_TIME),
		String.valueOf(ColorDisplayManager.AUTO_MODE_TWILIGHT)
		});
		}

		@Override
		public final void updateState(Preference preference) {
		mPreference.setValue(String.valueOf(mController.getAutoMode()));
		mPreference.setValue(String.valueOf(mManager.getNightDisplayAutoMode()));
		}

		@Override
		public final boolean onPreferenceChange(Preference preference, Object newValue) {
		return mController.setAutoMode(Integer.parseInt((String) newValue));
		return mManager.setNightDisplayAutoMode(Integer.parseInt((String) newValue));
		}
		}

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -18,9 +18,7 @@ package com.android.settings.display;

		import android.content.Context;
		import android.hardware.display.ColorDisplayManager;

		import androidx.preference.Preference;

		import com.android.internal.app.ColorDisplayController;
		import com.android.settings.core.BasePreferenceController;

		@@ -44,7 +42,8 @@ public class NightDisplayCustomEndTimePreferenceController extends BasePreferenc

		@Override
		public final void updateState(Preference preference) {
		preference.setVisible(mController.getAutoMode() == ColorDisplayController.AUTO_MODE_CUSTOM);
		preference
		.setVisible(mController.getAutoMode() == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);
		preference.setSummary(mTimeFormatter.getFormattedTimeString(
		mController.getCustomEndTime()));
		}

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -18,9 +18,7 @@ package com.android.settings.display;

		import android.content.Context;
		import android.hardware.display.ColorDisplayManager;

		import androidx.preference.Preference;

		import com.android.internal.app.ColorDisplayController;
		import com.android.settings.core.BasePreferenceController;

		@@ -44,7 +42,8 @@ public class NightDisplayCustomStartTimePreferenceController extends BasePrefere

		@Override
		public final void updateState(Preference preference) {
		preference.setVisible(mController.getAutoMode() == ColorDisplayController.AUTO_MODE_CUSTOM);
		preference
		.setVisible(mController.getAutoMode() == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);
		preference.setSummary(mTimeFormatter.getFormattedTimeString(
		mController.getCustomStartTime()));
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.text.TextUtils;

		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;
		import androidx.annotation.VisibleForTesting;

		import com.android.internal.app.ColorDisplayController;
		import com.android.settings.core.SliderPreferenceController;
		@@ -54,8 +55,7 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC
		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		final SeekBarPreference preference = (SeekBarPreference) screen.findPreference(
		getPreferenceKey());
		final SeekBarPreference preference = screen.findPreference(getPreferenceKey());
		preference.setContinuousUpdates(true);
		preference.setMax(getMaxSteps());
		}