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

Commit 873f093b authored by Evan Severson's avatar Evan Severson
Browse files

Make the request role dialog themeable 

Also the settings widget for the home role is also themeable

Bug: 129277411
Test: Build and open dialog
Change-Id: I7052e9ba8de3b7973e8c0348423f3b310c316137
parent 87777900

res/layout/request_role_item.xml

+8 −23
Original line number Diff line number Diff line
@@ -29,44 +29,29 @@ 


    <ImageView

        android:id="@+id/icon"

        android:layout_width="32dp"

        android:layout_height="32dp"

        android:duplicateParentState="true" />

        android:duplicateParentState="true"

        style="@style/RequestRoleItemIcon" />



    <LinearLayout

        android:id="@+id/title_and_subtitle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginStart="16dp"

        android:animateLayoutChanges="true"

        android:duplicateParentState="true"

        android:orientation="vertical">

        style="@style/RequestRoleItemTitleLayout">



        <TextView

            android:id="@+id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:duplicateParentState="true"

            android:textAppearance="?android:textAppearanceListItem"

            android:textColor="?android:textColorAlertDialogListItem"

            android:singleLine="true"

            android:ellipsize="marquee" />

            style="@style/RequestRoleItemTitleText" />



        <TextView

            android:id="@+id/subtitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:duplicateParentState="true"

            android:textAppearance="?android:textAppearanceListItemSecondary"

            android:textColor="?android:textColorSecondary" />

            style="@style/RequestRoleItemSubtitleText" />

    </LinearLayout>



    <RadioButton

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="16dp"

        android:clickable="false"

        android:duplicateParentState="true"

        android:focusable="false" />

        android:focusable="false"

        style="@style/RequestRoleItemRadioButton" />



</com.android.packageinstaller.role.ui.CheckableLinearLayout>

res/layout/request_role_title.xml

+3 −12
Original line number Diff line number Diff line
@@ -20,22 +20,13 @@ 
    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:paddingTop="18dp"

    android:gravity="center_horizontal"

    android:orientation="vertical">

    style="@style/RequestRoleTitle">



    <ImageView

        android:id="@+id/icon"

        android:layout_width="32dp"

        android:layout_height="32dp" />

        style="@style/RequestRoleTitleIcon" />



    <TextView

        android:id="@+id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="8dp"

        android:gravity="center_horizontal"

        android:textAppearance="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" />

        style="@style/RequestRoleTitleText" />

</LinearLayout>

res/layout/settings_button_preference_widget.xml

+4 −14
Original line number Diff line number Diff line
@@ -22,22 +22,12 @@ 
    android:layout_height="match_parent"

    android:orientation="horizontal">



    <View

        android:layout_width="1dp"

        android:layout_height="match_parent"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="16dp"

        android:background="?android:listDivider" />

    <View style="@style/SettingsButtonPreferenceWidgetDivider" />



    <ImageButton

        android:id="@+id/settings_button"

        android:layout_width="wrap_content"

        android:minWidth="64dp"

        android:layout_height="match_parent"

        android:paddingStart="?android:listPreferredItemPaddingEnd"

        android:paddingEnd="?android:listPreferredItemPaddingEnd"

        android:background="?android:selectableItemBackground"

        android:contentDescription="@string/settings_button"

        android:scaleType="center"

        android:src="@drawable/ic_settings_outline_accent" />

        android:src="@drawable/ic_settings_outline_accent"

        style="@style/SettingsButtonPreferenceWidgetButton" />



</LinearLayout>

res/values/overlayable.xml

+20 −0
Original line number Diff line number Diff line
@@ -142,6 +142,26 @@ 
            <item type="style" name="PermissionUsageDialogItemIconsContainer" />

            <!-- END ONGOING USAGE DIALOG -->



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

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

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

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

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



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

            <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 -->



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

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

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

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



            <!-- START SETTINGSLIB BARCHARTPREFERENCE -->

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

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

res/values/styles.xml

+95 −0
Original line number Diff line number Diff line
@@ -626,4 +626,99 @@ 


    <!-- END ONGOING USAGE DIALOG -->



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



    <style name="RequestRoleTitle">

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

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

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

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

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

    </style>



    <style name="RequestRoleTitleIcon">

        <item name="android:layout_width">32dp</item>

        <item name="android:layout_height">32dp</item>

    </style>



    <style name="RequestRoleTitleText"

           parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">

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

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

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

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

    </style>



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



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



    <style name="RequestRoleItem">

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

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

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

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

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

    </style>



    <style name="RequestRoleItemIcon">

        <item name="android:layout_width">32dp</item>

        <item name="android:layout_height">32dp</item>

    </style>



    <style name="RequestRoleItemTitleLayout">

        <item name="android:layout_width">0dp</item>

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

        <item name="android:layout_weight">1</item>

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

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

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

    </style>



    <style name="RequestRoleItemTitleText">

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

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

        <item name="android:textAppearance">?android:textAppearanceListItem</item>

        <item name="android:textColor">?android:textColorAlertDialogListItem</item>

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

        <item name="android:ellipsize">marquee</item>

    </style>



    <style name="RequestRoleItemSubtitleText">

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

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

        <item name="android:textAppearance">?android:textAppearanceListItemSecondary</item>

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

    </style>



    <style name="RequestRoleItemRadioButton">

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

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

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

    </style>



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



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



    <style name="SettingsButtonPreferenceWidgetDivider">

        <item name="android:layout_width">1dp</item>

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

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

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

        <item name="android:background">?android:listDivider</item>

    </style>



    <style name="SettingsButtonPreferenceWidgetButton">

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

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

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

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

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

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

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

    </style>



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



</resources>