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

Commit 5fe2cdcf authored by jasonwshsu's avatar jasonwshsu Committed by Jason Hsu
Browse files

Update the dialog content for accessibility floating menu 

Accessibility gesture is replaced by accessibility floating menu, related content in edit shortcut dialog and tutorial dialog are updated in this changelist.

Bug: 173990914
Test: manual test
Change-Id: Ie529fa8a1f8ee87ca1ec5611b35675cdfd762165
parent 8131f657

res/drawable/accessibility_shortcut_type_software_floating.xml

0 → 100644
+68 −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"

    android:width="180dp"

    android:height="180dp"

    android:viewportWidth="180"

    android:viewportHeight="180">

  <path

      android:pathData="M90,90m-89,0a89,89 0,1 1,178 0a89,89 0,1 1,-178 0"

      android:strokeWidth="2"

      android:fillColor="#00000000"

      android:strokeColor="#ECEEEF"/>

  <group>

    <clip-path

        android:pathData="M90,90m-87,0a87,87 0,1 1,174 0a87,87 0,1 1,-174 0"/>

    <path

        android:pathData="M35.4,-70.9L144.6,-70.9A6.3,6.3 0,0 1,150.9 -64.6L150.9,137.6A6.3,6.3 0,0 1,144.6 143.9L35.4,143.9A6.3,6.3 0,0 1,29.1 137.6L29.1,-64.6A6.3,6.3 0,0 1,35.4 -70.9z"

        android:strokeWidth="1.8"

        android:fillColor="#F2F3F4"

        android:strokeColor="#DADCE0"/>

    <group>

      <clip-path

          android:pathData="M35.4,-70.9L144.6,-70.9A6.3,6.3 0,0 1,150.9 -64.6L150.9,137.6A6.3,6.3 0,0 1,144.6 143.9L35.4,143.9A6.3,6.3 0,0 1,29.1 137.6L29.1,-64.6A6.3,6.3 0,0 1,35.4 -70.9z"/>

      <path

          android:pathData="M40.4,-69L140.6,-69A5.4,5.4 0,0 1,146 -63.6L146,132.6A5.4,5.4 0,0 1,140.6 138L40.4,138A5.4,5.4 0,0 1,35 132.6L35,-63.6A5.4,5.4 0,0 1,40.4 -69z"

          android:fillColor="#ffffff"/>

      <group>

        <clip-path

            android:pathData="M40.4,-69L140.6,-69A5.4,5.4 0,0 1,146 -63.6L146,132.6A5.4,5.4 0,0 1,140.6 138L40.4,138A5.4,5.4 0,0 1,35 132.6L35,-63.6A5.4,5.4 0,0 1,40.4 -69z"/>

        <path

            android:strokeWidth="1"

            android:pathData="M132,90.5L158,90.5A14.5,14.5 0,0 1,172.5 105L172.5,105A14.5,14.5 0,0 1,158 119.5L132,119.5A14.5,14.5 0,0 1,117.5 105L117.5,105A14.5,14.5 0,0 1,132 90.5z"

            android:fillColor="#ffffff"

            android:strokeColor="#DADCE0"/>

        <path

            android:pathData="M132.4,105m-11.2,0a11.2,11.2 0,1 1,22.4 0a11.2,11.2 0,1 1,-22.4 0"

            android:fillColor="#80868B"/>

        <path

            android:pathData="M133.467,100.733C133.467,101.32 132.987,101.8 132.4,101.8C131.813,101.8 131.333,101.32 131.333,100.733C131.333,100.147 131.813,99.666 132.4,99.666C132.987,99.666 133.467,100.147 133.467,100.733ZM132.4,102.333C133.909,102.333 135.541,102.173 136.933,101.8L137.2,102.867C136.208,103.133 135.067,103.309 134,103.4V110.333H132.933V107.133H131.867V110.333H130.8V103.4C129.733,103.309 128.592,103.133 127.6,102.867L127.867,101.8C129.259,102.173 130.891,102.333 132.4,102.333Z"

            android:fillColor="#ffffff"

            android:fillType="evenOdd"/>

        <path

            android:pathData="M121.719,120.653C121.719,121.29 121.198,121.81 120.562,121.81C119.927,121.81 119.406,121.29 119.406,120.653C119.406,120.017 119.927,119.497 120.562,119.497C121.198,119.497 121.719,120.017 121.719,120.653ZM120.562,122.533C122.38,122.533 124.346,122.316 126.023,121.81L126.344,123.255C125.149,123.617 123.774,123.855 122.49,123.978V133.374H121.205V129.038H119.92V133.374H118.635V123.978C117.351,123.855 115.976,123.617 114.781,123.255L115.102,121.81C116.779,122.316 118.745,122.533 120.562,122.533Z"

            android:fillColor="#ffffff"

            android:fillType="evenOdd"/>

        <group>

          <clip-path

              android:pathData="M121.719,120.653C121.719,121.29 121.198,121.81 120.562,121.81C119.927,121.81 119.406,121.29 119.406,120.653C119.406,120.017 119.927,119.497 120.562,119.497C121.198,119.497 121.719,120.017 121.719,120.653ZM120.562,122.533C122.38,122.533 124.346,122.316 126.023,121.81L126.344,123.255C125.149,123.617 123.774,123.855 122.49,123.978V133.374H121.205V129.038H119.92V133.374H118.635V123.978C117.351,123.855 115.976,123.617 114.781,123.255L115.102,121.81C116.779,122.316 118.745,122.533 120.562,122.533Z"

              android:fillType="evenOdd"/>

        </group>

      </group>

    </group>

  </group>

