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

Commit 8547eb19 authored by menghanli's avatar menghanli
Browse files

fix(tablet): fix a11y button gesture assets to match new fancy ones on other a11y preferences 

Fix: 269717670
Test: 1. Go to Settings > Accessibility shortcuts > accessibility button & gesture.
2. Observe The Gesture's picture.
3. Go to any other accessibility's shortcut.
4. Observe the picture of the Use accessibility gesture. #2 should look like #4

Change-Id: I11f64648412c9795383d356e80d9dd499095f53b
parent aa189347

res/drawable-night/accessibility_gesture_navigation_three_finger_preview_tablet.xml

0 → 100644
+80 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    xmlns:aapt="http://schemas.android.com/aapt"

    android:width="412dp"

    android:height="300dp"

    android:viewportWidth="412"

    android:viewportHeight="300">

  <group>

    <clip-path

        android:pathData="M0,0h412v300h-412z"/>

    <path

        android:pathData="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"

        android:fillColor="#80868B"/>

    <path

        android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"

        android:strokeWidth="2.5"

        android:fillColor="#000000"

        android:strokeColor="#80868B"/>

    <path

        android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"

        android:fillColor="#80868B"/>

    <path

        android:pathData="M176.84,188.94C173.14,188.94 170.24,191.94 170.24,195.54V220.14H183.54V195.54C183.54,191.94 180.54,188.94 176.84,188.94Z">

      <aapt:attr name="android:fillColor">

        <gradient

            android:startX="176.89"

            android:startY="220.23"

            android:endX="176.89"

            android:endY="188.97"

            android:type="linear">

          <item android:offset="0" android:color="#00669DF6"/>

          <item android:offset="0.69" android:color="#FF669DF6"/>

        </gradient>

      </aapt:attr>

    </path>

    <path

        android:pathData="M206.14,188.94C202.44,188.94 199.54,191.94 199.54,195.54V220.14H212.84V195.54C212.74,191.94 209.84,188.94 206.14,188.94Z">

      <aapt:attr name="android:fillColor">

        <gradient

            android:startX="206.19"

            android:startY="220.23"

            android:endX="206.19"

            android:endY="188.97"

            android:type="linear">

          <item android:offset="0" android:color="#00669DF6"/>

          <item android:offset="0.69" android:color="#FF669DF6"/>

        </gradient>

      </aapt:attr>

    </path>

    <path

        android:pathData="M235.44,188.94C231.74,188.94 228.84,191.94 228.84,195.54V220.14H242.14V195.54C242.04,191.94 239.14,188.94 235.44,188.94Z">

      <aapt:attr name="android:fillColor">

        <gradient

            android:startX="235.49"

            android:startY="220.23"

            android:endX="235.49"

            android:endY="188.97"

            android:type="linear">

          <item android:offset="0" android:color="#00669DF6"/>

          <item android:offset="0.69" android:color="#FF669DF6"/>

        </gradient>

      </aapt:attr>

    </path>

  </group>

</vector>

res/drawable-night/accessibility_gesture_navigation_two_finger_preview_tablet.xml

0 → 100644
+66 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    xmlns:aapt="http://schemas.android.com/aapt"

    android:width="412dp"

    android:height="300dp"

    android:viewportWidth="412"

    android:viewportHeight="300">

  <group>

    <clip-path

        android:pathData="M0,0h412v300h-412z"/>

    <path

        android:pathData="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"

        android:fillColor="#80868B"/>

    <path

        android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"

        android:strokeWidth="2.5"

        android:fillColor="#000000"

        android:strokeColor="#80868B"/>

    <path

        android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"

        android:fillColor="#80868B"/>

    <path

        android:pathData="M188.15,188.94C184.45,188.94 181.55,191.94 181.55,195.54V220.14H194.85V195.54C194.85,191.94 191.85,188.94 188.15,188.94Z">

      <aapt:attr name="android:fillColor">

        <gradient

            android:startX="188.2"

            android:startY="220.23"

            android:endX="188.2"

            android:endY="188.97"

            android:type="linear">

          <item android:offset="0" android:color="#00669DF6"/>

          <item android:offset="0.69" android:color="#FF669DF6"/>

        </gradient>

      </aapt:attr>

    </path>

    <path

        android:pathData="M222.95,188.94C219.25,188.94 216.35,191.94 216.35,195.54V220.14H229.55V195.54C229.55,191.94 226.65,188.94 222.95,188.94Z">

      <aapt:attr name="android:fillColor">

        <gradient

            android:startX="222.95"

            android:startY="220.23"

            android:endX="222.95"

            android:endY="188.97"

            android:type="linear">

          <item android:offset="0" android:color="#00669DF6"/>

          <item android:offset="0.69" android:color="#FF669DF6"/>

        </gradient>

      </aapt:attr>

    </path>

  </group>

</vector>

res/drawable-night/accessibility_shortcut_type_software_gesture_tablet.xml

+40 −44
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    xmlns:aapt="http://schemas.android.com/aapt"

    android:width="412dp"

    android:height="300dp"

    android:viewportWidth="412"
@@ -19,32 +34,13 @@ 
            android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"

            android:fillColor="#80868B"/>

        <path

        android:pathData="M188.15,188.94C184.45,188.94 181.55,191.94 181.55,195.54V220.14H194.85V195.54C194.85,191.94 191.85,188.94 188.15,188.94Z">

      <aapt:attr name="android:fillColor">

        <gradient 

            android:startX="188.2"

            android:startY="220.23"

            android:endX="188.2"

            android:endY="188.97"

            android:type="linear">

          <item android:offset="0" android:color="#00669DF6"/>

          <item android:offset="0.69" android:color="#FF669DF6"/>

        </gradient>

      </aapt:attr>

    </path>

            android:pathData="M170.9,232.14L241.9,232.14A2,2 0,0 1,243.9 234.14L243.9,234.14A2,2 0,0 1,241.9 236.14L170.9,236.14A2,2 0,0 1,168.9 234.14L168.9,234.14A2,2 0,0 1,170.9 232.14z"

            android:fillColor="#80868B"/>

        <path

            android:pathData="M198.35,229.14V217.74H203.25L196.35,205.54L189.45,217.74H194.35V229.14C192.45,229.94 191.15,231.74 191.15,233.94C191.15,236.84 193.45,239.14 196.35,239.14C199.25,239.14 201.55,236.84 201.55,233.94C201.55,231.84 200.15,229.94 198.35,229.14Z"

            android:fillColor="#669DF6"/>

        <path

        android:pathData="M222.95,188.94C219.25,188.94 216.35,191.94 216.35,195.54V220.14H229.55V195.54C229.55,191.94 226.65,188.94 222.95,188.94Z">

      <aapt:attr name="android:fillColor">

        <gradient 

            android:startX="222.95"

            android:startY="220.23"

            android:endX="222.95"

            android:endY="188.97"

            android:type="linear">

          <item android:offset="0" android:color="#00669DF6"/>

          <item android:offset="0.69" android:color="#FF669DF6"/>

        </gradient>

      </aapt:attr>

    </path>

            android:pathData="M217.65,229.14V217.74H222.55L215.65,205.54L208.75,217.74H213.65V229.14C211.75,229.94 210.45,231.74 210.45,233.94C210.45,236.84 212.75,239.14 215.65,239.14C218.55,239.14 220.85,236.84 220.85,233.94C220.85,231.84 219.55,229.94 217.65,229.14Z"

            android:fillColor="#669DF6"/>

    </group>

</vector>