commit 20a6ffd04b93d7ed327e343f780f632032f65f8b
author Brandon Dayauon <brdayauon@google.com> Thu Apr 18 21:42:59 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 18 21:42:59 2024 +0000
tree 3901390bbfd8ae8e03e31344918435ee04632a5e
parent 4d91e165892a9103d3a5f6368a4de6766cb1282b
parent fe791d11aa768ce93d128c459159b85d6ac6b332

Merge "Fix install apps button" into main

src/com/android/launcher3/allapps/PrivateProfileManager.java

diff --git a/src/com/android/launcher3/allapps/PrivateProfileManager.java b/src/com/android/launcher3/allapps/PrivateProfileManager.java
index 90ed3eb..8fa0777 100644
--- a/src/com/android/launcher3/allapps/PrivateProfileManager.java
+++ b/src/com/android/launcher3/allapps/PrivateProfileManager.java
@@ -159,7 +159,6 @@
         itemInfo.contentDescription = context.getResources().getString(
                 com.android.launcher3.R.string.ps_add_button_content_description);
         itemInfo.runtimeStatusFlags |= FLAG_NOT_PINNABLE;
-        itemInfo.user = getProfileUser();
 
         BaseAllAppsAdapter.AdapterItem item = new BaseAllAppsAdapter.AdapterItem(VIEW_TYPE_ICON);
         item.itemInfo = itemInfo;
@@ -747,6 +746,7 @@
     }
 
     boolean isPrivateSpaceItem(BaseAllAppsAdapter.AdapterItem item) {
-        return getItemInfoMatcher().test(item.itemInfo) || item.decorationInfo != null;
+        return getItemInfoMatcher().test(item.itemInfo) || item.decorationInfo != null
+                || (item.itemInfo instanceof PrivateSpaceInstallAppButtonInfo);
     }
 }