Merge "[Partial Screensharing] Option text is cropped with max font size" into tm-qpr-dev am: 2a3596b27e

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

Change-Id: I20f551cefd87e5c0a4ac928c8c810d7fb0da2b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yalan Yiue
2023-02-07 15:44:26 +00:00
committed by Automerger Merge Worker
3 changed files with 4 additions and 4 deletions

View File

@@ -23,7 +23,7 @@
<TextView <TextView
android:id="@+id/screen_recording_dialog_source_text" android:id="@+id/screen_recording_dialog_source_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="14sp" android:textSize="14sp"

View File

@@ -22,7 +22,7 @@
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:text="@string/screenrecord_audio_label" android:text="@string/screenrecord_audio_label"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
@@ -30,7 +30,7 @@
<TextView <TextView
android:id="@+id/screen_recording_dialog_source_text" android:id="@+id/screen_recording_dialog_source_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAppearance="?android:attr/textAppearanceSmall"/> android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout> </LinearLayout>

View File

@@ -67,7 +67,7 @@
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:minHeight="48dp" android:minHeight="48dp"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"