Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert^2 "feat(MultiFingerMultiTap): Add tutorial for two finger triple tap"

Browse Source 
This reverts commit dc9ad88a26.

Reason for revert: The issue be fixed on b/308228560. Our change wasn't the actual culprit. 

Change-Id: Ie023b10d70db680799f30c8bc9346cc65716b550
This commit is contained in:
Jean Chen
2023-10-31 08:43:39 +00:00
committed by Android (Google) Code Review
parent dc9ad88a26
commit 6a50a06f76
3 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
View File

@@ -54,6 +54,7 @@ import androidx.core.widget.TextViewCompat;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import com.android.server.accessibility.Flags;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.widget.LottieColorUtils;
@@ -411,6 +412,23 @@ public final class AccessibilityGestureNavigationTutorial {
return new TutorialPage(type, title, image, indicatorIcon, instruction);
}
private static TutorialPage createTwoFingerTripleTapTutorialPage(@NonNull Context context) {
// TODO(b/308088945): Update tutorial string and image when UX provides them
final int type = UserShortcutType.TWOFINGERTRIPLETAP;
final CharSequence title =
context.getText(R.string.accessibility_tutorial_dialog_title_two_finger_triple);
final View image =
createIllustrationViewWithImageRawResource(context,
R.raw.a11y_shortcut_type_triple_tap);
final CharSequence instruction =
context.getText(R.string.accessibility_tutorial_dialog_message_two_finger_triple);
final ImageView indicatorIcon =
createImageView(context, R.drawable.ic_accessibility_page_indicator);
indicatorIcon.setEnabled(false);
return new TutorialPage(type, title, image, indicatorIcon, instruction);
}
@VisibleForTesting
static List<TutorialPage> createShortcutTutorialPages(@NonNull Context context,
int shortcutTypes) {
@@ -427,6 +445,13 @@ public final class AccessibilityGestureNavigationTutorial {
tutorialPages.add(createTripleTapTutorialPage(context));
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
if ((shortcutTypes & UserShortcutType.TWOFINGERTRIPLETAP)
== UserShortcutType.TWOFINGERTRIPLETAP) {
tutorialPages.add(createTwoFingerTripleTapTutorialPage(context));
}
}
return tutorialPages;
}