commit 1370361ed3ce8a4fb993a76354c64c7e6895bb1b
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 30 07:15:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 30 07:15:35 2019 +0000
tree 9edf44b09d987281af5942f4cb37d7343abec15c
parent 900cc96b8642e19a5809c9320810b8756ffdc973
parent acd5d10e0d1024ee39a23814b49e508f968d6495

Merge "Fix animation in Night light page"

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

diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
index 0ebbeae..7534756 100644
--- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
@@ -18,7 +18,10 @@
 
 import android.content.Context;
 import android.hardware.display.ColorDisplayManager;
+
 import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.core.BasePreferenceController;
 
 public class NightDisplayCustomEndTimePreferenceController extends BasePreferenceController {
@@ -40,6 +43,13 @@
     }
 
     @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(getPreferenceKey());
+        updateState(preference);
+    }
+
+    @Override
     public final void updateState(Preference preference) {
         preference
                 .setVisible(mColorDisplayManager.getNightDisplayAutoMode()

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

diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
index a2a85ef..910086b 100644
--- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
@@ -18,7 +18,10 @@
 
 import android.content.Context;
 import android.hardware.display.ColorDisplayManager;
+
 import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.core.BasePreferenceController;
 
 public class NightDisplayCustomStartTimePreferenceController extends BasePreferenceController {
@@ -40,6 +43,13 @@
     }
 
     @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(getPreferenceKey());
+        updateState(preference);
+    }
+
+    @Override
     public final void updateState(Preference preference) {
         preference
                 .setVisible(mColorDisplayManager.getNightDisplayAutoMode()