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

Commit ae417f2e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update folder preview and folder colors" into udc-dev am: e5021363 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23215755



Change-Id: Ie23cfe2c9511c2f102e5fcfd4ef859bf39860503
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7786d86 e5021363

res/color-night-v31/folder_background_dark.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android" >

    <item

        android:color="@android:color/system_neutral2_500"

        android:lStar="35" />

        android:color="@android:color/system_neutral2_900"

        android:lStar="12" />

</selector>

res/color-night-v31/folder_preview_dark.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android" >

    <item

        android:color="@android:color/system_neutral2_500"

        android:lStar="30" />

        android:color="@android:color/system_neutral1_900"

        android:lStar="17" />

</selector>

res/color-v31/folder_background_light.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android" >

    <item

        android:color="@android:color/system_neutral1_500"

        android:lStar="98" />

        android:color="@android:color/system_neutral1_50"

        android:lStar="94" />

</selector>

res/color-v31/folder_preview_light.xml

+1 −3
Original line number Diff line number Diff line
@@ -14,7 +14,5 @@ 
     limitations under the License.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android" >

    <item

        android:color="@android:color/system_accent2_500"

        android:lStar="80" />

    <item android:color="@android:color/system_accent2_200"/>

</selector>

res/layout/user_folder_icon_normalized.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
            android:singleLine="true"

            android:textColor="?attr/folderTextColor"

            android:textColorHighlight="?android:attr/colorControlHighlight"

            android:textColorHint="?attr/folderHintColor"/>

            android:textColorHint="?attr/folderHintTextColor"/>



        <com.android.launcher3.pageindicators.PageIndicatorDots

            android:id="@+id/folder_page_indicator"