Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3ad7902b30bc19182d9650709dbd0b45c765eda3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eun-Jeong Shin
2022-04-11 15:38:20 +00:00
committed by Automerger Merge Worker
parent 6035871d4c 2211b35992
commit 414e2ca114
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/res/layout/log_access_user_consent_dialog_permission.xml
View File

@@ -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" />

10
core/res/res/values/styles.xml
View File

@@ -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"