diff options
| author | Xin Li <delphij@google.com> | 2024-03-07 06:41:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-07 06:41:07 +0000 |
| commit | 17dabff1dd38e8f0e08736176a8a587e039e610a (patch) | |
| tree | bd40604eb4b00a1a0e63edfe28cb0ebe33f23029 /src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java | |
| parent | ded14cc2110e39408f74abac8a83e0a0f16608d2 (diff) | |
| parent | 7e8ae158f4a73ee580c468d71ca9a1df6f90a8cd (diff) | |
| download | Launcher3-17dabff1dd38e8f0e08736176a8a587e039e610a.tar.gz | |
Merge "Merge Android 14 QPR2 to AOSP main" into main
Diffstat (limited to 'src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java')
| -rw-r--r-- | src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java b/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java index 1fc8a03a83..929f698236 100644 --- a/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java +++ b/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java @@ -16,6 +16,7 @@ package com.android.launcher3.model; import static com.android.launcher3.WorkspaceLayoutManager.FIRST_SCREEN_ID; +import static com.android.launcher3.config.FeatureFlags.shouldShowFirstPageWidget; import android.util.LongSparseArray; @@ -66,7 +67,8 @@ public class WorkspaceItemSpaceFinder { int screenCount = workspaceScreens.size(); // First check the preferred screen. IntSet screensToExclude = new IntSet(); - if (FeatureFlags.QSB_ON_FIRST_SCREEN) { + if (FeatureFlags.QSB_ON_FIRST_SCREEN + && !shouldShowFirstPageWidget()) { screensToExclude.add(FIRST_SCREEN_ID); } |