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

Commit 8e73c010 authored by Evan Severson's avatar Evan Severson
Browse files

Make permission_app layout themeable 

Extract the attributes into styles so that they can be overlaid

Test: Build and check default appearence is unchanged
Change-Id: Iad113bc802dfa28f072c2c13cf2d191fe3df5dde
parent 73092fb1

res/layout/app_permission.xml

+16 −54
Original line number Diff line number Diff line
@@ -31,27 +31,18 @@ 
        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            style="@style/AppPermission">



            <include layout="@layout/header_large" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:minHeight="?android:attr/listPreferredItemHeight"

                android:paddingStart="?android:attr/listPreferredItemPaddingStart"

                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

                android:background="?android:attr/selectableItemBackground">

                style="@style/AppPermissionSelection">



                <TextView

                    android:id="@+id/permission_message"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/app_permission_header_margin_top"

                    android:layout_marginStart="@dimen/app_permission_header_margin_start"

                    android:textAllCaps="true"

                    android:textAppearance="?android:attr/textAppearanceSmall" />

                    style="@style/AppPermissionMessage"/>



                <RadioGroup

                    android:id="@+id/radiogroup"
@@ -61,24 +52,18 @@ 


                    <RadioButton

                        android:id="@+id/allow_radio_button"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/app_permission_button_allow_always"

                        style="@style/PermissionGrantRadioButton" />

                        style="@style/AppPermissionRadioButton" />



                    <RadioButton

                        android:id="@+id/foreground_only_radio_button"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/app_permission_button_allow_foreground"

                        style="@style/PermissionGrantRadioButton" />

                        style="@style/AppPermissionRadioButton" />



                    <RadioButton

                        android:id="@+id/deny_radio_button"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/app_permission_button_deny"

                        style="@style/PermissionGrantRadioButton" />

                        style="@style/AppPermissionRadioButton" />



                </RadioGroup>
@@ -89,19 +74,11 @@ 


                    <TextView

                        android:id="@+id/permission_details"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:gravity="center"

                        android:layout_marginStart="@dimen/app_permission_detail_margin_start" />

                        style="@style/AppPermissionDetails"/>



                    <LinearLayout

                        android:id="@+id/two_target_divider"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:gravity="center"

                        android:orientation="horizontal"

                        android:paddingTop="@dimen/app_permission_vertical_divider_padding_top"

                        android:paddingBottom="@dimen/app_permission_vertical_divider_padding_bottom">

                        style="@style/AppPermissionTwoTargetDivider">

                        <View

                            android:layout_width="1dp"

                            android:layout_height="match_parent"
@@ -110,10 +87,7 @@ 


                    <LinearLayout

                        android:id="@+id/widget_frame"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:gravity="center"

                        android:minWidth="64dp" />

                        style="@style/AppPermissionWidgetFrame"/>



                </LinearLayout>
@@ -121,43 +95,31 @@ 


            <LinearLayout

                android:id="@+id/footer_all"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:minHeight="?android:attr/listPreferredItemHeight"

                android:paddingStart="?android:attr/listPreferredItemPaddingStart"

                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

                android:background="?android:attr/selectableItemBackground">

                style="@style/AppPermissionFooter">



                <View

                    android:id="@+id/divider"

                    android:layout_width="match_parent"

                    android:layout_height=".75dp"

                    android:layout_marginTop="@dimen/app_permission_divider_margin_top"

                    android:layout_marginBottom="@dimen/app_permission_divider_margin_bottom"

                    android:background="?android:attr/dividerHorizontal"/>

                    style="@style/AppPermissionFooterDivider"/>



                <TextView

                    android:id="@+id/usage_summary"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    style="@style/FooterText"/>

                    style="@style/AppPermissionFooterText"/>



                <TextView

                    android:id="@+id/footer_link_1"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    style="@style/FooterText"

                    android:textColor="?android:attr/colorAccent"

                    android:clickable="true"/>

                    android:clickable="true"

                    style="@style/AppPermissionFooterLink"/>



                <TextView

                    android:id="@+id/footer_link_2"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    style="@style/FooterText"

                    android:textColor="?android:attr/colorAccent"

                    android:clickable="true"/>

                    android:clickable="true"

                    style="@style/AppPermissionFooterLink"/>



            </LinearLayout>

res/layout/header_large.xml

