Merge "Fix unexpected grey-out in Screen attention Fix preference controller searchable issue." into qt-dev

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.display;
+
+import android.content.Context;
+
+import androidx.preference.Preference;
+
+public class AdaptiveSleepDetailPreferenceController extends AdaptiveSleepPreferenceController {
+    public AdaptiveSleepDetailPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    @AvailabilityStatus
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_adaptive_sleep_available)
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        preference.setEnabled(super.hasSufficientPermissions);
+    }
+}

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

@@ -29,7 +29,7 @@ public class AdaptiveSleepPreferenceController extends TogglePreferenceControlle
     private final String SYSTEM_KEY = ADAPTIVE_SLEEP;
     private final int DEFAULT_VALUE = 0;
 
-    private final boolean hasSufficientPermissions;
+    final boolean hasSufficientPermissions;
 
     public AdaptiveSleepPreferenceController(Context context, String key) {
         super(context, key);
@@ -57,17 +57,10 @@ public class AdaptiveSleepPreferenceController extends TogglePreferenceControlle
     @Override
     @AvailabilityStatus
     public int getAvailabilityStatus() {
-        final boolean supportedOnDevice =  mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_adaptive_sleep_available);
-        if (!supportedOnDevice) {
-            return UNSUPPORTED_ON_DEVICE;
-        }
-        return hasSufficientPermissions ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
-    }
-
-    @Override
-    public boolean isSliceable() {
-        return true;
+        return mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_adaptive_sleep_available)
+                ? AVAILABLE_UNSEARCHABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override