From 23fd32c6d1518ea891d911ebb628bbd7ce1d03fe Mon Sep 17 00:00:00 2001 From: Riley Jones Date: Wed, 11 Sep 2024 23:55:00 +0000 Subject: [PATCH] Quick fix for FAB fade setting summary Fixes the fade setting to properly set its summary when not disabled. Flag: EXEMPT internal change Bug: 349178637 Test: Check the settings page with navigation button mode and FAB button mode. Verify the summary of the fade setting is correct in both cases. Change-Id: Ia87a634fd69e6098f1a0a658f788e69d10f2dbec --- .../FloatingMenuFadePreferenceController.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java b/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java index 70882a48d64..2ef0858e839 100644 --- a/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java +++ b/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java @@ -67,14 +67,11 @@ public class FloatingMenuFadePreferenceController extends BasePreferenceControll @Override public CharSequence getSummary() { - if (mPreference != null) { - return mPreference.isEnabled() - ? "%s" - : mContext.getString( - R.string.accessibility_button_disabled_button_mode_summary); - } else { - return "%s"; + int rId = R.string.accessibility_button_fade_summary; + if (mPreference != null && !mPreference.isEnabled()) { + rId = R.string.accessibility_button_disabled_button_mode_summary; } + return mContext.getString(rId); } @Override