aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 09:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix NPE of FolderPagedView#setFocusOnFirstChild" into udc-dev am: 0d07a85299

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

Change-Id: Iaa4e6bc87de4f08486ee28e8daf28b809778d01a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fengjiang Li
2023-05-18 23:14:24 +00:00
committed by Automerger Merge Worker
parent 1b12262d07 0d07a85299
commit 63144d9a29
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/launcher3/folder/FolderPagedView.java
View File

@@ -46,7 +46,6 @@ import com.android.launcher3.keyboard.ViewGroupFocusHelper;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.pageindicators.PageIndicatorDots;
import com.android.launcher3.touch.ItemClickHandler;
import com.android.launcher3.util.LauncherBindableItemsContainer.ItemOperator;
import com.android.launcher3.util.Thunk;
import com.android.launcher3.util.ViewCache;
@@ -421,10 +420,15 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> implements Cli
* Sets the focus on the first visible child.
*/
public void setFocusOnFirstChild() {
View firstChild = getCurrentCellLayout().getChildAt(0, 0);
if (firstChild != null) {
firstChild.requestFocus();
CellLayout currentCellLayout = getCurrentCellLayout();
if (currentCellLayout == null) {
return;
}
View firstChild = currentCellLayout.getChildAt(0, 0);
if (firstChild == null) {
return;
}
firstChild.requestFocus();
}
@Override