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

Commit 21142637 authored by Eun-Jeong Shin's avatar Eun-Jeong Shin Committed by Automerger Merge Worker
Browse files

Merge "Update font/color of user consent dialog for device log access" into... 

Merge "Update font/color of user consent dialog for device log access" into tm-dev am: 2211b359 am: 414e2ca1

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



Change-Id: I02cc309ff6e03fd1d075678210cabafaa363ecce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d159866 414e2ca1

core/res/res/layout/log_access_user_consent_dialog_permission.xml

+4 −4
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
            android:src="@drawable/ic_doc_document"

            tools:layout_editor_absoluteX="148dp"

            tools:layout_editor_absoluteY="35dp"

            android:gravity="center" />



            android:gravity="center"

            android:tint="?attr/colorAccentPrimaryVariant"/>



    <TextView

            android:id="@+id/log_access_dialog_title"
@@ -46,14 +46,14 @@ 
            android:layout_width="wrap_content"

            android:layout_marginBottom="32dp"

            android:text="@string/log_access_confirmation_title"

            android:textAppearance="?attr/textAppearanceLarge"

            android:textColor="@android:color/system_neutral1_900"

            android:textAppearance="@style/AllowLogAccess"

            android:gravity="center" />



    <TextView

            android:id="@+id/log_access_dialog_body"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_marginBottom="40dp"

            android:text="@string/log_access_confirmation_body"

            android:textAppearance="@style/PrimaryAllowLogAccess"

            android:gravity="center" />

core/res/res/values/styles.xml

+5 −5
Original line number Diff line number Diff line
@@ -1500,18 +1500,18 @@ please see styles_device_defaults.xml. 
    </style>



    <!-- The style for log access consent text -->

    <style name="AllowLogAccess">

    <style name="AllowLogAccess"

        parent="@android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">

        <item name="android:layout_width">332dp</item>

        <item name="android:textSize">24sp</item>

        <item name="android:textColor">@android:color/system_neutral1_900</item>

        <item name="android:fontFamily">google-sans</item>

    </style>



    <style name="PrimaryAllowLogAccess">

    <style name="PrimaryAllowLogAccess"

            parent="@android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">

        <item name="android:layout_width">332dp</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">@android:color/system_neutral1_900</item>

        <item name="android:fontFamily">google-sans</item>

        <item name="android:fontFamily">google-sans-text</item>

    </style>



    <style name="PermissionGrantButtonTop"