commit ac76152a6b8093205b52eb3c686745cd18fc4317
author Yi Jiang <eejiang@google.com> Mon Oct 19 16:43:21 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 19 16:43:21 2020 +0000
tree ca8302333ee636960094c672d273ae2ade7d2444
parent 786d3578d1ad4fd04e4522ddaf0213d1159595a3
parent 0bbc75819721974301e435cd096a013a031563bd

Merge "Updates screen attention preference at onStart()."

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

diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
index dfe6826..c0c5e63 100644
--- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
@@ -75,6 +75,14 @@
      * Adds the controlled preference to the provided preference screen.
      */
     public void addToScreen(PreferenceScreen screen) {
+        updatePreference();
+        screen.addPreference(mPreference);
+    }
+
+    /**
+     *  Updates the appearance of the preference.
+     */
+    public void updatePreference() {
         final EnforcedAdmin enforcedAdmin = mRestrictionUtils.checkIfRestrictionEnforced(mContext,
                 UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT);
         if (enforcedAdmin != null) {
@@ -82,7 +90,6 @@
         } else {
             mPreference.setEnabled(hasSufficientPermission(mPackageManager));
         }
-        screen.addPreference(mPreference);
     }
 
     @VisibleForTesting

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

diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java
index 35c2cc0..676acf9 100644
--- a/src/com/android/settings/display/ScreenTimeoutSettings.java
+++ b/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -104,6 +104,7 @@
     public void onStart() {
         super.onStart();
         mAdaptiveSleepPermissionController.updateVisibility();
+        mAdaptiveSleepController.updatePreference();
     }
 
     @Override