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

Commit 40fe8b83 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Use new text color attr on widgets" into sc-dev am: ca7b6935 am: 2af7c6e9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14722066

Change-Id: I003227bd744a382d99bb4865c9c3ffe6d9a21774
parents 29179d0f 2af7c6e9

packages/SystemUI/res/layout/people_tile_large_with_content.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
~ limitations under the License.

-->

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"
@@ -52,7 +53,7 @@ 
            android:paddingStart="8dp"

            android:paddingEnd="8dp"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

            android:textColor="?android:attr/textColorPrimary"

            android:textColor="?androidprv:attr/textColorOnAccent"

            android:background="@drawable/people_space_messages_count_background"

            android:textSize="14sp"

            android:maxLines="1"

packages/SystemUI/res/layout/people_tile_medium_with_content.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 -->

<LinearLayout

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

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

    android:theme="@android:style/Theme.DeviceDefault.DayNight"

    android:id="@+id/item"

    android:background="@drawable/people_space_tile_view_card"
@@ -128,7 +129,7 @@ 
                    android:paddingStart="8dp"

                    android:paddingEnd="8dp"

                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

                    android:textColor="?android:attr/textColorPrimary"

                    android:textColor="?androidprv:attr/textColorOnAccent"

                    android:background="@drawable/people_space_messages_count_background"

                    android:textSize="14sp"

                    android:maxLines="1"

packages/SystemUI/res/layout/people_tile_small.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
  ~ limitations under the License.

  -->

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

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

    android:theme="@android:style/Theme.DeviceDefault.DayNight"

    android:layout_width="match_parent"

    android:layout_height="match_parent">
@@ -50,7 +51,7 @@ 
            android:gravity="center"

            android:paddingHorizontal="8dp"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

            android:textColor="?android:attr/textColorPrimary"

            android:textColor="?androidprv:attr/textColorOnAccent"

            android:background="@drawable/people_space_messages_count_background"

            android:textSize="@dimen/name_text_size_for_small"

            android:maxLines="1"