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

Commit 5af9c641 authored by menghanli's avatar menghanli
Browse files

[Material Next] Accessibility gesture tutorial dialog 

Problem: The dialog does not follow the Material Next guideline
Proposal:
1. Apply the dynamic color by removing SettingsTutorialDialogWrapperActivity which set extra theme
2. Hanlde the recreate case if shows the dialog directly
3. Update new Illustration in Pixel Lottie asset

Bug: 195980595
Test: Manual test
Change-Id: Ib6267128bbe5522ac8720c15fc2720c9a78f8671
parent 4cddfd2b

AndroidManifest.xml

+0 −5
Original line number Diff line number Diff line
@@ -1694,11 +1694,6 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name=".SettingsTutorialDialogWrapperActivity"

            android:theme="@style/Theme.AlertDialog"

            android:exported="false"/>



        <activity

            android:name="Settings$TextToSpeechSettingsActivity"

            android:exported="true"

res/drawable-night/illustration_accessibility_gesture_three_finger.xml

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

<!-- Copyright (C) 2021 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">

  <path

      android:fillColor="#FF000000"

      android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>

  <path

      android:pathData="M274.9,97.7v-9.5c0,-1.3 -1.1,-2.4 -2.4,-2.4V35.9c0,-6.6 -5.3,-11.9 -11.9,-11.9H151.3c-6.6,0 -11.9,5.3 -11.9,11.9v228.2c0,6.6 5.3,11.9 11.9,11.9h109.4c6.6,0 11.9,-5.3 11.9,-11.9V147.6c1.3,0 2.4,-1.1 2.4,-2.4v-23.8c0,-1.3 -1.1,-2.4 -2.4,-2.4v-19C273.9,100.1 274.9,99 274.9,97.7zM270.2,264.1c0,5.2 -4.3,9.5 -9.5,9.5H151.3c-5.2,0 -9.5,-4.3 -9.5,-9.5V35.9c0,-5.2 4.3,-9.5 9.5,-9.5h109.4c5.2,0 9.5,4.3 9.5,9.5V264.1z"

      android:fillColor="#80868B"/>

  <path

      android:pathData="M176.7,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C183.4,212.6 180.4,209.6 176.7,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="176.75"

          android:endY="209.6335"

          android:endX="176.75"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M206,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C212.6,212.6 209.7,209.6 206,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="206.05"

          android:endY="209.6335"

          android:endX="206.05"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M235.3,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6H242v-24.6C241.9,212.6 239,209.6 235.3,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="235.35"

          android:endY="209.6335"

          android:endX="235.35"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

</vector>

res/drawable-night/illustration_accessibility_gesture_two_finger.xml

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

<!-- Copyright (C) 2021 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">

  <path

      android:fillColor="#FF000000"

      android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>

  <path

      android:pathData="M274.9,97.7v-9.5c0,-1.3 -1.1,-2.4 -2.4,-2.4V35.9c0,-6.6 -5.3,-11.9 -11.9,-11.9H151.3c-6.6,0 -11.9,5.3 -11.9,11.9v228.2c0,6.6 5.3,11.9 11.9,11.9h109.4c6.6,0 11.9,-5.3 11.9,-11.9V147.6c1.3,0 2.4,-1.1 2.4,-2.4v-23.8c0,-1.3 -1.1,-2.4 -2.4,-2.4v-19C273.9,100.1 274.9,99 274.9,97.7zM270.2,264.1c0,5.2 -4.3,9.5 -9.5,9.5H151.3c-5.2,0 -9.5,-4.3 -9.5,-9.5V35.9c0,-5.2 4.3,-9.5 9.5,-9.5h109.4c5.2,0 9.5,4.3 9.5,9.5V264.1z"

      android:fillColor="#80868B"/>

  <path

      android:pathData="M188.6,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C195.3,212.6 192.3,209.6 188.6,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="188.65"

          android:endY="209.6335"

          android:endX="188.65"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M223.4,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6H230v-24.6C230,212.6 227.1,209.6 223.4,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="223.4"

          android:endY="209.6335"

          android:endX="223.4"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

</vector>

res/drawable/illustration_accessibility_gesture_three_finger.xml

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

<!-- Copyright (C) 2021 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">

  <path

      android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"

      android:fillColor="#FFFFFF"/>

  <path

      android:pathData="M274.9,97.7v-9.5c0,-1.3 -1.1,-2.4 -2.4,-2.4V35.9c0,-6.6 -5.3,-11.9 -11.9,-11.9H151.3c-6.6,0 -11.9,5.3 -11.9,11.9v228.2c0,6.6 5.3,11.9 11.9,11.9h109.4c6.6,0 11.9,-5.3 11.9,-11.9V147.6c1.3,0 2.4,-1.1 2.4,-2.4v-23.8c0,-1.3 -1.1,-2.4 -2.4,-2.4v-19C273.9,100.1 274.9,99 274.9,97.7zM270.2,264.1c0,5.2 -4.3,9.5 -9.5,9.5H151.3c-5.2,0 -9.5,-4.3 -9.5,-9.5V35.9c0,-5.2 4.3,-9.5 9.5,-9.5h109.4c5.2,0 9.5,4.3 9.5,9.5V264.1z"

      android:fillColor="#DADCE0"/>

  <path

      android:pathData="M176.7,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C183.4,212.6 180.4,209.6 176.7,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="176.7163"

          android:endY="209.6335"

          android:endX="176.7163"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M206,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C212.6,212.6 209.7,209.6 206,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="206"

          android:endY="209.6335"

          android:endX="206"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M235.3,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C241.9,212.6 239,209.6 235.3,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="235.2837"

          android:endY="209.6335"

          android:endX="235.2837"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

</vector>

res/drawable/illustration_accessibility_gesture_two_finger.xml

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

<!-- Copyright (C) 2021 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">

  <path

      android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"

      android:fillColor="#FFFFFF"/>

  <path

      android:pathData="M274.9,97.7v-9.5c0,-1.3 -1.1,-2.4 -2.4,-2.4V35.9c0,-6.6 -5.3,-11.9 -11.9,-11.9H151.3c-6.6,0 -11.9,5.3 -11.9,11.9v228.2c0,6.6 5.3,11.9 11.9,11.9h109.4c6.6,0 11.9,-5.3 11.9,-11.9V147.6c1.3,0 2.4,-1.1 2.4,-2.4v-23.8c0,-1.3 -1.1,-2.4 -2.4,-2.4v-19C273.9,100.1 274.9,99 274.9,97.7zM270.2,264.1c0,5.2 -4.3,9.5 -9.5,9.5H151.3c-5.2,0 -9.5,-4.3 -9.5,-9.5V35.9c0,-5.2 4.3,-9.5 9.5,-9.5h109.4c5.2,0 9.5,4.3 9.5,9.5V264.1z"

      android:fillColor="#DADCE0"/>

  <path

      android:pathData="M188.6,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C195.3,212.6 192.3,209.6 188.6,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="188.65"

          android:endY="209.6335"

          android:endX="188.65"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M223.4,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6H230v-24.6C230,212.6 227.1,209.6 223.4,209.6z">

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

      <gradient

          android:startY="240.8954"

          android:startX="223.4"

          android:endY="209.6335"

          android:endX="223.4"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

</vector>