commit 6ed6a6d8748c80c0b56faa30c9670263cfc39416
author Alex Chau <alexchau@google.com> Wed Sep 29 08:44:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 29 08:44:42 2021 +0000
tree 876d3ed0f6f1802e2376c87b80b788ac6cbae248
parent d5dd56e1dcd1522c76b9c117c88adcc9fa7c17a3
parent 09f99a4d7d323d36561d2247a769b7558d4e62a2

Merge "Return mSynchronouslyBoundPages as getPagesToBindSynchronously between onInitialBindCompleteand finishBindingItems" into sc-v2-dev am: b830b2d999 am: 09f99a4d7d

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

Change-Id: I2f76f9ae0e2c24b5e0de696d6a46581301a09a09

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 409ee83..0340694 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2118,8 +2118,16 @@
 
     @Override
     public IntSet getPagesToBindSynchronously(IntArray orderedScreenIds) {
-        IntSet visibleIds = mPagesToBindSynchronously.isEmpty()
-                ? mWorkspace.getCurrentPageScreenIds() : mPagesToBindSynchronously;
+        IntSet visibleIds;
+        if (!mPagesToBindSynchronously.isEmpty()) {
+            visibleIds = mPagesToBindSynchronously;
+        } else if (!mWorkspaceLoading) {
+            visibleIds = mWorkspace.getCurrentPageScreenIds();
+        } else {
+            // If workspace binding is still in progress, getCurrentPageScreenIds won't be accurate,
+            // and we should use mSynchronouslyBoundPages that's set during initial binding.
+            visibleIds = mSynchronouslyBoundPages;
+        }
         IntArray actualIds = new IntArray();
 
         IntSet result = new IntSet();