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

Commit f0c8c555 authored by Daniel Norman's avatar Daniel Norman
Browse files

fix: Grab content description before posting to a handler 

It's possible for the handler to execute when the context is no longer
valid, so grab the description early before posting, using the fragment
context available when the pref is first initialized.

Fix: 407904737
Flag: EXEMPT minor bugfix
Test: ToggleFeaturePreferenceFragmentTest
      (existing automated tests for content description)
Test: manually observe content description is still present
Change-Id: I9b163437de4941633d0af3b1d2ee6e679578fc68
parent 1c1dd907

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

+2 −2
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ public abstract class ToggleFeaturePreferenceFragment extends BaseSupportFragmen 
        preference.setSelectable(false);

        preference.setMaxHeight(displayHalfHeight);

        preference.setKey(KEY_ANIMATED_IMAGE);

        final CharSequence contentDescription = getContentDescriptionForAnimatedIllustration();

        preference.setOnBindListener(view -> {

            // isAnimatable is decided in

            // {@link IllustrationPreference#onBindViewHolder(PreferenceViewHolder)}. Therefore, we
@@ -449,8 +450,7 @@ public abstract class ToggleFeaturePreferenceFragment extends BaseSupportFragmen 
            // images are decorative.

            ThreadUtils.getUiThreadHandler().post(() -> {

                if (preference.isAnimatable()) {

                    preference.setContentDescription(

                            getContentDescriptionForAnimatedIllustration());

                    preference.setContentDescription(contentDescription);

                }

            });

        });