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

Commit 9f2620c1 authored by Evan Severson's avatar Evan Severson
Browse files

Make the accessibility services dialogs themeable 

Also removed some unneeded layout elements for simplicity

Test: Build and test overlay
Bug: 130433836
Change-Id: I4b3fed5e73c03646c8803cd587456a646979065e
parent daaa6b79

res/layout/accessibility_service_dialog.xml

+12 −48
Original line number Diff line number Diff line
@@ -18,74 +18,38 @@ 
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

            android:fillViewport ="true"

            android:orientation="vertical">

    style="@style/AccessibilityServiceDialogScrollView" >



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical" >

        style="@style/AccessibilityServiceDialog" >



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="18dp"

            android:gravity="center" >

            style="@style/AccessibilityServiceDialogHeader">



            <ImageView

                android:id="@+id/header_icon"

                android:layout_height="@dimen/accessibility_service_dialog_app_icon_size"

                android:layout_width="@dimen/accessibility_service_dialog_app_icon_size"

                android:scaleType="fitCenter"

                android:visibility="gone" />

                style="@style/AccessibilityServiceDialogHeaderIcon" />



        </LinearLayout>



        <TextView

            android:id="@+id/title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:textAppearance="@android:style/TextAppearance.Material.Title"

            android:layout_marginStart="@dimen/accessibility_service_dialog_text_margin_sides"

            android:layout_marginEnd="@dimen/accessibility_service_dialog_text_margin_sides"

            android:layout_marginTop="18dp" />



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" >

            style="@style/AccessibilityServiceDialogTitle" />



        <LinearLayout

            android:id="@+id/items_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:gravity="start" />



        </LinearLayout>

            style="@style/AccessibilityServiceDialogItemsContainer" />



        <TextView

            android:id="@+id/middle_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

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

            android:textDirection="locale"

            android:layout_marginStart="@dimen/accessibility_service_dialog_text_margin_sides"

            android:layout_marginEnd="@dimen/accessibility_service_dialog_text_margin_sides"

            android:layout_marginTop="18dp"

            android:visibility="gone" />

            android:visibility="gone"

            style="@style/AccessibilityServiceDialogMiddleText"/>



        <TextView

            android:id="@+id/bottom_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textSize="16sp"

            android:layout_marginStart="@dimen/accessibility_service_dialog_text_margin_sides"

            android:layout_marginEnd="@dimen/accessibility_service_dialog_text_margin_sides"

            android:layout_marginTop="24dp"

            android:layout_marginBottom="24dp" />

            style="@style/AccessibilityServiceDialogBottomText"/>



    </LinearLayout>

res/layout/accessibility_service_dialog_item.xml

+7 −33
Original line number Diff line number Diff line
@@ -16,48 +16,22 @@ 
-->



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

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:layout_marginStart="@dimen/accessibility_service_dialog_text_margin_sides"

              android:layout_marginEnd="@dimen/accessibility_service_dialog_text_margin_sides"

              android:orientation="horizontal"

              android:layout_gravity="center_vertical">



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="start|center_vertical" >

    style="@style/AccessibilityServiceDialogItem">



    <ImageView

        android:id="@+id/icon"

            android:layout_height="@dimen/accessibility_service_dialog_app_icon_size"

            android:layout_width="@dimen/accessibility_service_dialog_app_icon_size"

            android:scaleType="fitCenter" />



    </LinearLayout>

        style="@style/AccessibilityServiceDialogItemIcon" />



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginStart="@dimen/accessibility_service_dialog_text_padding"

        android:orientation="vertical"

        android:paddingTop="18dp" >

        style="@style/AccessibilityServiceDialogItemDescription">



        <TextView

            android:id="@+id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:ellipsize="marquee" />

            style="@style/AccessibilityServiceDialogItemTitle" />



        <TextView

            android:id="@+id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

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

            style="@style/AccessibilityServiceDialogItemSummary" />



    </LinearLayout>

res/layout/ongoing_usage_dialog_content.xml

+2 −7
Original line number Diff line number Diff line
@@ -31,15 +31,10 @@ 
            android:id="@+id/title"

            style="@style/PermissionUsageDialogTitle"/>



        <LinearLayout

            style="@style/PermissionUsageDialogItemsContainerLayout">



        <LinearLayout

            android:id="@+id/items_container"

            style="@style/PermissionUsageDialogItemsContainer"/>



    </LinearLayout>



    </LinearLayout>



</ScrollView>

res/values/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ 


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



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

    <dimen name="accessibility_service_dialog_app_icon_size">32dp</dimen>

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



    <!-- Incident report confirmation -->

    <dimen name="incident_image_width">150dp</dimen>

    <dimen name="incident_image_height">200dp</dimen>

res/values/overlayable.xml

+20 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ 
            <item type="style" name="PermissionUsageDialogContainerScrollView" />

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

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

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

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



            <item type="style" name="PermissionUsageDialogItemContainer" />
@@ -155,6 +154,26 @@ 
            <item type="style" name="SettingsButtonPreferenceWidgetButton" />

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



            <!-- START ACCESSIBILITY SERVICE DIALOG -->

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

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

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

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

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



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

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

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

            <!-- END ACCESSIBILITY SERVICE DIALOG -->



            <!-- START ACCESSIBILITY SERVICE DIALOG ITEM -->

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

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

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

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

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

            <!-- END ACCESSIBILITY SERVICE DIALOG ITEM -->



            <!-- START SETTINGSLIB BARCHARTPREFERENCE -->

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

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