commit 4feb4bb8af6fb88973538685ff5538ced0f51567
author Stanley Wang <stanleytfwang@google.com> Fri Nov 30 03:23:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 30 03:23:13 2018 +0000
tree 7fb0777d09d8aeb1685a8ea63c723e7c52586633
parent 1ad5c9805ad4f00d0e5d62a78f14441d81f1c3f4
parent da296233bc8bd51fbf8e043d317a7f73458da499

Merge "Fix adaptive brightness not appearing in Settings search"

res/xml/display_settings.xml

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index b0e362c..50a5649 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -44,7 +44,6 @@
         android:title="@string/auto_brightness_title"
         android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.display.AutoBrightnessSettings"
-        settings:searchable="false"
         settings:controller="com.android.settings.display.AutoBrightnessPreferenceController" />
 
     <com.android.settingslib.RestrictedPreference

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

diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 3f5f2b0..3b53fa8 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -52,7 +52,7 @@
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_automatic_brightness_available)
-                ? AVAILABLE_UNSEARCHABLE
+                ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
 
@@ -67,4 +67,4 @@
                 ? R.string.auto_brightness_summary_on
                 : R.string.auto_brightness_summary_off);
     }
-}
\ No newline at end of file
+}