commit e6bebdc83e0443cb8f2b594cbdd3654c0abac6ff
author micky387 <mickaelsaibi@free.fr> Sat Dec 28 16:17:56 2024 -0500
committer micky387 <mickaelsaibi@free.fr> Sat Dec 28 16:18:03 2024 -0500
tree e8971523f22f75f57d6236279602796aa3612bd3
parent 45124ad6c0b01947f98248c69ce4253968339590

Launcher3: Restore our previoud ModelCallbacks getQsbOnFirstScreen feature

It fix the issue when the "show search widget" is on hotseat and the Google feed integration not showing

Change-Id: I1feb041f91fce66b44e1ce572097f7ac2d8ef1e5

src/com/android/launcher3/ModelCallbacks.kt

diff --git a/src/com/android/launcher3/ModelCallbacks.kt b/src/com/android/launcher3/ModelCallbacks.kt
index aff64ce..b04978a 100644
--- a/src/com/android/launcher3/ModelCallbacks.kt
+++ b/src/com/android/launcher3/ModelCallbacks.kt
@@ -329,13 +329,13 @@
         )
         val firstScreenPosition = 0
         if (
-            (isFirstPagePinnedItemEnabled && !SHOULD_SHOW_FIRST_PAGE_WIDGET) &&
+            (getQsbOnFirstScreen() && isFirstPagePinnedItemEnabled && !SHOULD_SHOW_FIRST_PAGE_WIDGET) &&
                 orderedScreenIds.indexOf(FIRST_SCREEN_ID) != firstScreenPosition
         ) {
             orderedScreenIds.removeValue(FIRST_SCREEN_ID)
             orderedScreenIds.add(firstScreenPosition, FIRST_SCREEN_ID)
         } else if (
-            (!isFirstPagePinnedItemEnabled || SHOULD_SHOW_FIRST_PAGE_WIDGET) &&
+            (!getQsbOnFirstScreen() && !isFirstPagePinnedItemEnabled || SHOULD_SHOW_FIRST_PAGE_WIDGET) &&
                 orderedScreenIds.isEmpty
         ) {
             // If there are no screens, we need to have an empty screen
@@ -392,6 +392,7 @@
         }
         orderedScreenIds
             .filterNot { screenId ->
+                getQsbOnFirstScreen() &&
                 isFirstPagePinnedItemEnabled &&
                     !SHOULD_SHOW_FIRST_PAGE_WIDGET &&
                     screenId == WorkspaceLayoutManager.FIRST_SCREEN_ID
@@ -429,6 +430,8 @@
         launcher.appsView.updateWorkUI()
     }
 
+    fun getQsbOnFirstScreen(): Boolean = Utilities.showWorkspaceQsbWidget(launcher)
+
     fun getIsFirstPagePinnedItemEnabled(): Boolean = isFirstPagePinnedItemEnabled
 
     override fun getItemInflater() = launcher.itemInflater