Merge changes I98bc7a00,I4b3fed5e into qt-dev

* changes:
  Make title_summary_image_view themeable
  Make the accessibility services dialogs themeable

3 files changed, 145 insertions, 14 deletions

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 038b3ae4..ecdf6dc6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -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>
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index 026e6d25..59dfd210 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -114,6 +114,10 @@
             <item type="style" name="PreferenceUsageWidgetFrame" />
             <!-- END PREFERENCE USAGE -->
 
+            <!-- START TITLE SUMMARY IMAGE VIEW -->
+            <item type="style" name="TitleSummaryImageViewIcon" />
+            <!-- END TITLE SUMMARY IMAGE VIEW -->
+
             <!-- START IMAGE VIEW -->
             <item type="style" name="ImageView" />
             <item type="style" name="ImageViewIcon" />
@@ -127,7 +131,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" />
@@ -162,6 +165,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" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index da9b3bb2..af4954e1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -510,6 +510,17 @@
 
     <!-- END PREFERENCE USAGE -->
 
+    <!-- START TITLE SUMMARY IMAGE VIEW -->
+
+    <style name="TitleSummaryImageViewIcon">
+        <item name="android:layout_width">16dp</item>
+        <item name="android:layout_height">16dp</item>
+        <item name="android:layout_marginEnd">8dp</item>
+        <item name="android:tint">?android:attr/colorControlNormal</item>
+    </style>
+
+    <!-- END TITLE SUMMARY IMAGE VIEW -->
+
     <!-- START IMAGE VIEW -->
 
     <style name="ImageView">
@@ -558,16 +569,10 @@
         <item name="android:layout_marginBottom">18dp</item>
     </style>
 
-    <style name="PermissionUsageDialogItemsContainerLayout">
-        <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:layout_marginBottom">24dp</item>
-    </style>
-
     <style name="PermissionUsageDialogItemsContainer">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">24dp</item>
         <item name="android:orientation">vertical</item>
         <item name="android:gravity">start</item>
     </style>
@@ -735,4 +740,113 @@
 
     <!-- END SETTINGS BUTTON PREFERENCE WIDGET -->
 
+    <!-- START ACCESSIBILITY SERVICE DIALOG -->
+
+    <style name="AccessibilityServiceDialogScrollView">
+        <item name="android:fillViewport">true</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="AccessibilityServiceDialog">
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogHeader">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">18dp</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogHeaderIcon">
+        <item name="android:layout_height">32dp</item>
+        <item name="android:layout_width">32dp</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogTitle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Title</item>
+        <item name="android:layout_marginStart">24dp</item>
+        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:layout_marginTop">18dp</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogItemsContainer">
+        <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">start</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogMiddleText">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
+        <item name="android:textDirection">locale</item>
+        <item name="android:layout_marginStart">24dp</item>
+        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:layout_marginTop">18dp</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogBottomText">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:layout_marginStart">24dp</item>
+        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:layout_marginTop">24dp</item>
+        <item name="android:layout_marginBottom">24dp</item>
+    </style>
+
+    <!-- END ACCESSIBILITY SERVICE DIALOG -->
+
+    <!-- START ACCESSIBILITY SERVICE DIALOG ITEM -->
+
+    <style name="AccessibilityServiceDialogItem">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginStart">24dp</item>
+        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogItemIcon">
+        <item name="android:layout_height">32dp</item>
+        <item name="android:layout_width">32dp</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:layout_gravity">start|center_vertical</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogItemDescription">
+        <item name="android:layout_width">wrap_content</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:orientation">vertical</item>
+        <item name="android:paddingTop">18dp</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogItemTitle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
+        <item name="android:ellipsize">marquee</item>
+    </style>
+
+    <style name="AccessibilityServiceDialogItemSummary">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceListItemSecondary</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
+    <!-- END ACCESSIBILITY SERVICE DIALOG ITEM -->
+
 </resources>