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

Commit 6ebb0d54 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make role request "Don't ask again" checkbox themeable" into qt-dev

parents 49cb2129 3ccaed9d

res/layout/request_role_view.xml

+2 −11
Original line number Diff line number Diff line
@@ -18,19 +18,10 @@ 


<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="?android:dialogPreferredPadding"

    android:paddingEnd="?android:dialogPreferredPadding"

    android:clipChildren="false"

    android:clipToPadding="false">

    style="@style/RequestRoleView">



    <CheckBox

        android:id="@+id/dont_ask_again"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="40dp"

        android:paddingStart="16dp"

        android:text="@string/request_role_dont_ask_again"

        android:textAppearance="@style/android:TextAppearance.Material.Subhead" />

        style="@style/RequestRoleViewCheckbox" />

</FrameLayout>

res/values/overlayable.xml

+7 −2
Original line number Diff line number Diff line
@@ -143,14 +143,19 @@ 
            <item type="style" name="RequestRoleTitleText" />

            <!-- END REQUEST ROLE DIALOG TITLE -->



            <!-- START REQUEST ROLE DIALOG TITLE -->

            <!-- START REQUEST ROLE DIALOG ITEM -->

            <item type="style" name="RequestRoleItem" />

            <item type="style" name="RequestRoleItemIcon" />

            <item type="style" name="RequestRoleItemTitleLayout" />

            <item type="style" name="RequestRoleItemTitleText" />

            <item type="style" name="RequestRoleItemSubtitleText" />

            <item type="style" name="RequestRoleItemRadioButton" />

            <!-- END REQUEST ROLE DIALOG TITLE -->

            <!-- END REQUEST ROLE DIALOG ITEM -->



            <!-- START REQUEST ROLE DIALOG VIEW -->

            <item type="style" name="RequestRoleView" />

            <item type="style" name="RequestRoleViewCheckbox" />

            <!-- END REQUEST ROLE DIALOG VIEW -->



            <!-- START SETTINGS BUTTON PREFERENCE WIDGET -->

            <item type="style" name="SettingsButtonPreferenceWidgetDivider" />

res/values/styles.xml

+21 −0
Original line number Diff line number Diff line
@@ -689,6 +689,27 @@ 


    <!-- END REQUEST ROLE DIALOG ITEM -->



    <!-- START REQUEST ROLE VIEW -->



    <style name="RequestRoleView">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:paddingStart">?android:dialogPreferredPadding</item>

        <item name="android:paddingEnd">?android:dialogPreferredPadding</item>

        <item name="android:clipChildren">false</item>

        <item name="android:clipToPadding">false</item>

    </style>



    <style name="RequestRoleViewCheckbox">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:minHeight">40dp</item>

        <item name="android:paddingStart">16dp</item>

        <item name="android:textAppearance">@style/android:TextAppearance.Material.Subhead</item>

    </style>



    <!-- END REQUEST ROLE VIEW -->



    <!-- START SETTINGS BUTTON PREFERENCE WIDGET -->



    <style name="SettingsButtonPreferenceWidgetDivider">