From 880e1898fcffc32787b3daefac9793d4a35b9649 Mon Sep 17 00:00:00 2001 From: menghanli Date: Wed, 23 Jun 2021 11:43:05 +0800 Subject: [PATCH] Show one line of footer content change in Accessibility button page when the user is in gesture nav. Bug: 190563948 Bug: 191733125 Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonFooterPreferenceControllerTest Change-Id: I13ce0b3331835469d6eb9a6263a3a01f821814a8 --- res/values/strings.xml | 4 +- res/xml/accessibility_button_settings.xml | 1 - ...ilityButtonFooterPreferenceController.java | 7 ++ ...yButtonFooterPreferenceControllerTest.java | 79 +++++++++++++++++++ 4 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index ef0a0517584..aa863fc685b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5397,8 +5397,8 @@ Using the accessibility button. The gesture isn\u2019t available with 3-button navigation. Quickly access accessibility features - - Quickly access accessibility features from any screen. \n\nTo get started, go to accessibility settings and select a feature. Tap on the shortcut and select the accessibility button or gesture. + + Quickly access accessibility features from any screen.\n\nTo get started, go to accessibility settings and select a feature. Tap on the shortcut and select the accessibility button.\n\nTo use the accessibility button in the navigation bar instead, switch to 2-button navigation or 3-button navigation. Quickly access accessibility features from any screen. \n\nTo get started, go to accessibility settings and select a feature. Tap on the shortcut and select the accessibility button. diff --git a/res/xml/accessibility_button_settings.xml b/res/xml/accessibility_button_settings.xml index 02b1c7d4693..78d13ab1a8d 100644 --- a/res/xml/accessibility_button_settings.xml +++ b/res/xml/accessibility_button_settings.xml @@ -61,7 +61,6 @@