Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use new text color attr on widgets" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-05-26 18:57:26 +00:00
committed by Android (Google) Code Review
parent 379dd20a32 875b01d161
commit ca7b693508
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/people_tile_large_with_content.xml
View File

@@ -14,6 +14,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
@@ -52,7 +53,7 @@
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem" 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:background="@drawable/people_space_messages_count_background"
android:textSize="14sp" android:textSize="14sp"
android:maxLines="1" android:maxLines="1"

3
packages/SystemUI/res/layout/people_tile_medium_with_content.xml
View File

@@ -16,6 +16,7 @@
--> -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" 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:theme="@android:style/Theme.DeviceDefault.DayNight"
android:id="@+id/item" android:id="@+id/item"
android:background="@drawable/people_space_tile_view_card" android:background="@drawable/people_space_tile_view_card"
@@ -128,7 +129,7 @@
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem" 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:background="@drawable/people_space_messages_count_background"
android:textSize="14sp" android:textSize="14sp"
android:maxLines="1" android:maxLines="1"

3
packages/SystemUI/res/layout/people_tile_small.xml
View File

@@ -14,6 +14,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <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:theme="@android:style/Theme.DeviceDefault.DayNight"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@@ -50,7 +51,7 @@
android:gravity="center" android:gravity="center"
android:paddingHorizontal="8dp" android:paddingHorizontal="8dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem" 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:background="@drawable/people_space_messages_count_background"
android:textSize="@dimen/name_text_size_for_small" android:textSize="@dimen/name_text_size_for_small"
android:maxLines="1" android:maxLines="1"