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

Commit 0ff016cb authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de2 

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



Change-Id: I6ea288b4d1b61b7fae5e52dfd57f6edec5bb3b75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f915a4c 9bd47de2

res/color/dream_card_color_state_list.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/>

    <item android:color="?androidprv:attr/materialColorSurfaceContainer"/>

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorPrimaryContainer"/>

    <item android:color="?androidprv:attr/materialColorSurfaceBright"/>

</selector>
 
 No newline at end of file

res/color/dream_card_icon_color_state_list.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimary"/>

    <item android:color="?androidprv:attr/materialColorPrimaryContainer"/>

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>

    <item android:color="?androidprv:attr/materialColorPrimary"/>

</selector>
 
 No newline at end of file

res/color/dream_card_summary_color_state_list.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>

    <item android:color="?androidprv:attr/materialColorOnSurfaceVariant"/>

</selector>
 
 No newline at end of file

res/color/dream_card_text_color_state_list.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimary"/>

    <item android:color="?android:attr/textColorPrimary"/>

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>

    <item android:color="?androidprv:attr/materialColorOnSurface"/>

</selector>
 
 No newline at end of file

res/drawable/dream_default_preview_icon.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@ 
  -->



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

        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path android:fillColor="?android:attr/textColorSecondary"

    <path android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"

          android:pathData="M3,19Q2.175,19 1.588,18.413Q1,17.825 1,17V7Q1,6.175 1.588,5.588Q2.175,5 3,5H13Q13.825,5 14.413,5.588Q15,6.175 15,7V17Q15,17.825 14.413,18.413Q13.825,19 13,19ZM3,17H13Q13,17 13,17Q13,17 13,17V7Q13,7 13,7Q13,7 13,7H3Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17ZM17,19V5H19V19ZM21,19V5H23V19ZM4,15H12L9.4,11.5L7.5,14L6.1,12.15ZM3,7Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17Q3,17 3,17Q3,17 3,17V7Q3,7 3,7Q3,7 3,7Z"/>

</vector>
 
 No newline at end of file