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

Commit f18d1f60 authored by Chun-Ku Lin's avatar Chun-Ku Lin Committed by Android (Google) Code Review
Browse files

Merge "Remove unneeded background and update the background color to reflect... 

Merge "Remove unneeded background and update the background color to reflect light/night theme" into main
parents 1dbd383b c5f58eee

res/drawable/accessibility_shortcut_type_quick_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java

+2 −0
Original line number Diff line number Diff line
@@ -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);