diff --git a/res/values/strings.xml b/res/values/strings.xml index 366254f2bc7..7a57070e763 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4942,6 +4942,8 @@ When magnification is turned on, you can zoom in on your screen.\n\nTo zoom, start magnification, then tap anywhere on the screen.\n\n\nTo zoom temporarily, start magnification, then touch & hold anywhere on the screen.\n\n\nYou can’t zoom in on the keyboard or navigation bar. + + Page %1$d of %2$d Use accessibility button to open diff --git a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java index c36ad03df8a..482822e4f66 100644 --- a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java +++ b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java @@ -297,8 +297,14 @@ public final class AccessibilityGestureNavigationTutorial { final ViewPager viewPager = contentView.findViewById(R.id.view_pager); viewPager.setAdapter(new TutorialPagerAdapter(tutorialPages)); + viewPager.setContentDescription(context.getString(R.string.accessibility_tutorial_pager, + /* firstPage */ 1, tutorialPages.size())); + viewPager.setImportantForAccessibility(tutorialPages.size() > 1 + ? View.IMPORTANT_FOR_ACCESSIBILITY_YES + : View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS); viewPager.addOnPageChangeListener( - new TutorialPageChangeListener(context, title, instruction, tutorialPages)); + new TutorialPageChangeListener(context, viewPager, title, instruction, + tutorialPages)); return contentView; } @@ -479,10 +485,12 @@ public final class AccessibilityGestureNavigationTutorial { private final TextSwitcher mTitle; private final TextSwitcher mInstruction; private final List mTutorialPages; + private final ViewPager mViewPager; - TutorialPageChangeListener(Context context, ViewGroup title, ViewGroup instruction, - List tutorialPages) { + TutorialPageChangeListener(Context context, ViewPager viewPager, ViewGroup title, + ViewGroup instruction, List tutorialPages) { this.mContext = context; + this.mViewPager = viewPager; this.mTitle = (TextSwitcher) title; this.mInstruction = (TextSwitcher) instruction; this.mTutorialPages = tutorialPages; @@ -521,6 +529,11 @@ public final class AccessibilityGestureNavigationTutorial { } mTutorialPages.get(position).getIndicatorIcon().setEnabled(true); mLastTutorialPagePosition = position; + + final int currentPageNumber = position + 1; + mViewPager.setContentDescription( + mContext.getString(R.string.accessibility_tutorial_pager, + currentPageNumber, mTutorialPages.size())); } @Override