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

Merge "Fix font families in media controls" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-23 00:07:40 +00:00
committed by Android (Google) Code Review
parent 471ef84e33 ed9f305038
commit 6f85ed6d6f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/res/layout/media_view.xml
View File

@@ -115,7 +115,7 @@
android:id="@+id/media_seamless_text" android:id="@+id/media_seamless_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@*android:string/config_bodyFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:singleLine="true" android:singleLine="true"
android:text="@*android:string/ext_media_seamless_action" android:text="@*android:string/ext_media_seamless_action"
android:textColor="@color/media_primary_text" android:textColor="@color/media_primary_text"
@@ -161,6 +161,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:textSize="14sp" /> android:textSize="14sp" />
<!-- Song name --> <!-- Song name -->
@@ -178,7 +179,7 @@
android:id="@+id/header_artist" android:id="@+id/header_artist"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@*android:string/config_bodyFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/media_secondary_text" android:textColor="@color/media_secondary_text"
android:textSize="14sp" /> android:textSize="14sp" />
@@ -186,8 +187,8 @@
<com.android.internal.widget.CachingIconView <com.android.internal.widget.CachingIconView
android:id="@+id/icon" android:id="@+id/icon"
android:tint="@color/media_primary_text" android:tint="@color/media_primary_text"
android:layout_width="16dp" android:layout_width="20dp"
android:layout_height="16dp" /> android:layout_height="20dp" />
<!-- Buttons to remove this view when no longer needed --> <!-- Buttons to remove this view when no longer needed -->
<include <include