+5 −13
Original line number Diff line number Diff line
@@ -15,25 +15,17 @@ 
-->



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

    android:id="@+id/button_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:gravity="center" >

    android:id="@+id/large_header"

    style="@style/LargeHeader">



    <include layout="@layout/settings_entity_header" />



    <TextView

        android:id="@+id/header_link"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

        android:textColor="?android:attr/colorAccent"

        android:clickable="true"/>

        android:clickable="true"

        style="@style/HeaderLink"/>



    <View

        android:layout_width="match_parent"

        android:layout_height=".75dp"

        android:background="?android:attr/dividerHorizontal"/>

        style="@style/LargeHeaderDivider"/>



</LinearLayout>

res/values/dimens.xml

+0 −11
Original line number Diff line number Diff line
@@ -42,17 +42,6 @@ 
    <dimen name="wear_permission_review_pref_padding">8dp</dimen>

    <dimen name="wear_permission_review_icon_size">24dp</dimen>



    <dimen name="app_permission_header_margin_start">48dp</dimen>

    <dimen name="app_permission_header_margin_top">16dp</dimen>



    <dimen name="app_permission_vertical_divider_padding_top">16dp</dimen>

    <dimen name="app_permission_vertical_divider_padding_bottom">16dp</dimen>



    <dimen name="app_permission_detail_margin_start">48dp</dimen>



    <dimen name="app_permission_divider_margin_top">12dp</dimen>

    <dimen name="app_permission_divider_margin_bottom">8dp</dimen>



    <dimen name="preference_usage_title_summary_icon_size">16dp</dimen>



    <dimen name="accessibility_service_dialog_text_margin_sides">24dp</dimen>

res/values/overlayable.xml

+19 −0
Original line number Diff line number Diff line
@@ -58,6 +58,25 @@ 
            <item type="style" name="PermissionReviewButtonContinue" />

            <!-- END PERMISSION REVIEW SCREEN -->





            <!-- START APP PERMISSION SCREEN -->

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



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

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



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

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

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

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

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

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



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

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

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

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

            <!-- END APP PERMISSION SCREEN -->

        </policy>



    </overlayable>

res/values/styles.xml

+110 −17
Original line number Diff line number Diff line
@@ -17,23 +17,6 @@ 


<resources>



    <style name="PermissionGrantRadioButton"

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

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

        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>

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

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

        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>

    </style>



    <style name="FooterText">

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

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

        <item name="android:layout_marginStart">48dp</item>

        <item name="android:layout_marginEnd">48dp</item>

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

    </style>



    <!-- PERMISSION GRANT DIALOG -->



    <style name="PermissionGrantScrollView">
@@ -195,4 +178,114 @@ 


    <!-- END PERMISSION REVIEW SCREEN -->



    <!-- START APP PERMISSION SCREEN -->



    <style name="AppPermission">

        <item name="android:orientation">vertical</item>

    </style>



    <style name="LargeHeader">

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

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

        <item name="android:orientation">vertical</item>

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

    </style>



    <style name="HeaderLink">

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

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

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

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="LargeHeaderDivider">

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

        <item name="android:layout_height">.75dp</item>

        <item name="android:background">?android:attr/dividerHorizontal</item>

    </style>



    <style name="AppPermissionSelection">

        <item name="android:orientation">vertical</item>

        <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>

        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>

        <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

    </style>



    <style name="AppPermissionMessage">

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

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

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

        <item name="android:layout_marginStart">48dp</item>

        <item name="android:textAllCaps">true</item>

        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>

    </style>



    <style name="AppPermissionRadioButton"

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

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

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

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

        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>

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

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

        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>

    </style>



    <style name="AppPermissionDetails">

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

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

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

        <item name="android:layout_marginStart">48dp</item>

    </style>



    <style name="AppPermissionTwoTargetDivider">

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

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

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

        <item name="android:orientation">horizontal</item>

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

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

    </style>



    <style name="AppPermissionWidgetFrame">

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

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

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

        <item name="android:minWidth">64dp</item>

    </style>



    <style name="AppPermissionFooter">

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

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

        <item name="android:orientation">vertical</item>

        <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>

        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>

        <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

    </style>



    <style name="AppPermissionFooterDivider">

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

        <item name="android:layout_height">.75dp</item>

        <item name="android:layout_marginTop">12dp</item>

        <item name="android:layout_marginBottom">8dp</item>

        <item name="android:background">?android:attr/dividerHorizontal</item>

    </style>



    <style name="AppPermissionFooterText">

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

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

        <item name="android:layout_marginStart">48dp</item>

        <item name="android:layout_marginEnd">48dp</item>

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

    </style>



    <style name="AppPermissionFooterLink"

           parent="@style/AppPermissionFooterText">

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <!-- END APP PERMISSION SCREEN -->



</resources>