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

Commit e30c53d9 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

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

parents ff986fe4 50d7143f

core/res/res/layout/log_access_user_consent_dialog_permission.xml

+2 −0
Original line number Diff line number Diff line
@@ -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

core/res/res/values/styles.xml

+2 −4
Original line number Diff line number Diff line
@@ -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>