From 648811b2b4e660d42f5231c7680e725daad1a0de Mon Sep 17 00:00:00 2001 From: jasonwshsu Date: Fri, 19 Feb 2021 16:44:57 +0800 Subject: [PATCH] Add the preference controller to control accessibility button fade preference * Opacity preference will be disabled when fade is disabled cherry picked from commit f9fdedaafe90ecaa9bcfbef7a0d7054eecd23803 Bug: 173940869 Test: atest AccessibilityButtonFadePreferenceControllerTest AccessibilityButtonOactiyPreferenceControllerTest Change-Id: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba Merged-In: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba --- res/xml/accessibility_button_settings.xml | 3 +- .../FloatingMenuFadePreferenceController.java | 116 ++++++++++++++++ ...oatingMenuOpacityPreferenceController.java | 12 +- ...atingMenuFadePreferenceControllerTest.java | 131 ++++++++++++++++++ ...ngMenuOpacityPreferenceControllerTest.java | 4 + 5 files changed, 263 insertions(+), 3 deletions(-) create mode 100644 src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/accessibility/FloatingMenuFadePreferenceControllerTest.java diff --git a/res/xml/accessibility_button_settings.xml b/res/xml/accessibility_button_settings.xml index fc91dcaeef6..5e81616bffc 100644 --- a/res/xml/accessibility_button_settings.xml +++ b/res/xml/accessibility_button_settings.xml @@ -50,7 +50,8 @@ android:key="accessibility_button_fade" android:title="@string/accessibility_button_fade_title" android:summary="@string/accessibility_button_fade_summary" - android:persistent="false"/> + android:persistent="false" + settings:controller="com.android.settings.accessibility.FloatingMenuFadePreferenceController"/>