commit f37570e46eb7c5d2a432ac6d2dfcc06ff200a140
author Riley Jones <jonesriley@google.com> Thu Sep 12 18:44:41 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 12 18:44:41 2024 +0000
tree 143f2fc1051e9f4e0ba551a8cb5f9e18fce3cfc6
parent b0de073d3d0448e45ccbdf86957d7b4136dee8b3
parent 23fd32c6d1518ea891d911ebb628bbd7ce1d03fe

Merge "Quick fix for FAB fade setting summary" into main

src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java

diff --git a/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java b/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java
index 70882a4..2ef0858 100644
--- a/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java
+++ b/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java
@@ -67,14 +67,11 @@
 
     @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