From 55f66a9177e9f3b932e0d701f666fa9ec9ffc07a Mon Sep 17 00:00:00 2001
From: lindatseng <lindatseng@google.com>
Date: Thu, 18 Apr 2019 00:51:23 -0700
Subject: [PATCH] Fix regression of wrong min value on night display slice

The min value of NightDisplayIntensityPreferenceController
should always be 0 (which is the old value we used before
ag/7062353). The range is cacluated from the relative value
to MinimumColorTemperature, which means the min value should
always be 0.

Test: atest NightDisplayIntensityPreferenceControllerTest
Fixes:130758028
Change-Id: Ica75672dda6a9ee0c6013f1c903611263b7d133f
---
 ...tDisplayIntensityPreferenceController.java |  3 ++-
 ...playIntensityPreferenceControllerTest.java | 20 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
index 04e3b13a2da..c8447cb17c5 100644
--- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
@@ -82,7 +82,8 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC
 
     @Override
     public int getMin() {
-        return ColorDisplayManager.getMinimumColorTemperature(mContext);
+        // The min should always be 0 in this case.
+        return 0;
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java
index 2e2d6318683..b9c2abd0193 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java
@@ -84,11 +84,25 @@ public class NightDisplayIntensityPreferenceControllerTest {
         .isEqualTo(3030);
   }
 
+  @Test
+  public void rangeOfSlider_staysWithinValidRange() {
+    SettingsShadowResources.overrideResource(
+            com.android.internal.R.integer.config_nightDisplayColorTemperatureMin, 2950);
+    SettingsShadowResources.overrideResource(
+            com.android.internal.R.integer.config_nightDisplayColorTemperatureMax, 3050);
+
+    assertThat(mPreferenceController.getMax() - mPreferenceController.getMin())
+            .isGreaterThan(0);
+  }
+
+  @Test
+  public void getMin_alwaysReturnsZero() {
+    assertThat(mPreferenceController.getMin()).isEqualTo(0);
+  }
+
   @Test
   public void isSliceableCorrectKey_returnsTrue() {
-    final NightDisplayIntensityPreferenceController controller =
-        new NightDisplayIntensityPreferenceController(mContext, "night_display_temperature");
-    assertThat(controller.isSliceable()).isTrue();
+    assertThat(mPreferenceController.isSliceable()).isTrue();
   }
 
   @Test