From e0a4a343c46eb47fc2167184b404d8f64590aa83 Mon Sep 17 00:00:00 2001 From: Ioana Alexandru Date: Thu, 27 Apr 2023 12:09:53 +0000 Subject: [PATCH] Fix AmbientDisplayAlwaysOn isSliceable. I changed this method to return true in ag/22761786 thinking that it was necessary (as per the example at https://g3doc.corp.google.com/company/teams/apps-android-settings/howto/settings_slices.md#preference-controller), but this breaks a test, so I'm rolling back that part of the change. Fix: 279881487 Test: presubmit Change-Id: I87716a0daf5face9a79f98353b49ea2166226279 --- .../display/AmbientDisplayAlwaysOnPreferenceController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java index 5d95ddbfeb8..245803493e2 100644 --- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java @@ -22,6 +22,7 @@ import android.os.PowerManager; import android.os.SystemProperties; import android.os.UserHandle; import android.provider.Settings; +import android.text.TextUtils; import androidx.preference.Preference; @@ -63,7 +64,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference @Override public boolean isPublicSlice() { - return true; + return TextUtils.equals(getPreferenceKey(), "ambient_display_always_on"); } @Override