Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 877a9a05 authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "Use ColorDisplayManager for night display settings"

parents dbd48da4 a21c6edc

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

+11 −11
Original line number Diff line number Diff line
@@ -26,14 +26,13 @@ import android.widget.Button; 
import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.internal.app.ColorDisplayController;

import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.widget.LayoutPreference;



public class NightDisplayActivationPreferenceController extends TogglePreferenceController {



    private ColorDisplayController mController;

    private ColorDisplayManager mColorDisplayManager;

    private NightDisplayTimeFormatter mTimeFormatter;

    private Button mTurnOffButton;

    private Button mTurnOnButton;
@@ -41,14 +40,15 @@ public class NightDisplayActivationPreferenceController extends TogglePreference 
    private final OnClickListener mListener = new OnClickListener() {

        @Override

        public void onClick(View v) {

            mController.setActivated(!mController.isActivated());

            mColorDisplayManager.setNightDisplayActivated(!mColorDisplayManager.isNightDisplayActivated());

            updateStateInternal();

        }

    };



    public NightDisplayActivationPreferenceController(Context context, String key) {

        super(context, key);

        mController = new ColorDisplayController(context);



        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);

        mTimeFormatter = new NightDisplayTimeFormatter(context);

    }
@@ -83,17 +83,17 @@ public class NightDisplayActivationPreferenceController extends TogglePreference 


    @Override

    public boolean isChecked() {

        return mController.isActivated();

        return mColorDisplayManager.isNightDisplayActivated();

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        return mController.setActivated(isChecked);

        return mColorDisplayManager.setNightDisplayActivated(isChecked);

    }



    @Override

    public CharSequence getSummary() {

        return mTimeFormatter.getAutoModeTimeSummary(mContext, mController);

        return mTimeFormatter.getAutoModeTimeSummary(mContext, mColorDisplayManager);

    }



    private void updateStateInternal() {
@@ -101,8 +101,8 @@ public class NightDisplayActivationPreferenceController extends TogglePreference 
            return;

        }



        final boolean isActivated = mController.isActivated();

        final int autoMode = mController.getAutoMode();

        final boolean isActivated = mColorDisplayManager.isNightDisplayActivated();

        final int autoMode = mColorDisplayManager.getNightDisplayAutoMode();



        String buttonText;

        if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {
@@ -110,8 +110,8 @@ public class NightDisplayActivationPreferenceController extends TogglePreference 
                            ? R.string.night_display_activation_off_custom

                            : R.string.night_display_activation_on_custom,

                    mTimeFormatter.getFormattedTimeString(isActivated

                            ? mController.getCustomStartTime()

                            : mController.getCustomEndTime()));

                            ? mColorDisplayManager.getNightDisplayCustomStartTime()

                            : mColorDisplayManager.getNightDisplayCustomEndTime()));

        } else if (autoMode == ColorDisplayManager.AUTO_MODE_TWILIGHT) {

            buttonText = mContext.getString(isActivated

                    ? R.string.night_display_activation_off_twilight

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

+4 −4
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont 
        implements Preference.OnPreferenceChangeListener {



    private DropDownPreference mPreference;

    private ColorDisplayManager mManager;

    private ColorDisplayManager mColorDisplayManager;



    public NightDisplayAutoModePreferenceController(Context context, String key) {

        super(context, key);

        mManager = context.getSystemService(ColorDisplayManager.class);

        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);

    }



    @Override
@@ -63,11 +63,11 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont 


    @Override

    public final void updateState(Preference preference) {

        mPreference.setValue(String.valueOf(mManager.getNightDisplayAutoMode()));

        mPreference.setValue(String.valueOf(mColorDisplayManager.getNightDisplayAutoMode()));

    }



    @Override

    public final boolean onPreferenceChange(Preference preference, Object newValue) {

        return mManager.setNightDisplayAutoMode(Integer.parseInt((String) newValue));

        return mColorDisplayManager.setNightDisplayAutoMode(Integer.parseInt((String) newValue));

    }

}

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

+5 −5
Original line number Diff line number Diff line
@@ -19,18 +19,17 @@ 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;



public class NightDisplayCustomEndTimePreferenceController extends BasePreferenceController {



    private ColorDisplayController mController;

    private ColorDisplayManager mColorDisplayManager;

    private NightDisplayTimeFormatter mTimeFormatter;



    public NightDisplayCustomEndTimePreferenceController(Context context, String key) {

        super(context, key);



        mController = new ColorDisplayController(context);

        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);

        mTimeFormatter = new NightDisplayTimeFormatter(context);

    }
@@ -43,8 +42,9 @@ public class NightDisplayCustomEndTimePreferenceController extends BasePreferenc 
    @Override

    public final void updateState(Preference preference) {

        preference

                .setVisible(mController.getAutoMode() == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);

                .setVisible(mColorDisplayManager.getNightDisplayAutoMode()

                        == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);

        preference.setSummary(mTimeFormatter.getFormattedTimeString(

                mController.getCustomEndTime()));

                mColorDisplayManager.getNightDisplayCustomEndTime()));

    }

}

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

