PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Material Next] Accessibility gesture tutorial dialog" into sc-v2-dev am: f7db8d7ee4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15501580

Change-Id: Ic1643d4bd000405d45d87dab6fea35402ec5041a
This commit is contained in:
Menghan Li
2021-08-20 21:40:35 +00:00
committed by Automerger Merge Worker
parent 4db621e5a1 f7db8d7ee4
commit 2fa8b94643
13 changed files with 344 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
res/drawable-night/illustration_accessibility_gesture_three_finger.xml Normal file
View File

@@ -0,0 +1,71 @@
<?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>

57
res/drawable-night/illustration_accessibility_gesture_two_finger.xml Normal file
View File

@@ -0,0 +1,57 @@
<?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>

71
res/drawable/illustration_accessibility_gesture_three_finger.xml Normal file
View File

@@ -0,0 +1,71 @@
<?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>

57
res/drawable/illustration_accessibility_gesture_two_finger.xml Normal file
View File

@@ -0,0 +1,57 @@
<?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>

14
res/layout/tutorial_dialog_launch_by_gesture_navigation_settings.xml
View File

@@ -29,11 +29,15 @@
android:orientation="vertical"
android:paddingTop="24dp">
<TextureView
android:id="@+id/gesture_tutorial_video"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_gravity="center_horizontal"/>
<ImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxHeight="@dimen/accessibility_imageview_size"
android:layout_gravity="center_horizontal"
android:adjustViewBounds="true"
android:paddingLeft="24dp"
android:paddingRight="24dp" />
<LinearLayout
android:layout_width="match_parent"

14
res/layout/tutorial_dialog_launch_service_by_gesture_navigation.xml
View File

@@ -29,11 +29,15 @@
android:orientation="vertical"
android:paddingTop="24dp">
<TextureView
android:id="@+id/gesture_tutorial_video"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_gravity="center_horizontal"/>
<ImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxHeight="@dimen/accessibility_imageview_size"
android:layout_gravity="center_horizontal"
android:adjustViewBounds="true"
android:paddingLeft="24dp"
android:paddingRight="24dp" />
<LinearLayout
android:layout_width="match_parent"

BIN
res/raw/illustration_accessibility_gesture_three_finger.mp4
View File

Binary file not shown.

BIN
res/raw/illustration_accessibility_gesture_two_finger.mp4
View File

Binary file not shown.