PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in FolderPagedView" into udc-dev am: 6597d5ec3c am: 0308e2506c

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

Change-Id: I57ab36f206ad034cbd88dfba8cc492224dce4467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Stefan Andonian
2023-05-19 22:19:32 +00:00
committed by Automerger Merge Worker
parent 3be979035a 0308e2506c
commit fea6deebc3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/folder/FolderPagedView.java
+5 -1
View File
@@ -31,6 +31,8 @@ import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewDebug; import android.view.ViewDebug;
import androidx.annotation.Nullable;
import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.BubbleTextView; import com.android.launcher3.BubbleTextView;
import com.android.launcher3.CellLayout; import com.android.launcher3.CellLayout;
@@ -230,11 +232,13 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> implements Cli
return textView; return textView;
} }
@Nullable
@Override @Override
public CellLayout getPageAt(int index) { public CellLayout getPageAt(int index) {
return (CellLayout) getChildAt(index); return (CellLayout) getChildAt(index);
} }
@Nullable
public CellLayout getCurrentCellLayout() { public CellLayout getCurrentCellLayout() {
return getPageAt(getNextPage()); return getPageAt(getNextPage());
} }
@@ -381,7 +385,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> implements Cli
} }
private View getViewInCurrentPage(ToIntFunction<ShortcutAndWidgetContainer> rankProvider) { private View getViewInCurrentPage(ToIntFunction<ShortcutAndWidgetContainer> rankProvider) {
if (getChildCount() < 1) { if (getChildCount() < 1 || getCurrentCellLayout() == null) {
return null; return null;
} }
ShortcutAndWidgetContainer container = getCurrentCellLayout().getShortcutsAndWidgets(); ShortcutAndWidgetContainer container = getCurrentCellLayout().getShortcutsAndWidgets();