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

Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d

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

Change-Id: Idb14d285578705e5c6dbf228df23438a44e669dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-20 12:23:54 +00:00
committed by Automerger Merge Worker
parent 3b35df974a 24928c481d
commit c0477b594d
3 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,8 +26,7 @@
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingTop="24dp"
android:paddingBottom="24dp"
android:background="?attr/colorSurface">
android:paddingBottom="24dp">
<ImageView
android:id="@+id/log_access_image_view"
@@ -37,8 +36,7 @@
android:src="@drawable/ic_doc_document"
tools:layout_editor_absoluteX="148dp"
tools:layout_editor_absoluteY="35dp"
android:gravity="center"
android:tint="?attr/colorAccentPrimaryVariant"/>
android:gravity="center" />
<TextView
android:id="@+id/log_access_dialog_title"
@@ -60,29 +58,35 @@
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" />
<Button
android:id="@+id/log_access_dialog_allow_button"
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/log_access_confirmation_allow"
style="@style/PermissionGrantButtonTop"
android:layout_marginBottom="5dp"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:clipToOutline="true"
android:gravity="center" />
<Button
android:id="@+id/log_access_dialog_deny_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/log_access_confirmation_deny"
style="@style/PermissionGrantButtonBottom"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:clipToOutline="true"
android:gravity="center" />
android:layout_height="wrap_content">
<Button
android:id="@+id/log_access_dialog_allow_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/log_access_confirmation_allow"
style="@style/PermissionGrantButtonTop"
android:textAppearance="@style/PermissionGrantButtonTextAppearance"
android:layout_marginBottom="5dp"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:clipToOutline="true"
android:gravity="center" />
<Button
android:id="@+id/log_access_dialog_deny_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/log_access_confirmation_deny"
style="@style/PermissionGrantButtonBottom"
android:textAppearance="@style/PermissionGrantButtonTextAppearance"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:clipToOutline="true"
android:gravity="center" />
</LinearLayout>
</LinearLayout>

21
core/res/res/values-television/styles.xml Normal file
View File

@@ -0,0 +1,21 @@
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<resources>
<style name="PermissionGrantButtonTop"
parent="@style/Widget.Leanback.Button.ButtonBarGravityStart" />
<style name="PermissionGrantButtonBottom"
parent="@style/Widget.Leanback.Button.ButtonBarGravityStart" />
</resources>

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

@@ -1526,26 +1526,27 @@ please see styles_device_defaults.xml.
<!-- The style for log access consent text -->
<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">
<item name="android:layout_width">332dp</item>
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">google-sans-text</item>
</style>
<style name="PermissionGrantButtonTextAppearance">
<item name="android:fontFamily">google-sans-medium</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/system_neutral1_900</item>
</style>
<style name="PermissionGrantButtonTop"
parent="@android:style/Widget.DeviceDefault.Button.Borderless.Colored">
<item name="android:layout_width">332dp</item>
<item name="android:layout_height">56dp</item>
<item name="android:layout_marginTop">2dp</item>
<item name="android:layout_marginBottom">2dp</item>
<item name="android:fontFamily">google-sans-medium</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/system_neutral1_900</item>
<item name="android:background">@drawable/grant_permissions_buttons_top</item>
</style>
@@ -1555,9 +1556,6 @@ please see styles_device_defaults.xml.
<item name="android:layout_height">56dp</item>
<item name="android:layout_marginTop">2dp</item>
<item name="android:layout_marginBottom">2dp</item>
<item name="android:fontFamily">google-sans-medium</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/system_neutral1_900</item>
<item name="android:background">@drawable/grant_permissions_buttons_bottom</item>
</style>