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

Commit b6525cff authored by Yalan Yiue's avatar Yalan Yiue Committed by Automerger Merge Worker
Browse files

Merge "[Partial Screensharing] Option text is cropped with max font size" into... 

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

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



Change-Id: I20f551cefd87e5c0a4ac928c8c810d7fb0da2b63
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents abc6d425 2a3596b2

packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <TextView

        android:id="@+id/screen_recording_dialog_source_text"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textSize="14sp"

packages/SystemUI/res/layout/screen_record_dialog_audio_source_selected.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:layout_weight="1">

    <TextView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/screenrecord_audio_label"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:fontFamily="@*android:string/config_headlineFontFamily"
@@ -30,7 +30,7 @@ 
    <TextView

        android:id="@+id/screen_recording_dialog_source_text"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

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

        android:textAppearance="?android:attr/textAppearanceSmall"/>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/screen_record_options.xml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
            android:importantForAccessibility="no"/>

        <TextView

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="48dp"

            android:layout_weight="1"

            android:gravity="center_vertical"