From 8ef1845c3dbef3c58da79d3bc1cfe39cc684c203 Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Tue, 16 May 2023 16:13:54 +0000 Subject: [PATCH] Revert "Do not display clone apps in launcher work tab." This reverts commit 45ef9b6c01dbbbb4d2a40b6ae54c47f08cf01b54. Reason for revert: As promised, sysUi changes introduced in Launcher for AppCloning are being reverted. (This is the only CL that was merged) Change-Id: I9fc72c333d48ca51558578d0d79038b49b3ebb5b Test: Manual by building sysUi --- .../launcher3/allapps/WorkProfileManager.java | 35 +------------------ .../launcher3/config/FeatureFlags.java | 5 --- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/src/com/android/launcher3/allapps/WorkProfileManager.java b/src/com/android/launcher3/allapps/WorkProfileManager.java index a671c6efec..30af50261d 100644 --- a/src/com/android/launcher3/allapps/WorkProfileManager.java +++ b/src/com/android/launcher3/allapps/WorkProfileManager.java @@ -45,7 +45,6 @@ import com.android.launcher3.LauncherPrefs; 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.testing.shared.TestProtocol; @@ -53,7 +52,6 @@ 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; @@ -97,15 +95,7 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP StatsLogManager statsLogManager) { mUserManager = userManager; mAllApps = allApps; - boolean cloningChanges = FeatureFlags.ENABLE_APP_CLONING_CHANGES_IN_LAUNCHER.get(); - if (TestProtocol.sDebugTracing) { - Log.d(WORK_TAB_MISSING, "matcher flag: " + cloningChanges); - } - if (cloningChanges) { - mMatcher = ofWorkProfileUser(userManager); - } else { - mMatcher = mAllApps.mPersonalMatcher.negate(); - } + mMatcher = mAllApps.mPersonalMatcher.negate(); mStatsLogManager = statsLogManager; } @@ -280,27 +270,4 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP } }; } - - /** - * Filter to only display apps in managed profile in work tab. - */ - private Predicate 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; - } } diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 6699825cca..621c2abb90 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -213,11 +213,6 @@ public final class FeatureFlags { public static final BooleanFlag ENABLE_TRANSIENT_TASKBAR = getDebugFlag(270395798, "ENABLE_TRANSIENT_TASKBAR", ENABLED, "Enables transient taskbar."); - // TODO(Block 15): Clean up flags - public static final BooleanFlag ENABLE_APP_CLONING_CHANGES_IN_LAUNCHER = getDebugFlag(266177840, - "ENABLE_APP_CLONING_CHANGES_IN_LAUNCHER", DISABLED, - "Removes clone apps from the work profile tab."); - // TODO(Block 16): Clean up flags // When enabled the promise icon is visible in all apps while installation an app. public static final BooleanFlag PROMISE_APPS_IN_ALL_APPS = getDebugFlag(270390012,