Merge "Dark mode support for user consent dialog when device log access is requested" into tm-dev

This commit is contained in:
Lucas Dupin
2022-04-11 16:52:04 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 4 deletions

View File

@@ -47,6 +47,7 @@
android:layout_marginBottom="32dp"
android:text="@string/log_access_confirmation_title"
android:textAppearance="@style/AllowLogAccess"
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" />
<TextView
@@ -56,6 +57,7 @@
android:layout_marginBottom="40dp"
android:text="@string/log_access_confirmation_body"
android:textAppearance="@style/PrimaryAllowLogAccess"
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" />
<Button

View File

@@ -1500,15 +1500,13 @@ please see styles_device_defaults.xml.
</style>
<!-- The style for log access consent text -->
<style name="AllowLogAccess"
parent="@android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
<style name="AllowLogAccess">
<item name="android:layout_width">332dp</item>
<item name="android:textSize">24sp</item>
<item name="android:fontFamily">google-sans</item>
</style>
<style name="PrimaryAllowLogAccess"
parent="@android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
<style name="PrimaryAllowLogAccess">
<item name="android:layout_width">332dp</item>
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">google-sans-text</item>