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

Commit 78400244 authored by jasonwshsu's avatar jasonwshsu
Browse files

Fix the animated image can not be displayed. 

* Need to process arguments earlier.

Bug: 142528112
Test: Manual test
Change-Id: I63e116e47ccdb6409969f629b41b8c3622adb9dc
parent f7d30b1f

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

+8 −7
Original line number Diff line number Diff line
@@ -138,6 +138,9 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
        final SwitchBar switchBar = activity.getSwitchBar();

        switchBar.hide();



        // Need to be called as early as possible. Protected variables will be assigned here.

        onProcessArguments(getArguments());



        PreferenceScreen preferenceScreen = getPreferenceScreen();

        if (mImageUri != null) {

            final AnimatedImagePreference animatedImagePreference = new AnimatedImagePreference(
@@ -149,9 +152,13 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 


        mToggleServiceDividerSwitchPreference = new DividerSwitchPreference(getPrefContext());

        mToggleServiceDividerSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);

        if (getArguments().containsKey(AccessibilitySettings.EXTRA_CHECKED)) {

            final boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);

            mToggleServiceDividerSwitchPreference.setChecked(enabled);

        }



        preferenceScreen.addPreference(mToggleServiceDividerSwitchPreference);



        onProcessArguments(getArguments());

        updateToggleServiceTitle(mToggleServiceDividerSwitchPreference);



        final PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
@@ -339,12 +346,6 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
        // Key.

        mPreferenceKey = arguments.getString(AccessibilitySettings.EXTRA_PREFERENCE_KEY);



        // Enabled.

        if (arguments.containsKey(AccessibilitySettings.EXTRA_CHECKED)) {

            final boolean enabled = arguments.getBoolean(AccessibilitySettings.EXTRA_CHECKED);

            mToggleServiceDividerSwitchPreference.setChecked(enabled);

        }



        // Title.

        if (arguments.containsKey(AccessibilitySettings.EXTRA_RESOLVE_INFO)) {

            ResolveInfo info = arguments.getParcelable(AccessibilitySettings.EXTRA_RESOLVE_INFO);