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

Commit bea2b82c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update text, colors, and suppression" into sc-dev am: 39e9e83e 

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

Change-Id: I3a508e1d5f2757c7f652cfcf62c12468946da8d4
parents 162d52df 39e9e83e

packages/SystemUI/res/layout/people_space_initial_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
                android:id="@+id/name"

                android:paddingTop="2dp"

                android:text="@string/empty_user_name"

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

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

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

                android:textSize="12sp"

                android:maxLines="1"
@@ -59,7 +59,7 @@ 
        <TextView

            android:text="@string/status_before_loading"

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

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

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

            android:textSize="12sp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

packages/SystemUI/res/layout/people_space_placeholder_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
                android:id="@+id/name"

                android:paddingTop="2dp"

                android:text="@string/empty_user_name"

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

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

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

                android:textSize="12sp"

                android:maxLines="1"
@@ -59,7 +59,7 @@ 
        <TextView

            android:text="@string/empty_status"

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

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

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

            android:textSize="12sp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

packages/SystemUI/res/layout/people_space_widget_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 


                <TextView

                    android:id="@+id/name"

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

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

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

                    android:textSize="16sp"

                    android:maxLines="1"
@@ -79,7 +79,7 @@ 
                <TextView

                    android:id="@+id/status"

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

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

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

                    android:paddingVertical="2dp"

                    android:textSize="12sp"

                    android:layout_width="wrap_content"

packages/SystemUI/res/layout/people_tile_large_empty.xml

+2 −2
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ 
            android:layout_height="wrap_content"

            android:ellipsize="end"

            android:singleLine="true"

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

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

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

            android:textSize="@dimen/name_text_size_for_large" />

        <TextView

            android:id="@+id/last_interaction"

            android:text="@string/empty_status"

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

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

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

            android:textSize="@dimen/content_text_size_for_large"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

packages/SystemUI/res/layout/people_tile_large_with_content.xml

+6 −7
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
            android:layout_alignParentEnd="true"

            android:paddingStart="8dp"

            android:paddingEnd="8dp"

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

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

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

            android:background="@drawable/people_space_messages_count_background"

            android:textSize="14sp"
@@ -81,9 +81,9 @@ 
            android:singleLine="true"

            android:ellipsize="end"

            android:text="@string/empty_user_name"

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

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

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

            android:textSize="@dimen/name_text_size_for_content" />

            android:textSize="@dimen/name_text_size_for_large_content" />



        <LinearLayout

            android:id="@+id/content"
@@ -102,7 +102,7 @@ 


                <ImageView

                    android:id="@+id/predefined_icon"

                    android:tint="?android:attr/textColorTertiary"

                    android:tint="?android:attr/textColorSecondary"

                    android:gravity="start|center_vertical"

                    android:layout_width="@dimen/regular_predefined_icon"

                    android:layout_height="@dimen/regular_predefined_icon" />
@@ -117,11 +117,10 @@ 
                    android:ellipsize="end"

                    android:singleLine="true"

                    android:text="@string/empty_user_name"

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

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

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

                    android:textSize="12sp" />

            </LinearLayout>



            <ImageView

                android:id="@+id/image"

                android:layout_width="match_parent"
@@ -139,7 +138,7 @@ 
                android:maxLines="2"

                android:singleLine="false"

                android:text="@string/empty_status"

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

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

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

                android:textSize="@dimen/content_text_size_for_large" />

        </LinearLayout>