commit 45ef9b6c01dbbbb4d2a40b6ae54c47f08cf01b54
author Ankita Vyas <ankitavyas@google.com> Fri Jan 20 09:19:29 2023 +0000
committer Himanshu Gupta <himanshuz@google.com> Wed Mar 08 12:58:19 2023 +0000
tree aa83d8639dd3af5bc3b56ea10cf7470bf3ca7c73
parent 11c8b4f5944d87a78dd811f33c6089a8ed43bd16

Do not display clone apps in launcher work tab.

This change is only for dogfooding and will not be part of android release.
Guarded by feature flag.

Test: manual
Bug: 266177840
Change-Id: Iee416b43e0864b98f08149c46b7d011271ba8de6

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

diff --git a/src/com/android/launcher3/allapps/WorkProfileManager.java b/src/com/android/launcher3/allapps/WorkProfileManager.java
index f66ea34..e02fa2a 100644
--- a/src/com/android/launcher3/allapps/WorkProfileManager.java
+++ b/src/com/android/launcher3/allapps/WorkProfileManager.java
@@ -44,12 +44,14 @@
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.allapps.BaseAllAppsAdapter.AdapterItem;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.function.Predicate;
 
@@ -93,7 +95,11 @@
             StatsLogManager statsLogManager) {
         mUserManager = userManager;
         mAllApps = allApps;
-        mMatcher = mAllApps.mPersonalMatcher.negate();
+        if (FeatureFlags.ENABLE_APP_CLONING_CHANGES_IN_LAUNCHER.get()) {
+            mMatcher = ofWorkProfileUser(userManager);
+        } else {
+            mMatcher = mAllApps.mPersonalMatcher.negate();
+        }
         mStatsLogManager = statsLogManager;
     }
 
@@ -260,4 +266,27 @@
             }
         };
     }
+
+    /**
+     * Filter to only display apps in managed profile in work tab.
+     */
+    private Predicate<ItemInfo> ofWorkProfileUser(UserManager um) {
+        return info -> info != null && isManagedProfile(um, info.user.hashCode());
+    }
+
+
+    private static boolean isManagedProfile(UserManager um, int userId) {
+        try {
+            // isManagedProfile is a @SystemApi.
+            String methodName = "isManagedProfile";
+            Method method = um.getClass().getDeclaredMethod(methodName, int.class);
+            Object result = method.invoke(um, userId);
+            if (result instanceof Boolean) {
+                return (boolean) result;
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to call #isManagedProfile via reflection from Launcher");
+        }
+        return false;
+    }
 }

src/com/android/launcher3/config/FeatureFlags.java

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 54720c4..ecf9d7b 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -391,6 +391,10 @@
             "ENABLE_KEYBOARD_QUICK_SWITCH", true,
             "Enables keyboard quick switching");
 
+    public static final BooleanFlag ENABLE_APP_CLONING_CHANGES_IN_LAUNCHER = getDebugFlag(266177840,
+            "ENABLE_APP_CLONING_CHANGES_IN_LAUNCHER", false,
+            "Removes clone apps from the work profile tab.");
+
     public static class BooleanFlag {
 
         private final boolean mCurrentValue;