+5 −5
Original line number Diff line number Diff line
@@ -19,18 +19,17 @@ 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;



public class NightDisplayCustomStartTimePreferenceController extends BasePreferenceController {



    private ColorDisplayController mController;

    private ColorDisplayManager mColorDisplayManager;

    private NightDisplayTimeFormatter mTimeFormatter;



    public NightDisplayCustomStartTimePreferenceController(Context context, String key) {

        super(context, key);



        mController = new ColorDisplayController(context);

        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);

        mTimeFormatter = new NightDisplayTimeFormatter(context);

    }
@@ -43,8 +42,9 @@ public class NightDisplayCustomStartTimePreferenceController extends BasePrefere 
    @Override

    public final void updateState(Preference preference) {

        preference

                .setVisible(mController.getAutoMode() == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);

                .setVisible(mColorDisplayManager.getNightDisplayAutoMode()

                        == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);

        preference.setSummary(mTimeFormatter.getFormattedTimeString(

                mController.getCustomStartTime()));

                mColorDisplayManager.getNightDisplayCustomStartTime()));

    }

}

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

+8 −10
Original line number Diff line number Diff line
@@ -22,26 +22,24 @@ 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;

import com.android.settings.widget.SeekBarPreference;



public class NightDisplayIntensityPreferenceController extends SliderPreferenceController {



    private ColorDisplayController mController;

    private ColorDisplayManager mColorDisplayManager;



    public NightDisplayIntensityPreferenceController(Context context, String key) {

        super(context, key);

        mController = new ColorDisplayController(context);

        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);

    }



    @Override

    public int getAvailabilityStatus() {

        if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {

            return UNSUPPORTED_ON_DEVICE;

        } else if (!mController.isActivated()) {

        } else if (!mColorDisplayManager.isNightDisplayActivated()) {

            return DISABLED_DEPENDENT_SETTING;

        }

        return AVAILABLE;
@@ -63,22 +61,22 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC 
    @Override

    public final void updateState(Preference preference) {

        super.updateState(preference);

        preference.setEnabled(mController.isActivated());

        preference.setEnabled(mColorDisplayManager.isNightDisplayActivated());

    }



    @Override

    public int getSliderPosition() {

        return convertTemperature(mController.getColorTemperature());

        return convertTemperature(mColorDisplayManager.getNightDisplayColorTemperature());

    }



    @Override

    public boolean setSliderPosition(int position) {

        return mController.setColorTemperature(convertTemperature(position));

        return mColorDisplayManager.setNightDisplayColorTemperature(convertTemperature(position));

    }



    @Override

    public int getMaxSteps() {

        return convertTemperature(mController.getMinimumColorTemperature());

        return convertTemperature(ColorDisplayManager.getMinimumColorTemperature(mContext));

    }



    /**
@@ -87,6 +85,6 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC 
     * adjustment status of the input.

     */

    private int convertTemperature(int temperature) {

        return mController.getMaximumColorTemperature() - temperature;

        return ColorDisplayManager.getMaximumColorTemperature(mContext) - temperature;

    }

}
 
 No newline at end of file