Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02777d3e authored by Yi Jiang's avatar Yi Jiang Committed by android-build-merger
Browse files

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

am: 03c47e76

Change-Id: Ic7a425c3662d834da23629d9fd98dc5fc39e4ccc
parents 4c15fab9 03c47e76

res/drawable/ic_settings_adaptive_sleep.xml

+3 −3
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="#12B5CB"

        android:pathData="M10.67,21H7v-1h3.13c-0.27-0.63-0.46-1.3-0.56-2H7V6h10v3.5c0.69,0,1.36,0.1,2,0.28V3 c0-1.1-0.9-1.99-2-1.99L7,1C5.9,1,5,1.9,5,3v18c0,1.1,0.9,2,2,2h5.52C11.79,22.45,11.16,21.77,10.67,21z M7,3h10v1H7V3z" />

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="#FA903E"

        android:pathData="M17,12.5c2.48,0,4.5,2.02,4.5,4.5s-2.02,4.5-4.5,4.5s-4.5-2.02-4.5-4.5S14.52,12.5,17,12.5 M17,11 c-3.31,0-6,2.69-6,6s2.69,6,6,6c3.31,0,6-2.69,6-6S20.31,11,17,11L17,11z" />

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="#FA903E"

        android:pathData="M17,14v3l-2.12,2.12C15.42,19.66,16.17,20,17,20c1.66,0,3-1.34,3-3S18.66,14,17,14z" />

</vector>
 
 No newline at end of file

src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java

+3 −2
Original line number Diff line number Diff line
@@ -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;

    }

}
 
 No newline at end of file