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

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

Merge changes I98bc7a00,I4b3fed5e into qt-dev 

* changes:
  Make title_summary_image_view themeable
  Make the accessibility services dialogs themeable
parents 253f5b72 f8fcb549

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/layout/title_summary_image_view.xml

+1 −4
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 


        <com.android.packageinstaller.permission.ui.PreferenceImageView

            android:id="@+id/icon"

            android:layout_width="@dimen/preference_usage_title_summary_icon_size"

            android:layout_height="@dimen/preference_usage_title_summary_icon_size"

            android:layout_marginEnd="8dp"

            android:tint="?android:attr/colorControlNormal"/>

            style="@style/TitleSummaryImageViewIcon" />



</LinearLayout>

res/values/dimens.xml

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

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



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