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

Commit c944dd27 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

parents db208be0 24928c48
Loading
Loading
Loading
Loading
+31 −27
Original line number Original line Diff line number Diff line
@@ -26,8 +26,7 @@
              android:paddingLeft="24dp"
              android:paddingLeft="24dp"
              android:paddingRight="24dp"
              android:paddingRight="24dp"
              android:paddingTop="24dp"
              android:paddingTop="24dp"
              android:paddingBottom="24dp"
              android:paddingBottom="24dp">
              android:background="?attr/colorSurface">


    <ImageView
    <ImageView
            android:id="@+id/log_access_image_view"
            android:id="@+id/log_access_image_view"
@@ -37,8 +36,7 @@
            android:src="@drawable/ic_doc_document"
            android:src="@drawable/ic_doc_document"
            tools:layout_editor_absoluteX="148dp"
            tools:layout_editor_absoluteX="148dp"
            tools:layout_editor_absoluteY="35dp"
            tools:layout_editor_absoluteY="35dp"
            android:gravity="center"
            android:gravity="center" />
            android:tint="?attr/colorAccentPrimaryVariant"/>


    <TextView
    <TextView
            android:id="@+id/log_access_dialog_title"
            android:id="@+id/log_access_dialog_title"
@@ -60,12 +58,17 @@
            android:textColor="?android:attr/textColorPrimary"
            android:textColor="?android:attr/textColorPrimary"
            android:gravity="center" />
            android:gravity="center" />


    <LinearLayout
            android:orientation="vertical"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">
        <Button
        <Button
                android:id="@+id/log_access_dialog_allow_button"
                android:id="@+id/log_access_dialog_allow_button"
                android:layout_width="match_parent"
                android:layout_width="match_parent"
            android:layout_height="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/log_access_confirmation_allow"
                android:text="@string/log_access_confirmation_allow"
                style="@style/PermissionGrantButtonTop"
                style="@style/PermissionGrantButtonTop"
                android:textAppearance="@style/PermissionGrantButtonTextAppearance"
                android:layout_marginBottom="5dp"
                android:layout_marginBottom="5dp"
                android:layout_centerHorizontal="true"
                android:layout_centerHorizontal="true"
                android:layout_alignParentTop="true"
                android:layout_alignParentTop="true"
@@ -76,13 +79,14 @@
        <Button
        <Button
                android:id="@+id/log_access_dialog_deny_button"
                android:id="@+id/log_access_dialog_deny_button"
                android:layout_width="match_parent"
                android:layout_width="match_parent"
            android:layout_height="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/log_access_confirmation_deny"
                android:text="@string/log_access_confirmation_deny"
                style="@style/PermissionGrantButtonBottom"
                style="@style/PermissionGrantButtonBottom"
                android:textAppearance="@style/PermissionGrantButtonTextAppearance"
                android:layout_centerHorizontal="true"
                android:layout_centerHorizontal="true"
                android:layout_alignParentTop="true"
                android:layout_alignParentTop="true"
                android:layout_alignParentBottom="true"
                android:layout_alignParentBottom="true"
                android:clipToOutline="true"
                android:clipToOutline="true"
                android:gravity="center" />
                android:gravity="center" />

    </LinearLayout>
</LinearLayout>
</LinearLayout>
 No newline at end of file
+21 −0
Original line number Original line Diff line number Diff line
<!--
  ~ 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>
 No newline at end of file
+6 −8
Original line number Original line Diff line number Diff line
@@ -1526,26 +1526,27 @@ please see styles_device_defaults.xml.


    <!-- The style for log access consent text -->
    <!-- The style for log access consent text -->
    <style name="AllowLogAccess">
    <style name="AllowLogAccess">
        <item name="android:layout_width">332dp</item>
        <item name="android:textSize">24sp</item>
        <item name="android:textSize">24sp</item>
        <item name="android:fontFamily">google-sans</item>
        <item name="android:fontFamily">google-sans</item>
    </style>
    </style>


    <style name="PrimaryAllowLogAccess">
    <style name="PrimaryAllowLogAccess">
        <item name="android:layout_width">332dp</item>
        <item name="android:textSize">14sp</item>
        <item name="android:textSize">14sp</item>
        <item name="android:fontFamily">google-sans-text</item>
        <item name="android:fontFamily">google-sans-text</item>
    </style>
    </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"
    <style name="PermissionGrantButtonTop"
           parent="@android:style/Widget.DeviceDefault.Button.Borderless.Colored">
           parent="@android:style/Widget.DeviceDefault.Button.Borderless.Colored">
        <item name="android:layout_width">332dp</item>
        <item name="android:layout_width">332dp</item>
        <item name="android:layout_height">56dp</item>
        <item name="android:layout_height">56dp</item>
        <item name="android:layout_marginTop">2dp</item>
        <item name="android:layout_marginTop">2dp</item>
        <item name="android:layout_marginBottom">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>
        <item name="android:background">@drawable/grant_permissions_buttons_top</item>
    </style>
    </style>


@@ -1555,9 +1556,6 @@ please see styles_device_defaults.xml.
        <item name="android:layout_height">56dp</item>
        <item name="android:layout_height">56dp</item>
        <item name="android:layout_marginTop">2dp</item>
        <item name="android:layout_marginTop">2dp</item>
        <item name="android:layout_marginBottom">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>
        <item name="android:background">@drawable/grant_permissions_buttons_bottom</item>
    </style>
    </style>