Merge "Update fonts for screen record dialog" into main (e140d552) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:fontFamily="variable-label-large"
		android:textSize="14sp"
		android:textColor="@color/material_dynamic_neutral10"/>
		<TextView
		@@ -34,5 +35,7 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:fontFamily="variable-body-small"
		android:textSize="12sp"
		android:textColor="@color/material_dynamic_neutral_variant30"/>
		</LinearLayout>
		No newline at end of file

+4 −4

Original line number	Diff line number	Diff line
		@@ -24,13 +24,13 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/screenrecord_audio_label"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:fontFamily="@*android:string/config_headlineFontFamily"
		android:textColor="?android:attr/textColorPrimary"/>
		android:textAppearance="@style/TextAppearance.ScreenRecord.SwitchLabel" />
		<TextView
		android:id="@+id/screen_recording_dialog_source_text"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textColor="?android:attr/textColorSecondary"
		android:textAppearance="?android:attr/textAppearanceSmall"/>
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:fontFamily="variable-body-medium"
		android:textSize="14sp" />
		</LinearLayout>
		No newline at end of file

+1 −3

Original line number	Diff line number	Diff line
		@@ -73,9 +73,7 @@
		android:gravity="center_vertical"
		android:layout_marginEnd="@dimen/screenrecord_show_taps_margin_end"
		android:text="@string/screenrecord_taps_label"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:fontFamily="@*android:string/config_bodyFontFamily"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="@style/TextAppearance.ScreenRecord.SwitchLabel"
		android:contentDescription="@string/screenrecord_taps_label"/>

		<Switch

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		<TextView xmlns:android="http://schemas.android.com/apk/res/android"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:fontFamily="@*android:string/config_bodyFontFamily"
		android:textColor="?android:textColorPrimary"
		android:textColor="?android:attr/textColorPrimary"
		android:singleLine="true"
		android:layout_width="match_parent"
		android:layout_height="match_parent"

+10 −2

Original line number	Diff line number	Diff line
		@@ -1004,14 +1004,22 @@
		</style>

		<style name="ScreenRecord.Switch">
		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		<item name="android:textAppearance">@style/TextAppearance.ScreenRecord.SwitchLabel</item>
		<item name="android:switchMinWidth">52dp</item>
		<item name="android:minHeight">48dp</item>
		<item name="android:track">@drawable/settingslib_switch_track</item>
		<item name="android:thumb">@drawable/settingslib_switch_thumb</item>
		</style>

		<style name="TextAppearance.ScreenRecord" />

		<style name="TextAppearance.ScreenRecord.SwitchLabel">
		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
		<item name="android:fontFamily">variable-title-medium-emphasized</item>
		<item name="android:textSize">16sp</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		</style>

		<!-- Screenshots -->
		<style name="AppClipsTrampolineActivity">
		<item name="android:windowIsTranslucent">true</item>