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

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

Merge "Add themes for review permission flow"

parents 6910e140 80376aa1

core/res/res/values/styles_permission_controller.xml

+34 −1
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
  limitations under the License.

  -->



<!-- styles for the permission grant dialog. -->

<resources>

    <!-- styles for the permission grant dialog. -->

    <style name="PermissionGrantDialog">

        <item name="background">?attr/windowBackground</item>

        <item name="elevation">?attr/windowElevation</item>
@@ -95,4 +95,37 @@ 
        <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>

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

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

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

    </style>



    <style name="PermissionReviewTitleIcon">

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

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

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

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

    </style>



    <style name="PermissionReviewTitleMessage"

           parent="@style/TextAppearance.DeviceDefault">

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

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

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

    </style>



    <style name="PermissionReviewSettings">

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

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

    </style>



    <style name="PermissionReviewButtonBar">

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

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

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

    </style>

</resources>

core/res/res/values/themes_permission_controller.xml

+10 −1
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
  limitations under the License.

  -->



<!-- themes for the permission grant dialog. -->

<resources>

    <!-- themes for the permission grant dialog. -->

    <style name="Theme.DeviceDefault.PermissionGrantApp"

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

        <item name="windowIsFloating">false</item>
@@ -32,4 +32,13 @@ 
        <item name="checkboxStyle">@style/PermissionGrantCheckbox</item>

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

    </style>



    <!-- themes for the permission review dialog. -->

    <style name="Theme.DeviceDefault.PermissionReviewApp"

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

        <item name="windowActionBar">false</item>

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

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

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

    </style>

</resources>