</vector>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -5102,6 +5102,8 @@ 
    <string name="accessibility_tutorial_dialog_title_gesture_settings">Use new accessibility gesture</string>

    <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using the 3-button nav bar. [CHAR LIMIT=NONE] -->

    <string name="accessibility_tutorial_dialog_message_button">To use this feature, tap the accessibility button <xliff:g id="accessibility_icon" example="[Icon]">%s</xliff:g> on the bottom of your screen.\n\nTo switch between features, touch &amp; hold the accessibility button.</string>

    <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using the accessibility floating button. [CHAR LIMIT=100] -->

    <string name="accessibility_tutorial_dialog_message_floating_button">To use this feature, tap the accessibility button on your screen.</string>

    <!-- Instruction for the accessibility tutorial dialog in accessibility service with volume keys. [CHAR LIMIT=100] -->

    <string name="accessibility_tutorial_dialog_message_volume">To use this feature, press &amp; hold both volume keys.</string>

    <!-- Instruction for the accessibility tutorial dialog in accessibility service with triple tap. [CHAR LIMIT=100] -->
@@ -5132,6 +5134,8 @@ 
    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture">Swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold.</string>

    <!-- Summary for software shortcut in gesture mode in accessibility edit shortcut dialog while using gesture navigation and touch exploration are enabled [CHAR LIMIT=NONE] -->

    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback">Swipe up from the bottom of the screen with 3 fingers.\n\nTo switch between features, swipe up with 3 fingers and hold.</string>

    <!-- Summary for software shortcut in accessibility edit shortcut dialog when user had enabled the accessibility floating button mode (Floating over other apps). [CHAR LIMIT=NONE] -->

    <string name="accessibility_shortcut_edit_dialog_summary_software_floating"><annotation id="link">Customize accessibility button</annotation></string>

    <!-- Title for hardware shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->

    <string name="accessibility_shortcut_edit_dialog_title_hardware">Hold volume keys</string>

    <!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] -->

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

+29 −27
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.accessibility;



import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.DialogInterface;

import android.content.res.TypedArray;
@@ -24,6 +25,7 @@ import android.graphics.drawable.Drawable; 
import android.text.Spannable;

import android.text.SpannableString;

import android.text.TextUtils;

import android.text.method.LinkMovementMethod;

import android.text.style.ImageSpan;

