Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f37570e4 authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

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

parents b0de073d 23fd32c6

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

+4 −7
Original line number Diff line number Diff line
@@ -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