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

Commit a199a340 authored by Evan Severson's avatar Evan Severson Committed by Android (Google) Code Review
Browse files

Merge "UI changes to permission dialog"

parents 6567a94a b45e8e26

core/res/res/values-night/themes_permission_controller.xml

+0 −3
Original line number Diff line number Diff line
@@ -28,8 +28,5 @@ 
    <style name="Theme.DeviceDefault.PermissionGrant"

           parent="@style/Theme.DeviceDefault.Dialog">

        <item name="titleTextStyle">@style/PermissionGrantTitleMessage</item>

        <item name="radioButtonStyle">@style/PermissionGrantRadioButton</item>

        <item name="checkboxStyle">@style/PermissionGrantCheckbox</item>

        <item name="buttonBarStyle">@style/PermissionGrantButtonBar</item>

    </style>

</resources>

core/res/res/values/styles_permission_controller.xml

+6 −39
Original line number Diff line number Diff line
@@ -25,15 +25,16 @@ 
    </style>



    <style name="PermissionGrantTitleIcon">

        <item name="layout_width">36dp</item>

        <item name="layout_height">36dp</item>

        <item name="layout_width">24dp</item>

        <item name="layout_height">24dp</item>

        <item name="layout_marginBottom">12dp</item>

        <item name="tint">?attr/colorAccent</item>

        <item name="scaleType">fitCenter</item>

    </style>



    <style name="PermissionGrantTitleMessage"

           parent="@style/TextAppearance.DeviceDefault">

        <item name="paddingStart">22dp</item>

        <item name="gravity">center</item>

        <item name="textSize">20sp</item>

        <item name="textColor">?attr/textColorPrimary</item>

    </style>
@@ -46,56 +47,22 @@ 
    </style>



    <style name="PermissionGrantDescription">

        <item name="layout_marginTop">20dp</item>

        <item name="layout_marginStart">24dp</item>

        <item name="layout_marginBottom">16dp</item>

        <item name="layout_marginEnd">24dp</item>

    </style>



    <style name="PermissionGrantContent">

        <item name="layout_marginStart">16dp</item>

        <item name="layout_marginStart">24dp</item>

        <item name="layout_marginEnd">24dp</item>

    </style>



    <style name="PermissionGrantRadioGroup">

        <item name="layout_marginStart">8dp</item>

        <item name="layout_marginTop">-4dp</item>

    </style>



    <style name="PermissionGrantRadioButton"

           parent="@style/Widget.DeviceDefault.CompoundButton.RadioButton">

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

        <item name="paddingTop">8dp</item>

        <item name="paddingBottom">8dp</item>

        <item name="textSize">16sp</item>

    </style>



    <style name="PermissionGrantDetailMessage"

           parent="@style/TextAppearance.DeviceDefault">

        <item name="layout_marginStart">8dp</item>

        <item name="layout_marginBottom">4dp</item>

        <item name="layout_marginTop">18dp</item>

        <item name="textColor">?attr/textColorPrimary</item>

        <item name="textSize">16sp</item>

    </style>



    <style name="PermissionGrantDetailMessageSpace">

        <item name="layout_height">8dp</item>

    </style>



    <style name="PermissionGrantCheckbox"

           parent="@style/Widget.DeviceDefault.CompoundButton.CheckBox">

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

        <item name="textColor">?attr/textColorSecondary</item>

        <item name="buttonTint">?attr/textColorSecondary</item>

        <item name="textSize">16sp</item>

    </style>



    <style name="PermissionGrantButtonBar">

        <item name="layout_marginStart">24dp</item>

        <item name="layout_marginEnd">16dp</item>

        <item name="layout_marginBottom">4dp</item>

    </style>



    <!-- styles for the permission review screen. -->

    <style name="PermissionReviewDescription">

        <item name="layout_marginTop">20dp</item>

core/res/res/values/themes_permission_controller.xml

+0 −4
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 
    <style name="Theme.DeviceDefault.PermissionGrant"

           parent="@style/Theme.DeviceDefault.Light.Dialog">

        <item name="titleTextStyle">@style/PermissionGrantTitleMessage</item>

        <item name="radioButtonStyle">@style/PermissionGrantRadioButton</item>

        <item name="checkboxStyle">@style/PermissionGrantCheckbox</item>

        <item name="buttonBarStyle">@style/PermissionGrantButtonBar</item>

    </style>



    <!-- themes for the permission review dialog. -->
@@ -39,6 +36,5 @@ 
        <item name="windowActionBar">false</item>

        <item name="windowNoTitle">true</item>

        <item name="titleTextStyle">@style/PermissionReviewTitleMessage</item>

        <item name="buttonBarStyle">@style/PermissionReviewButtonBar</item>

    </style>

</resources>