diff --git a/res/values/strings.xml b/res/values/strings.xml
index b883e7aad19..8a6c7339e6b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4877,6 +4877,8 @@
Got it
The Accessibility button is set to %1$s. To use magnification, touch & hold the Accessibility button, then select magnification.
+
+ The accessibility gesture is set to the %1$s. To use magnification, swipe up with two fingers from the bottom of the screen and hold. Then select magnification.
Volume key shortcut
diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
index c3cb34fbcbc..b96d2b76725 100644
--- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
@@ -16,6 +16,8 @@
package com.android.settings.accessibility;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
+
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
@@ -132,9 +134,10 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {
if (info.getComponentName().equals(assignedComponentName)) {
final CharSequence assignedServiceName = info.getResolveInfo().loadLabel(
context.getPackageManager());
- return context.getString(
- R.string.accessibility_screen_magnification_navbar_configuration_warning,
- assignedServiceName);
+ final int messageId = isGestureNavigateEnabled(context)
+ ? R.string.accessibility_screen_magnification_gesture_navigation_warning
+ : R.string.accessibility_screen_magnification_navbar_configuration_warning;
+ return context.getString(messageId, assignedServiceName);
}
}
}
@@ -158,6 +161,12 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {
return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar);
}
+ private static boolean isGestureNavigateEnabled(Context context) {
+ return context.getResources().getInteger(
+ com.android.internal.R.integer.config_navBarInteractionMode)
+ == NAV_BAR_MODE_GESTURAL;
+ }
+
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
@@ -173,4 +182,4 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {
return isApplicable(context.getResources());
}
};
-}
+}
\ No newline at end of file