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

Commit 980c2fd9 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Dark mode support for user consent dialog when device log access is... 

Merge "Dark mode support for user consent dialog when device log access is requested" into tm-dev am: e30c53d9 am: 1dab4fbb

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



Change-Id: Idfc4243e77309e7fad9b1150b9142f6bebb37105
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f76afdaa 1dab4fbb

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>