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

Commit 0308e250 authored by Stefan Andonian's avatar Stefan Andonian Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in FolderPagedView" into udc-dev am: 6597d5ec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23298096



Change-Id: If77e78b473fcccb3c806a77b3e5bff365892fd64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f27273c 6597d5ec

src/com/android/launcher3/folder/FolderPagedView.java

+5 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.view.Gravity; 
import android.view.View;

import android.view.ViewDebug;



import androidx.annotation.Nullable;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BubbleTextView;

import com.android.launcher3.CellLayout;
@@ -230,11 +232,13 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> implements Cli 
        return textView;

    }



    @Nullable

    @Override

    public CellLayout getPageAt(int index) {

        return (CellLayout) getChildAt(index);

    }



    @Nullable

    public CellLayout getCurrentCellLayout() {

        return getPageAt(getNextPage());

    }
@@ -381,7 +385,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> implements Cli 
    }



    private View getViewInCurrentPage(ToIntFunction<ShortcutAndWidgetContainer> rankProvider) {

        if (getChildCount() < 1) {

        if (getChildCount() < 1 || getCurrentCellLayout() == null) {

            return null;

        }

        ShortcutAndWidgetContainer container = getCurrentCellLayout().getShortcutsAndWidgets();