From 95aa089858e75600d6425bba0fcf1537a8196dd1 Mon Sep 17 00:00:00 2001 From: menghanli Date: Mon, 3 May 2021 13:42:24 +0800 Subject: [PATCH] Hide the accessibility location preference when gesture navigation mode enabled. If it's grey out, users don't have the alternative way in that page to enable it. According to the UX design, we should hide it if it is needed. Bug: 186776534 Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonLocationPreferenceControllerTest Change-Id: If2f659da32345938e2930fde42365cd796571068 --- .../AccessibilityButtonLocationPreferenceController.java | 2 +- ...AccessibilityButtonLocationPreferenceControllerTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceController.java index e9ed19a4b59..ed7cb27bff6 100644 --- a/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceController.java +++ b/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceController.java @@ -43,7 +43,7 @@ public class AccessibilityButtonLocationPreferenceController extends BasePrefere @Override public int getAvailabilityStatus() { return AccessibilityUtil.isGestureNavigateEnabled(mContext) - ? DISABLED_DEPENDENT_SETTING : AVAILABLE; + ? CONDITIONALLY_UNAVAILABLE : AVAILABLE; } @Override diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java index a67038a6b2d..4510d843ea9 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java @@ -22,7 +22,7 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL; import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; +import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.google.common.truth.Truth.assertThat; @@ -69,11 +69,11 @@ public class AccessibilityButtonLocationPreferenceControllerTest { } @Test - public void getAvailabilityStatus_navigationGestureEnabled_returnDisabledDependentSetting() { + public void getAvailabilityStatus_navigationGestureEnabled_returnConditionallyUnavailable() { when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode)) .thenReturn(NAV_BAR_MODE_GESTURAL); - assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING); + assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } @Test