Merge "Fix screen attention contextual card" into qt-r1-dev

am: 03c47e7687

Change-Id: Ic7a425c3662d834da23629d9fd98dc5fc39e4ccc
This commit is contained in:
Yi Jiang
2019-06-06 13:23:32 -07:00
committed by android-build-merger
2 changed files with 6 additions and 5 deletions

View File

@@ -16,7 +16,7 @@
package com.android.settings.homepage.contextualcards.slices;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.android.settings.display.AdaptiveSleepPreferenceController.PREF_NAME;
import static com.android.settings.display.AdaptiveSleepPreferenceController.isControllerAvailable;
import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_ADAPTIVE_SLEEP_URI;
@@ -90,6 +90,7 @@ public class ContextualAdaptiveSleepSlice implements CustomSliceable {
final ListBuilder listBuilder = new ListBuilder(mContext,
CONTEXTUAL_ADAPTIVE_SLEEP_URI,
ListBuilder.INFINITY)
.setAccentColor(COLOR_NOT_TINTED)
.addRow(new ListBuilder.RowBuilder()
.setTitleItem(icon, ListBuilder.ICON_IMAGE)
.setTitle(title)
@@ -150,6 +151,6 @@ public class ContextualAdaptiveSleepSlice implements CustomSliceable {
*/
@VisibleForTesting
boolean isSettingsAvailable() {
return isControllerAvailable(mContext) == AVAILABLE;
return isControllerAvailable(mContext) == AVAILABLE_UNSEARCHABLE;
}
}