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

Commit d971c365 authored by Hai Zhang's avatar Hai Zhang
Browse files

Fix candidate apps appearing after footer. 

The footer should always be removed before being added again, and the
order must be reset as well to allow orderingAsAdded to work.

Fixes: 135463572
Test: manual
Change-Id: I46441f829645223ea93cadaa3ecb9ac36b0a9bdd
parent 2556c5c7

src/com/android/packageinstaller/role/ui/DefaultAppChildFragment.java

+5 −0
Original line number Diff line number Diff line
@@ -128,10 +128,15 @@ public class DefaultAppChildFragment<PF extends PreferenceFragmentCompat 
            preferenceFragment.setPreferenceScreen(preferenceScreen);

        } else {

            oldDescriptionPreference = preferenceScreen.findPreference(PREFERENCE_KEY_DESCRIPTION);

            if (oldDescriptionPreference != null) {

                preferenceScreen.removePreference(oldDescriptionPreference);

                oldDescriptionPreference.setOrder(Preference.DEFAULT_ORDER);

            }

            for (int i = preferenceScreen.getPreferenceCount() - 1; i >= 0; --i) {

                Preference preference = preferenceScreen.getPreference(i);



                preferenceScreen.removePreference(preference);

                preference.setOrder(Preference.DEFAULT_ORDER);

                oldPreferences.put(preference.getKey(), preference);

            }

        }

src/com/android/packageinstaller/role/ui/DefaultAppListChildFragment.java

+5 −2
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ public class DefaultAppListChildFragment<PF extends PreferenceFragmentCompat 
            if (oldWorkPreferenceCategory != null) {

                clearPreferences(oldWorkPreferenceCategory, oldWorkPreferences);

                preferenceScreen.removePreference(oldWorkPreferenceCategory);

                oldWorkPreferenceCategory.setOrder(Preference.DEFAULT_ORDER);

            }

            clearPreferences(preferenceScreen, oldPreferences);

        }
@@ -143,9 +144,11 @@ public class DefaultAppListChildFragment<PF extends PreferenceFragmentCompat 
    private static void clearPreferences(@NonNull PreferenceGroup preferenceGroup,

            @NonNull ArrayMap<String, Preference> oldPreferences) {

        for (int i = preferenceGroup.getPreferenceCount() - 1; i >= 0; --i) {

            Preference Preference = preferenceGroup.getPreference(i);

            Preference preference = preferenceGroup.getPreference(i);



            oldPreferences.put(Preference.getKey(), Preference);

            preferenceGroup.removePreference(preference);

            preference.setOrder(Preference.DEFAULT_ORDER);

            oldPreferences.put(preference.getKey(), preference);

        }

    }

src/com/android/packageinstaller/role/ui/SpecialAppAccessChildFragment.java

+5 −0
Original line number Diff line number Diff line
@@ -116,10 +116,15 @@ public class SpecialAppAccessChildFragment<PF extends PreferenceFragmentCompat 
            preferenceFragment.setPreferenceScreen(preferenceScreen);

        } else {

            oldDescriptionPreference = preferenceScreen.findPreference(PREFERENCE_KEY_DESCRIPTION);

            if (oldDescriptionPreference != null) {

                preferenceScreen.removePreference(oldDescriptionPreference);

                oldDescriptionPreference.setOrder(Preference.DEFAULT_ORDER);

            }

            for (int i = preferenceScreen.getPreferenceCount() - 1; i >= 0; --i) {

                Preference preference = preferenceScreen.getPreference(i);



                preferenceScreen.removePreference(preference);

                preference.setOrder(Preference.DEFAULT_ORDER);

                oldPreferences.put(preference.getKey(), preference);

            }

        }

src/com/android/packageinstaller/role/ui/SpecialAppAccessListChildFragment.java

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ public class SpecialAppAccessListChildFragment<PF extends PreferenceFragmentComp 
            for (int i = preferenceScreen.getPreferenceCount() - 1; i >= 0; --i) {

                Preference preference = preferenceScreen.getPreference(i);



                preferenceScreen.removePreference(preference);

                preference.setOrder(Preference.DEFAULT_ORDER);

                oldPreferences.put(preference.getKey(), preference);

            }

        }