Add color temperature preference to Night Display

Bug: 32463283
Test: make RunSettingsRoboTests
Change-Id: Ibf3cf9af05b44a071603d3d7efa6e90ae00c823a

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

@@ -28,6 +28,7 @@ import android.widget.TimePicker;
 import com.android.internal.app.NightDisplayController;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.SeekBarPreference;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.text.DateFormat;
@@ -44,6 +45,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
     private static final String KEY_NIGHT_DISPLAY_START_TIME = "night_display_start_time";
     private static final String KEY_NIGHT_DISPLAY_END_TIME = "night_display_end_time";
     private static final String KEY_NIGHT_DISPLAY_ACTIVATED = "night_display_activated";
+    private static final String KEY_NIGHT_DISPLAY_TEMPERATURE = "night_display_temperature";
 
     private static final int DIALOG_START_TIME = 0;
     private static final int DIALOG_END_TIME = 1;
@@ -55,6 +57,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
     private Preference mStartTimePreference;
     private Preference mEndTimePreference;
     private TwoStatePreference mActivatedPreference;
+    private SeekBarPreference mTemperaturePreference;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -65,6 +68,11 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
 
         mTimeFormatter = android.text.format.DateFormat.getTimeFormat(context);
         mTimeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+        mTemperaturePreference.setMax(convertTemperature(mController.getMinimumColorTemperature()));
+        mTemperaturePreference.setDefaultProgress(convertTemperature(
+                mController.getDefaultColorTemperature()));
+        mTemperaturePreference.setContinuousUpdates(true);
     }
 
     @Override
@@ -78,6 +86,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
         mStartTimePreference = findPreference(KEY_NIGHT_DISPLAY_START_TIME);
         mEndTimePreference = findPreference(KEY_NIGHT_DISPLAY_END_TIME);
         mActivatedPreference = (TwoStatePreference) findPreference(KEY_NIGHT_DISPLAY_ACTIVATED);
+        mTemperaturePreference = (SeekBarPreference) findPreference(KEY_NIGHT_DISPLAY_TEMPERATURE);
 
         mAutoModePreference.setEntries(new CharSequence[] {
                 getString(R.string.night_display_auto_mode_never),
@@ -91,6 +100,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
         });
         mAutoModePreference.setOnPreferenceChangeListener(this);
         mActivatedPreference.setOnPreferenceChangeListener(this);
+        mTemperaturePreference.setOnPreferenceChangeListener(this);
     }
 
     @Override
@@ -105,6 +115,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
         onAutoModeChanged(mController.getAutoMode());
         onCustomStartTimeChanged(mController.getCustomStartTime());
         onCustomEndTimeChanged(mController.getCustomEndTime());
+        onColorTemperatureChanged(mController.getColorTemperature());
     }
 
     @Override
@@ -166,9 +177,11 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
                 return 0;
         }
     }
+
     @Override
     public void onActivated(boolean activated) {
         mActivatedPreference.setChecked(activated);
+        mTemperaturePreference.setEnabled(activated);
     }
 
     @Override
@@ -180,6 +193,11 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
         mEndTimePreference.setVisible(showCustomSchedule);
     }
 
+    @Override
+    public void onColorTemperatureChanged(int colorTemperature) {
+        mTemperaturePreference.setProgress(convertTemperature(colorTemperature));
+    }
+
     private String getFormattedTimeString(NightDisplayController.LocalTime localTime) {
         final Calendar c = Calendar.getInstance();
         c.setTimeZone(mTimeFormatter.getTimeZone());
@@ -190,6 +208,15 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
         return mTimeFormatter.format(c.getTime());
     }
 
+    /**
+     * Inverts and range-adjusts a raw value from the SeekBar (i.e. [0, maxTemp-minTemp]), or
+     * converts an inverted and range-adjusted value to the raw SeekBar value, depending on the
+     * adjustment status of the input.
+     */
+    private int convertTemperature(int temperature) {
+        return mController.getMaximumColorTemperature() - temperature;
+    }
+
     @Override
     public void onCustomStartTimeChanged(NightDisplayController.LocalTime startTime) {
         mStartTimePreference.setSummary(getFormattedTimeString(startTime));
@@ -206,6 +233,8 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
             return mController.setAutoMode(Integer.parseInt((String) newValue));
         } else if (preference == mActivatedPreference) {
             return mController.setActivated((Boolean) newValue);
+        } else if (preference == mTemperaturePreference) {
+            return mController.setColorTemperature(convertTemperature((Integer) newValue));
         }
         return false;
     }