.gitignore

@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures

.idea/.gitignore

@@ -1,3 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml

.idea/.name

@@ -1 +0,0 @@
-Double Tap To Wake

.idea/AndroidProjectSystem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
-  </component>
-</project>

.idea/deploymentTargetSelector.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="app">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>

.idea/gradle.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="CHOOSE_PER_TEST" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/migrations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>

.idea/misc.xml

@@ -1,9 +0,0 @@
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

.idea/runConfigurations.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
-        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
-        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
-        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
-        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
-        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

app/build.gradle.kts

@@ -8,10 +8,10 @@ android {
 
     defaultConfig {
         applicationId = "top.littlew.acer"
-        minSdk = 33
+        minSdk = 34
         targetSdk = 36
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 3
+        versionName = "1.2"
     }
 
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
             android:value="true" />
         <meta-data
             android:name="xposeddescription"
-            android:value="Enable App Clone for all user apps." />
+            android:value="Enable App Clone for all or custom user apps." />
         <meta-data
             android:name="xposedminversion"
             android:value="93" />

app/src/main/java/top/littlew/acer/XposedInit.java

@@ -2,14 +2,20 @@ package top.littlew.acer;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.view.Menu;
+import android.view.View;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.function.Predicate;
 
 import de.robv.android.xposed.IXposedHookLoadPackage;
 import de.robv.android.xposed.XC_MethodHook;
@@ -19,70 +25,30 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage;
 public class XposedInit implements IXposedHookLoadPackage {
     @SuppressLint("StaticFieldLeak")
     private static Context mContext;
-
-    private static final int AVAILABLE = 0;
-    private static final int CLONED_APPS_SUMMARY_STRING_ID = 0x7f140736;
-
-    private static Class<?> UtilsClass;
+    private static List<String> cachedCloneableApps;
 
     @Override
     public void handleLoadPackage(final XC_LoadPackage.LoadPackageParam lpparam) {
-        if (!lpparam.packageName.equals("com.android.settings")) {
-            return;
-        }
 
-        UtilsClass = XposedHelpers.findClass("com.android.settings.Utils", lpparam.classLoader);
-
-        XposedHelpers.findAndHookMethod(
-                XposedHelpers.findClass("com.android.settings.SettingsActivity", lpparam.classLoader),
-                "onCreate",
-                Bundle.class,
-                new XC_MethodHook() {
+        if (lpparam.packageName.equals("com.android.settings")) {
+            XposedHelpers.findAndHookMethod(XposedHelpers.findClass("com.android.settings.SettingsActivity", lpparam.classLoader), "onCreate", Bundle.class, new XC_MethodHook() {
                 @Override
                 protected void afterHookedMethod(MethodHookParam param) {
                     mContext = (Context) param.thisObject;
                 }
-                }
-        );
-
-        XposedHelpers.findAndHookMethod(XposedHelpers.findClass("android.os.Flags", lpparam.classLoader), "allowPrivateProfile", new XC_MethodHook() {
-            @Override
-            protected void beforeHookedMethod(MethodHookParam param) {
-                param.setResult(true);
-            }
             });
 
-
             Class<?> clonedAppsPreferenceControllerClass = XposedHelpers.findClass("com.android.settings.applications.ClonedAppsPreferenceController", lpparam.classLoader);
 
-        XposedHelpers.findAndHookMethod(
-                clonedAppsPreferenceControllerClass,
-                "getAvailabilityStatus",
-                new XC_MethodHook() {
+            XposedHelpers.findAndHookMethod(clonedAppsPreferenceControllerClass, "getAvailabilityStatus", new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) {
-                        param.setResult(AVAILABLE);
+                    param.setResult(0);
                 }
             });
 
-        XposedHelpers.findAndHookMethod(
-                clonedAppsPreferenceControllerClass,
-                "updatePreferenceSummary",
-                new XC_MethodHook() {
-                    @Override
-                    protected void beforeHookedMethod(MethodHookParam param) {
-                        // Allowing native logic to calculate Summary.
-                    }
-                });
-
-
-        XposedHelpers.findAndHookMethod(
-                clonedAppsPreferenceControllerClass,
-                "updateSummary",
-                int.class,
-                int.class,
-                new XC_MethodHook() {
-                    @SuppressLint("QueryPermissionsNeeded")
+            XposedHelpers.findAndHookMethod(clonedAppsPreferenceControllerClass, "updateSummary", int.class, int.class, new XC_MethodHook() {
+                @SuppressLint({"QueryPermissionsNeeded", "DiscouragedApi"})
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) {
                     if (mContext == null) {
@@ -91,97 +57,102 @@ public class XposedInit implements IXposedHookLoadPackage {
 
                     PackageManager pm = mContext.getPackageManager();
 
-                        List<String> primaryUserNonSystemAppPackages = new ArrayList<>();
-                        for (PackageInfo pkgInfo : pm.getInstalledPackages(PackageManager.GET_ACTIVITIES)) {
-                            if ((pkgInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0 &&
-                                    !pkgInfo.packageName.equals(lpparam.packageName)) {
-                                primaryUserNonSystemAppPackages.add(pkgInfo.packageName);
-                            }
-                        }
+                    List<String> cloneableApps = getCloneableApps();
 
-                        int currentlyClonedCount = 0;
-                        int cloneUserId = getCloneUserIDInternal();
-                        if (cloneUserId > 0) {
-                            @SuppressLint("PackageManagerGetInstalledPackagesAsUser")
-                            List<PackageInfo> cloneUserPackages = (List<PackageInfo>) XposedHelpers.callMethod(pm, "getInstalledPackagesAsUser", PackageManager.GET_ACTIVITIES, cloneUserId);
+                    List<PackageInfo> primaryInstalledPackagesAsUser = (List<PackageInfo>) XposedHelpers.callMethod(pm, "getInstalledPackagesAsUser", 0, XposedHelpers.callStaticMethod(UserHandle.class, "myUserId"));
 
-                            for (PackageInfo clonedPkgInfo : cloneUserPackages) {
-                                if ((clonedPkgInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0 &&
-                                        primaryUserNonSystemAppPackages.contains(clonedPkgInfo.packageName)) {
-                                    currentlyClonedCount++;
-                                }
-                            }
+                    List<String> primaryUserApps = primaryInstalledPackagesAsUser.stream().map(x -> x.packageName).toList();
+
+                    int availableAppsCount = (int) cloneableApps.stream().filter(primaryUserApps::contains).count();
+
+                    int clonedUserId = (int) XposedHelpers.callStaticMethod(XposedHelpers.findClass("com.android.settings.Utils", lpparam.classLoader), "getCloneUserId", mContext);
+                    int clonedAppsCount = 0;
+
+                    if (!(clonedUserId == -1)) {
+                        List<PackageInfo> cloneProfileInstalledPackagesAsUser = (List<PackageInfo>) XposedHelpers.callMethod(pm, "getInstalledPackagesAsUser", 0, clonedUserId);
+
+                        List<String> cloneProfileApps = cloneProfileInstalledPackagesAsUser.stream().map(x -> x.packageName).toList();
+
+                        clonedAppsCount = (int) cloneableApps.stream().filter(cloneProfileApps::contains).count();
                     }
 
                     Object mPreference = XposedHelpers.getObjectField(param.thisObject, "mPreference");
                     if (mPreference != null) {
-                            String newSummary = String.format(mContext.getResources().getString(CLONED_APPS_SUMMARY_STRING_ID), currentlyClonedCount, primaryUserNonSystemAppPackages.size());
-                            XposedHelpers.callMethod(mPreference, "setSummary", newSummary);
+                        XposedHelpers.callMethod(mPreference, "setSummary", String.format(mContext.getResources().getString(mContext.getResources().getIdentifier("cloned_apps_summary", "string", mContext.getPackageName())), clonedAppsCount, availableAppsCount - clonedAppsCount));
                     }
+
                     param.setResult(null);
                 }
             });
 
-        XposedHelpers.findAndHookMethod(
-                XposedHelpers.findClass("com.android.settings.applications.AppStateClonedAppsBridge", lpparam.classLoader),
-                "updateExtraInfo",
-                XposedHelpers.findClass("com.android.settingslib.applications.ApplicationsState$AppEntry", lpparam.classLoader),
-                String.class,
-                int.class,
-                new XC_MethodHook() {
+            XposedHelpers.findAndHookMethod(XposedHelpers.findClass("com.android.settings.applications.AppStateClonedAppsBridge", lpparam.classLoader), "updateExtraInfo", XposedHelpers.findClass("com.android.settingslib.applications.ApplicationsState$AppEntry", lpparam.classLoader), String.class, int.class, new XC_MethodHook() {
+                @Override
+                protected void beforeHookedMethod(MethodHookParam param) {
+                    XposedHelpers.setObjectField(param.thisObject, "mAllowedApps", getCloneableApps());
+                }
+            });
+
+            XposedHelpers.findAndHookMethod(XposedHelpers.findClass("com.android.settings.applications.manageapplications.ManageApplications", lpparam.classLoader), "updateOptionsMenu", new XC_MethodHook() {
+                @SuppressLint("DiscouragedApi")
                 @Override
                 protected void afterHookedMethod(MethodHookParam param) {
-                        Object appEntry = param.args[0];
-                        String pkg = (String) param.args[1];
-                        ApplicationInfo appInfo = (ApplicationInfo) XposedHelpers.getObjectField(appEntry, "info");
-
-                        int appEntryUserId = (int) XposedHelpers.callStaticMethod(UserHandle.class, "getUserId", appInfo.uid);
-                        int cloneUserId = getCloneUserIDInternal();
-
-                        Boolean shouldDisplay;
-
-                        if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                            shouldDisplay = Boolean.FALSE;
-                        } else {
-                            List<String> cloneProfileNonSystemAppPackages = getStrings(cloneUserId);
-
-                            if (appEntryUserId == cloneUserId) {
-                                shouldDisplay = Boolean.TRUE;
-                            } else if (appEntryUserId == (int) XposedHelpers.callStaticMethod(UserHandle.class, "myUserId")) {
-                                if (!cloneProfileNonSystemAppPackages.contains(pkg)) {
-                                    shouldDisplay = Boolean.TRUE;
-                                } else {
-                                    shouldDisplay = Boolean.FALSE;
-                                }
-                            } else {
-                                shouldDisplay = Boolean.FALSE;
+                    if (XposedHelpers.getObjectField(param.thisObject, "mListType").equals(17) && (int) XposedHelpers.callStaticMethod(XposedHelpers.findClass("com.android.settings.Utils", lpparam.classLoader), "getCloneUserId", mContext) > 0) {
+                        Menu mOptionsMenu = (Menu) XposedHelpers.getObjectField(param.thisObject, "mOptionsMenu");
+                        if (mOptionsMenu != null) {
+                            mOptionsMenu.findItem(mContext.getResources().getIdentifier("delete_all_app_clones", "id", mContext.getPackageName())).setVisible(true);
                         }
                     }
-                        XposedHelpers.setObjectField(appEntry, "extraInfo", shouldDisplay);
+                }
+            });
+        } else {
+            XposedHelpers.findAndHookMethod(XposedHelpers.findClass("com.android.launcher3.allapps.ActivityAllAppsContainerView$AdapterHolder", lpparam.classLoader), "setup", View.class, Predicate.class, new XC_MethodHook() {
+                @Override
+                protected void beforeHookedMethod(MethodHookParam param) {
+                    if ((int) XposedHelpers.getObjectField(param.thisObject, "mType") == 0) {
+                        Object allAppsContainerView = XposedHelpers.getObjectField(param.thisObject, "this$0");
+
+                        Predicate workProfileMatcher = (Predicate) XposedHelpers.callMethod(XposedHelpers.getObjectField(allAppsContainerView, "mWorkManager"), "getItemInfoMatcher");
+                        Predicate privateProfileMatcher = (Predicate) XposedHelpers.callMethod(XposedHelpers.getObjectField(allAppsContainerView, "mPrivateProfileManager"), "getItemInfoMatcher");
+
+                        Predicate WorkOrPrivate = workProfileMatcher.or(privateProfileMatcher);
+
+                        Predicate filter = WorkOrPrivate.negate();
+
+                        param.args[1] = filter;
+                    }
                 }
             });
         }
-
-    private static List<String> getStrings(int cloneUserId) {
-        List<String> cloneProfileNonSystemAppPackages = new ArrayList<>();
-        if (cloneUserId > 0 && mContext != null) {
-            @SuppressLint("PackageManagerGetInstalledPackagesAsUser")
-            List<PackageInfo> installedClonedPackages = (List<PackageInfo>) XposedHelpers.callMethod(mContext.getPackageManager(), "getInstalledPackagesAsUser", PackageManager.GET_ACTIVITIES, cloneUserId);
-            if (installedClonedPackages != null) {
-                for (PackageInfo pInfo : installedClonedPackages) {
-                    if ((pInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-                        cloneProfileNonSystemAppPackages.add(pInfo.packageName);
-                    }
-                }
-            }
-        }
-        return cloneProfileNonSystemAppPackages;
     }
 
-    private int getCloneUserIDInternal() {
-        if (UtilsClass == null || mContext == null) {
-            return -1;
+    @SuppressLint("QueryPermissionsNeeded")
+    private List<String> getCloneableApps() {
+        if (mContext == null) {
+            return new ArrayList<>();
         }
-        return (int) XposedHelpers.callStaticMethod(UtilsClass, "getCloneUserId", mContext);
+
+        if (cachedCloneableApps != null) {
+            return cachedCloneableApps;
+        }
+
+        @SuppressLint("DiscouragedApi") List<String> cloneableApps = new ArrayList<>(Arrays.asList(mContext.getResources().getStringArray(mContext.getResources().getIdentifier("cloneable_apps", "array", "android"))));
+
+        SharedPreferences sharedPrefs = mContext.getSharedPreferences("cloneable_apps", Context.MODE_PRIVATE);
+        List<String> newCloneableApps = new ArrayList<>(sharedPrefs.getStringSet("cloneable_apps", new HashSet<>()));
+
+        cloneableApps.addAll(newCloneableApps);
+
+        if (cloneableApps.isEmpty()) {
+            List<PackageInfo> primaryInstalledPackagesAsUser = (List<PackageInfo>) XposedHelpers.callMethod(mContext.getPackageManager(), "getInstalledPackagesAsUser", 0, XposedHelpers.callStaticMethod(UserHandle.class, "myUserId"));
+
+            for (PackageInfo pkgInfo : primaryInstalledPackagesAsUser) {
+                if ((pkgInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                    cloneableApps.add(pkgInfo.packageName);
+                }
+            }
+        }
+
+        cachedCloneableApps = cloneableApps;
+        return cachedCloneableApps;
     }
 }

app/src/main/res/values/arrays.xml

@@ -2,5 +2,7 @@
 <resources>
     <string-array name="xposed_scope">
         <item>com.android.settings</item>
+        <item>com.android.launcher3</item>
+        <item>com.google.android.apps.nexuslauncher</item>
     </string-array>
 </resources>

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.12.0"
+agp = "8.12.1"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }