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

Commit 19f65255 authored by Holly Sun's avatar Holly Sun
Browse files

Refresh `mNumAppsPerRowAllApps` when device profile changes. 

The return value of SrollableLayoutManager#getItemsHeight is wrong, which is caused by the return value of `incrementTotalHeight` (https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Launcher3/src/com/android/launcher3/util/ScrollableLayoutManager.java;l=151-163). In AllAppsGridAdapter#incrementTotalHeight (https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Launcher3/src/com/android/launcher3/allapps/AllAppsGridAdapter.java;l=172), `item.rowAppIndex` is still the staled value after app grid change / device fold & unfold. This value is calculated in AlphabeticalAppsList (https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Launcher3/src/com/android/launcher3/allapps/AlphabeticalAppsList.java;l=276-280). The mod `mNumAppsPerRowAllApps` is staled. So add an setter in `AlphabeticalAppsList` to update `mNumAppsPerRowAllApps`.

Bug: 262003765
Bug: 284940820
Test: manual
Flag: N/A
Change-Id: I74a99a3dc58ee45f066bcefb3e9c56be02b62f82
parent 068df4c1

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

+1 −0
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
    public void onDeviceProfileChanged(DeviceProfile dp) {

        for (AdapterHolder holder : mAH) {

            holder.mAdapter.setAppsPerRow(dp.numShownAllAppsColumns);

            holder.mAppsList.setNumAppsPerRowAllApps(dp.numShownAllAppsColumns);

            if (holder.mRecyclerView != null) {

                // Remove all views and clear the pool, while keeping the data same. After this

                // call, all the viewHolders will be recreated.

src/com/android/launcher3/allapps/AlphabeticalAppsList.java

+7 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class AlphabeticalAppsList<T extends Context & ActivityContext> implement 
    private final ArrayList<AdapterItem> mSearchResults = new ArrayList<>();

    private BaseAllAppsAdapter<T> mAdapter;

    private AppInfoComparator mAppNameComparator;

    private final int mNumAppsPerRowAllApps;

    private int mNumAppsPerRowAllApps;

    private int mNumAppRowsInAdapter;

    private Predicate<ItemInfo> mItemFilter;
@@ -92,12 +92,17 @@ public class AlphabeticalAppsList<T extends Context & ActivityContext> implement 
        mActivityContext = ActivityContext.lookupContext(context);

        mAppNameComparator = new AppInfoComparator(context);

        mWorkProviderManager = workProfileManager;

        mNumAppsPerRowAllApps = mActivityContext.getDeviceProfile().inv.numAllAppsColumns;

        mNumAppsPerRowAllApps = mActivityContext.getDeviceProfile().numShownAllAppsColumns;

        if (mAllAppsStore != null) {

            mAllAppsStore.addUpdateListener(this);

        }

    }



    /** Set the number of apps per row when device profile changes. */

    public void setNumAppsPerRowAllApps(int numAppsPerRow) {

        mNumAppsPerRowAllApps = numAppsPerRow;

    }



    public void updateItemFilter(Predicate<ItemInfo> itemFilter) {

        this.mItemFilter = itemFilter;

        onAppsUpdated();