From c5f58eee272bfb467628879fe1801e828e16ca08 Mon Sep 17 00:00:00 2001
From: Chun-Ku Lin <chunkulin@google.com>
Date: Sat, 30 Mar 2024 00:33:00 +0000
Subject: [PATCH] Remove unneeded background and update the background color to
 reflect light/night theme

Updating the background color is a temporary workaround until we get all
the images for phone/tablet, light/night theme with correct size

Bug: 324312956
Test: manual (check the image in dark theme)
Flag: EXEMPT no flaggable resource change
Change-Id: I888e28825bdf9fd5ceffdf47386500ad6288b271
---
 res/drawable/accessibility_shortcut_type_quick_settings.xml     | 2 +-
 .../settings/accessibility/AccessibilityShortcutsTutorial.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/drawable/accessibility_shortcut_type_quick_settings.xml b/res/drawable/accessibility_shortcut_type_quick_settings.xml
index a8013476151..112250b5c6f 100644
--- a/res/drawable/accessibility_shortcut_type_quick_settings.xml
+++ b/res/drawable/accessibility_shortcut_type_quick_settings.xml
@@ -28,7 +28,7 @@
             android:pathData="M24,0L288,0A24,24 0,0 1,312 24L312,106A24,24 0,0 1,288 130L24,130A24,24 0,0 1,0 106L0,24A24,24 0,0 1,24 0z"/>
         <path
             android:pathData="M24,0L288,0A24,24 0,0 1,312 24L312,106A24,24 0,0 1,288 130L24,130A24,24 0,0 1,0 106L0,24A24,24 0,0 1,24 0z"
-            android:fillColor="#ffffff"/>
+            android:fillColor="@color/settingslib_protection_color"/>
         <path
             android:pathData="M209,139.62H210V138.62V32C210,24.82 204.18,19 197,19H115C107.82,19 102,24.82 102,32V138.62V139.62H103H209Z"
             android:strokeWidth="2"
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
index fd11ab00035..306bba75580 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
@@ -460,6 +460,8 @@ public final class AccessibilityShortcutsTutorial {
         final View image =
                 createIllustrationView(context,
                         R.drawable.a11y_shortcut_type_quick_settings);
+        // Remove the unneeded background, since the main image already includes a background
+        image.findViewById(R.id.image_background).setVisibility(GONE);
         final int numFingers = AccessibilityUtil.isTouchExploreEnabled(context) ? 2 : 1;
         Map<String, Object> arguments = new ArrayMap<>();
         arguments.put("count", numFingers);