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

Commit e9f9985e authored by menghanli's avatar menghanli Committed by Menghan Li
Browse files

Implement Tooltips widget for QS panel 

- Show the illustration and QS tile label text
- Dynamic update popup window width by content
- Support the auto close timer API

Bug: 210353709
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsTooltipWindowTest
Change-Id: I8e0d3ff4ef6a48a54ef1e80724002d2cd28d7ac3
parent 0fd50076

res/drawable/accessibility_qs_tooltips_background.xml

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

<!-- Copyright (C) 2022 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.

-->



<layer-list

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

    <item android:top="8dp">

        <shape

            android:shape="rectangle">

            <solid android:color="#BCEDDF"/>

            <corners android:radius="28dp" />

            <padding android:top="8dp" />

        </shape>

    </item>



    <item

        android:width="12dp"

        android:height="12dp"

        android:gravity="top|center_horizontal"

        android:top="-6dp">

        <rotate android:fromDegrees="45">

            <shape android:shape="rectangle">

            <solid android:color="#BCEDDF"/>

            </shape>

        </rotate>

    </item>

</layer-list>
 
 No newline at end of file

res/drawable/accessibility_qs_tooltips_illustration.xml

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

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

    android:width="181dp"

    android:height="86dp"

    android:viewportWidth="181"

    android:viewportHeight="86">

  <group>

    <clip-path

        android:pathData="M0,0h181v86h-181z"/>

    <path

        android:pathData="M17.388,4.007L162.381,4.007A13,13 0,0 1,175.381 17.007L175.381,323.989A13,13 0,0 1,162.381 336.989L17.388,336.989A13,13 0,0 1,4.388 323.989L4.388,17.007A13,13 0,0 1,17.388 4.007z"

        android:strokeWidth="6"

        android:fillColor="#ffffff"

        android:strokeColor="#EDEDED"/>

  </group>

  <path

      android:pathData="M21.548,23.014L158.221,23.014A3.078,3.078 0,0 1,161.299 26.092L161.299,26.092A3.078,3.078 0,0 1,158.221 29.17L21.548,29.17A3.078,3.078 0,0 1,18.469 26.092L18.469,26.092A3.078,3.078 0,0 1,21.548 23.014z"

      android:fillColor="#EDEDED"/>

  <path

      android:pathData="M24.469,43.946L78.959,43.946A6,6 0,0 1,84.959 49.946L84.959,68.728A6,6 0,0 1,78.959 74.728L24.469,74.728A6,6 0,0 1,18.469 68.728L18.469,49.946A6,6 0,0 1,24.469 43.946z"

      android:fillColor="#EDEDED"/>

  <path

      android:pathData="M100.81,43.946L155.299,43.946A6,6 0,0 1,161.299 49.946L161.299,68.728A6,6 0,0 1,155.299 74.728L100.81,74.728A6,6 0,0 1,94.81 68.728L94.81,49.946A6,6 0,0 1,100.81 43.946z"

      android:fillColor="#E0DCDC"/>

  <path

      android:pathData="M100.81,43.946L155.299,43.946A6,6 0,0 1,161.299 49.946L161.299,68.728A6,6 0,0 1,155.299 74.728L100.81,74.728A6,6 0,0 1,94.81 68.728L94.81,49.946A6,6 0,0 1,100.81 43.946z"

      android:fillColor="#797272"/>

  <path

      android:pathData="M104.197,55.027L110.047,55.027A2,2 0,0 1,112.047 57.027L112.047,62.878A2,2 0,0 1,110.047 64.878L104.197,64.878A2,2 0,0 1,102.197 62.878L102.197,57.027A2,2 0,0 1,104.197 55.027z"

      android:fillColor="#ffffff"/>

  <path

      android:pathData="M117.588,53.796L139.751,53.796A1.847,1.847 0,0 1,141.598 55.643L141.598,55.643A1.847,1.847 0,0 1,139.751 57.49L117.588,57.49A1.847,1.847 0,0 1,115.741 55.643L115.741,55.643A1.847,1.847 0,0 1,117.588 53.796z"

      android:fillColor="#ffffff"/>

  <path

      android:pathData="M117.588,62.415L152.064,62.415A1.847,1.847 0,0 1,153.911 64.262L153.911,64.262A1.847,1.847 0,0 1,152.064 66.109L117.588,66.109A1.847,1.847 0,0 1,115.741 64.262L115.741,64.262A1.847,1.847 0,0 1,117.588 62.415z"

      android:fillColor="#C8C5C5"/>

</vector>

res/layout/accessibility_qs_tooltips.xml

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

<!-- Copyright (C) 2022 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.

-->



<LinearLayout

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:orientation="vertical"

    android:background="@drawable/accessibility_qs_tooltips_background">



    <ImageView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingTop="@dimen/accessibility_qs_tooltips_margin_top"

        android:src="@drawable/accessibility_qs_tooltips_illustration"

        android:layout_gravity="center_horizontal"

        android:contentDescription="@null" />



    <TextView

        android:id="@+id/qs_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:padding="@dimen/accessibility_qs_tooltips_margin"

        android:textColor="@android:color/black"

        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

        android:textSize="16sp" />



</LinearLayout>

res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -296,6 +296,10 @@ 
    <dimen name="accessibility_icon_size">32dp</dimen>

    <dimen name="accessibility_icon_foreground_size">18dp</dimen>



    <!-- Accessibility quick settings tooltips -->

    <dimen name="accessibility_qs_tooltips_margin">20dp</dimen>

    <dimen name="accessibility_qs_tooltips_margin_top">27dp</dimen>



    <!-- Restricted icon in switch bar -->

    <dimen name="restricted_icon_margin_end">16dp</dimen>

    <!-- Restricted icon size in switch bar -->

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5581,6 +5581,8 @@ 
    <string name="accessibility_service_primary_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>

    <!-- Used in the accessibility service settings to open the activity. [CHAR LIMIT=NONE] -->

    <string name="accessibility_service_primary_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>

    <!-- Used in the accessibility service settings to show quick settings tooltips. [CHAR LIMIT=NONE] -->

    <string name="accessibility_service_quick_settings_tooltips_content">Swipe down to quickly turn <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g> on or off in quick settings</string>

    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->

    <string name="accessibility_daltonizer_primary_switch_title">Use color correction</string>

    <!-- Title for accessibility shortcut preference for color correction. [CHAR LIMIT=60] -->