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

Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev am: cb8be1de6f am: 3510f88fee am: eb70670e94 am: aadc3f4d35 am: c8c6d9d9f6

Browse Source 
Change-Id: Ie3f43deb37233411c4396c740f1020876243a100
This commit is contained in:
TreeHugger Robot
2020-05-06 18:57:51 +00:00
committed by Automerger Merge Worker
parent d3e5c15e7b c8c6d9d9f6
commit c1a951d8d4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -387,11 +387,11 @@ public final class AccessibilityGestureNavigationTutorial {
private static CharSequence getSoftwareTitle(Context context) { private static CharSequence getSoftwareTitle(Context context) {
final boolean isGestureNavigationEnabled = final boolean isGestureNavigationEnabled =
AccessibilityUtil.isGestureNavigateEnabled(context); AccessibilityUtil.isGestureNavigateEnabled(context);
final boolean isTouchExploreEnabled = AccessibilityUtil.isTouchExploreEnabled(context); final int resId = isGestureNavigationEnabled
? R.string.accessibility_tutorial_dialog_title_gesture
: R.string.accessibility_tutorial_dialog_title_button;
return (isGestureNavigationEnabled || isTouchExploreEnabled) return context.getText(resId);
? context.getText(R.string.accessibility_tutorial_dialog_title_gesture)
: context.getText(R.string.accessibility_tutorial_dialog_title_button);
} }
private static ImageView createSoftwareImage(Context context) { private static ImageView createSoftwareImage(Context context) {