import android.view.LayoutInflater;

import android.view.View;
@@ -40,6 +42,8 @@ import androidx.appcompat.app.AlertDialog; 
import androidx.core.content.ContextCompat;



import com.android.settings.R;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.utils.AnnotationSpan;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -253,6 +257,8 @@ public class AccessibilityEditDialogUtils { 
            summary.setVisibility(View.GONE);

        } else {

            summary.setText(summaryText);

            summary.setMovementMethod(LinkMovementMethod.getInstance());

            summary.setFocusable(false);

        }

        final ImageView image = view.findViewById(R.id.image);

        image.setImageResource(imageResId);
@@ -260,10 +266,13 @@ public class AccessibilityEditDialogUtils { 


    private static void initSoftwareShortcut(Context context, View view) {

        final View dialogView = view.findViewById(R.id.software_shortcut);

        final CharSequence title = context.getText(

                R.string.accessibility_shortcut_edit_dialog_title_software);

        final TextView summary = dialogView.findViewById(R.id.summary);

        final int lineHeight = summary.getLineHeight();

        setupShortcutWidget(dialogView, retrieveTitle(context),

                retrieveSummary(context, lineHeight), retrieveImageResId(context));



        setupShortcutWidget(dialogView, title, retrieveSummary(context, lineHeight),

                retrieveImageResId(context));

    }



    private static void initHardwareShortcut(Context context, View view) {
@@ -297,35 +306,28 @@ public class AccessibilityEditDialogUtils { 
        });

    }



    private static CharSequence retrieveTitle(Context context) {

        int resId = R.string.accessibility_shortcut_edit_dialog_title_software;

        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {

            resId = AccessibilityUtil.isTouchExploreEnabled(context)

                    ? R.string.accessibility_shortcut_edit_dialog_title_software_gesture_talkback

                    : R.string.accessibility_shortcut_edit_dialog_title_software_gesture;

        }

        return context.getText(resId);

    }



    private static CharSequence retrieveSummary(Context context, int lineHeight) {

        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {

            final int resId = AccessibilityUtil.isTouchExploreEnabled(context)

                    ? R.string.accessibility_shortcut_edit_dialog_summary_software_gesture_talkback

                    : R.string.accessibility_shortcut_edit_dialog_summary_software_gesture;

            return context.getText(resId);

        }

        return getSummaryStringWithIcon(context, lineHeight);

        return AccessibilityUtil.isFloatingMenuEnabled(context)

                ? getSummaryStringWithLink(context) : getSummaryStringWithIcon(context, lineHeight);

    }



    private static int retrieveImageResId(Context context) {

        // TODO(b/142531156): Use vector drawable instead of temporal png file to avoid distorted.

        int resId = R.drawable.accessibility_shortcut_type_software;

        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {

            resId = AccessibilityUtil.isTouchExploreEnabled(context)

                    ? R.drawable.accessibility_shortcut_type_software_gesture_talkback

                    : R.drawable.accessibility_shortcut_type_software_gesture;

        return AccessibilityUtil.isFloatingMenuEnabled(context)

                ? R.drawable.accessibility_shortcut_type_software_floating

                : R.drawable.accessibility_shortcut_type_software;

    }

        return resId;



    private static CharSequence getSummaryStringWithLink(Context context) {

        final View.OnClickListener linkListener = v -> new SubSettingLauncher(context)

                .setDestination(AccessibilityButtonFragment.class.getName())

                .setSourceMetricsCategory(

                        SettingsEnums.SWITCH_SHORTCUT_DIALOG_ACCESSIBILITY_BUTTON_SETTINGS)

                .launch();

        final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(

                AnnotationSpan.LinkInfo.DEFAULT_ANNOTATION, linkListener);



        return AnnotationSpan.linkify(context.getText(

                R.string.accessibility_shortcut_edit_dialog_summary_software_floating), linkInfo);

    }



    private static SpannableString getSummaryStringWithIcon(Context context, int lineHeight) {

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

+9 −33
Original line number Diff line number Diff line
@@ -333,7 +333,8 @@ public final class AccessibilityGestureNavigationTutorial { 
    }



    private static TutorialPage createSoftwareTutorialPage(@NonNull Context context) {

        final CharSequence title = getSoftwareTitle(context);

        final CharSequence title = context.getText(

                R.string.accessibility_tutorial_dialog_title_button);

        final ImageView image = createSoftwareImage(context);

        final CharSequence instruction = getSoftwareInstruction(context);

        final ImageView indicatorIcon =
@@ -390,44 +391,19 @@ public final class AccessibilityGestureNavigationTutorial { 
        return tutorialPages;

    }



    private static CharSequence getSoftwareTitle(Context context) {

        final boolean isGestureNavigationEnabled =

                AccessibilityUtil.isGestureNavigateEnabled(context);

        final int resId = isGestureNavigationEnabled

                ? R.string.accessibility_tutorial_dialog_title_gesture

                : R.string.accessibility_tutorial_dialog_title_button;



        return context.getText(resId);

    }



    private static ImageView createSoftwareImage(Context context) {

        int resId = R.drawable.accessibility_shortcut_type_software;

        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {

            resId = AccessibilityUtil.isTouchExploreEnabled(context)

                    ? R.drawable.accessibility_shortcut_type_software_gesture_talkback

                    : R.drawable.accessibility_shortcut_type_software_gesture;

        }

        final int resId = AccessibilityUtil.isFloatingMenuEnabled(context)

                ? R.drawable.accessibility_shortcut_type_software_floating

                : R.drawable.accessibility_shortcut_type_software;



        return createImageView(context, resId);

    }



    private static CharSequence getSoftwareInstruction(Context context) {

        final boolean isGestureNavigateEnabled =

                AccessibilityUtil.isGestureNavigateEnabled(context);

        final boolean isTouchExploreEnabled = AccessibilityUtil.isTouchExploreEnabled(context);

        int resId = R.string.accessibility_tutorial_dialog_message_button;

        if (isGestureNavigateEnabled) {

            resId = isTouchExploreEnabled

                    ? R.string.accessibility_tutorial_dialog_message_gesture_talkback

                    : R.string.accessibility_tutorial_dialog_message_gesture;

        }



        CharSequence text = context.getText(resId);

        if (resId == R.string.accessibility_tutorial_dialog_message_button) {

            text = getSoftwareInstructionWithIcon(context, text);

        }



        return text;

        return AccessibilityUtil.isFloatingMenuEnabled(context)

                ? context.getText(R.string.accessibility_tutorial_dialog_message_floating_button)

                : getSoftwareInstructionWithIcon(context,

                        context.getText(R.string.accessibility_tutorial_dialog_message_button));

    }



    private static CharSequence getSoftwareInstructionWithIcon(Context context, CharSequence text) {

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

+6 −10
Original line number Diff line number Diff line
@@ -608,19 +608,15 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 


        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,

                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);

        int resId = R.string.accessibility_shortcut_edit_summary_software;

        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {

            resId = AccessibilityUtil.isTouchExploreEnabled(context)

                    ? R.string.accessibility_shortcut_edit_dialog_title_software_gesture_talkback

                    : R.string.accessibility_shortcut_edit_dialog_title_software_gesture;

        }

        final CharSequence softwareTitle = context.getText(resId);



        List<CharSequence> list = new ArrayList<>();

        if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {

        final List<CharSequence> list = new ArrayList<>();

        final CharSequence softwareTitle = context.getText(

                R.string.accessibility_shortcut_edit_summary_software);



        if (hasShortcutType(shortcutTypes, UserShortcutType.SOFTWARE)) {

            list.add(softwareTitle);

        }

        if ((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE) {

        if (hasShortcutType(shortcutTypes, UserShortcutType.HARDWARE)) {

            final CharSequence hardwareTitle = context.getText(

                    R.string.accessibility_shortcut_hardware_keyword);

            list.add(hardwareTitle);