.gitignore

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

.idea/.gitignore

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

.idea/.name

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

.idea/AndroidProjectSystem.xml

@@ -0,0 +1,6 @@
+<?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

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

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,10 @@
+<?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

@@ -0,0 +1,19 @@
+<?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

@@ -0,0 +1,10 @@
+<?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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,17 @@
+<?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

@@ -0,0 +1,6 @@
+<?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 = 34
+        minSdk = 33
         targetSdk = 36
-        versionCode = 3
+        versionCode = 1
-        versionName = "1.2"
+        versionName = "1.0"
     }
 
     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 or custom user apps." />
+            android:value="Enable App Clone for all user apps." />
         <meta-data
             android:name="xposedminversion"
             android:value="93" />

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

@@ -2,20 +2,14 @@ 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;
@@ -25,30 +19,70 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage;
 public class XposedInit implements IXposedHookLoadPackage {
     @SuppressLint("StaticFieldLeak")
     private static Context mContext;
-    private static List<String> cachedCloneableApps;
+
+    private static final int AVAILABLE = 0;
+    private static final int CLONED_APPS_SUMMARY_STRING_ID = 0x7f140736;
+
+    private static Class<?> UtilsClass;
 
     @Override
     public void handleLoadPackage(final XC_LoadPackage.LoadPackageParam lpparam) {
+        if (!lpparam.packageName.equals("com.android.settings")) {
+            return;
+        }
 
-        if (lpparam.packageName.equals("com.android.settings")) {
+        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() {
+
+        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;
                     }
-            });
+                }
+        );
 
-            Class<?> clonedAppsPreferenceControllerClass = XposedHelpers.findClass("com.android.settings.applications.ClonedAppsPreferenceController", lpparam.classLoader);
+        XposedHelpers.findAndHookMethod(XposedHelpers.findClass("android.os.Flags", lpparam.classLoader), "allowPrivateProfile", new XC_MethodHook() {
-
-            XposedHelpers.findAndHookMethod(clonedAppsPreferenceControllerClass, "getAvailabilityStatus", new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) {
-                    param.setResult(0);
+                param.setResult(true);
             }
         });
 
-            XposedHelpers.findAndHookMethod(clonedAppsPreferenceControllerClass, "updateSummary", int.class, int.class, new XC_MethodHook() {
+
-                @SuppressLint({"QueryPermissionsNeeded", "DiscouragedApi"})
+        Class<?> clonedAppsPreferenceControllerClass = XposedHelpers.findClass("com.android.settings.applications.ClonedAppsPreferenceController", lpparam.classLoader);
+
+        XposedHelpers.findAndHookMethod(
+                clonedAppsPreferenceControllerClass,
+                "getAvailabilityStatus",
+                new XC_MethodHook() {
+                    @Override
+                    protected void beforeHookedMethod(MethodHookParam param) {
+                        param.setResult(AVAILABLE);
+                    }
+                });
+
+        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")
                     @Override
                     protected void beforeHookedMethod(MethodHookParam param) {
                         if (mContext == null) {
@@ -57,102 +91,97 @@ public class XposedInit implements IXposedHookLoadPackage {
 
                         PackageManager pm = mContext.getPackageManager();
 
-                    List<String> cloneableApps = getCloneableApps();
+                        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<PackageInfo> primaryInstalledPackagesAsUser = (List<PackageInfo>) XposedHelpers.callMethod(pm, "getInstalledPackagesAsUser", 0, XposedHelpers.callStaticMethod(UserHandle.class, "myUserId"));
+                        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<String> primaryUserApps = primaryInstalledPackagesAsUser.stream().map(x -> x.packageName).toList();
+                            for (PackageInfo clonedPkgInfo : cloneUserPackages) {
-
+                                if ((clonedPkgInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0 &&
-                    int availableAppsCount = (int) cloneableApps.stream().filter(primaryUserApps::contains).count();
+                                        primaryUserNonSystemAppPackages.contains(clonedPkgInfo.packageName)) {
-
+                                    currentlyClonedCount++;
-                    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) {
-                        XposedHelpers.callMethod(mPreference, "setSummary", String.format(mContext.getResources().getString(mContext.getResources().getIdentifier("cloned_apps_summary", "string", mContext.getPackageName())), clonedAppsCount, availableAppsCount - clonedAppsCount));
+                            String newSummary = String.format(mContext.getResources().getString(CLONED_APPS_SUMMARY_STRING_ID), currentlyClonedCount, primaryUserNonSystemAppPackages.size());
+                            XposedHelpers.callMethod(mPreference, "setSummary", newSummary);
                         }
-
                         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(
-                @Override
+                XposedHelpers.findClass("com.android.settings.applications.AppStateClonedAppsBridge", lpparam.classLoader),
-                protected void beforeHookedMethod(MethodHookParam param) {
+                "updateExtraInfo",
-                    XposedHelpers.setObjectField(param.thisObject, "mAllowedApps", getCloneableApps());
+                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.manageapplications.ManageApplications", lpparam.classLoader), "updateOptionsMenu", new XC_MethodHook() {
-                @SuppressLint("DiscouragedApi")
                     @Override
                     protected void afterHookedMethod(MethodHookParam param) {
-                    if (XposedHelpers.getObjectField(param.thisObject, "mListType").equals(17) && (int) XposedHelpers.callStaticMethod(XposedHelpers.findClass("com.android.settings.Utils", lpparam.classLoader), "getCloneUserId", mContext) > 0) {
+                        Object appEntry = param.args[0];
-                        Menu mOptionsMenu = (Menu) XposedHelpers.getObjectField(param.thisObject, "mOptionsMenu");
+                        String pkg = (String) param.args[1];
-                        if (mOptionsMenu != null) {
+                        ApplicationInfo appInfo = (ApplicationInfo) XposedHelpers.getObjectField(appEntry, "info");
-                            mOptionsMenu.findItem(mContext.getResources().getIdentifier("delete_all_app_clones", "id", mContext.getPackageName())).setVisible(true);
+
-                        }
+                        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 {
-            XposedHelpers.findAndHookMethod(XposedHelpers.findClass("com.android.launcher3.allapps.ActivityAllAppsContainerView$AdapterHolder", lpparam.classLoader), "setup", View.class, Predicate.class, new XC_MethodHook() {
+                            List<String> cloneProfileNonSystemAppPackages = getStrings(cloneUserId);
-                @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");
+                            if (appEntryUserId == cloneUserId) {
-                        Predicate privateProfileMatcher = (Predicate) XposedHelpers.callMethod(XposedHelpers.getObjectField(allAppsContainerView, "mPrivateProfileManager"), "getItemInfoMatcher");
+                                shouldDisplay = Boolean.TRUE;
-
+                            } else if (appEntryUserId == (int) XposedHelpers.callStaticMethod(UserHandle.class, "myUserId")) {
-                        Predicate WorkOrPrivate = workProfileMatcher.or(privateProfileMatcher);
+                                if (!cloneProfileNonSystemAppPackages.contains(pkg)) {
-
+                                    shouldDisplay = Boolean.TRUE;
-                        Predicate filter = WorkOrPrivate.negate();
+                                } else {
-
+                                    shouldDisplay = Boolean.FALSE;
-                        param.args[1] = filter;
                                 }
+                            } else {
+                                shouldDisplay = Boolean.FALSE;
+                            }
+                        }
+                        XposedHelpers.setObjectField(appEntry, "extraInfo", shouldDisplay);
                     }
                 });
     }
-    }
 
-    @SuppressLint("QueryPermissionsNeeded")
+    private static List<String> getStrings(int cloneUserId) {
-    private List<String> getCloneableApps() {
+        List<String> cloneProfileNonSystemAppPackages = new ArrayList<>();
-        if (mContext == null) {
+        if (cloneUserId > 0 && mContext != null) {
-            return new ArrayList<>();
+            @SuppressLint("PackageManagerGetInstalledPackagesAsUser")
-        }
+            List<PackageInfo> installedClonedPackages = (List<PackageInfo>) XposedHelpers.callMethod(mContext.getPackageManager(), "getInstalledPackagesAsUser", PackageManager.GET_ACTIVITIES, cloneUserId);
-
+            if (installedClonedPackages != null) {
-        if (cachedCloneableApps != null) {
+                for (PackageInfo pInfo : installedClonedPackages) {
-            return cachedCloneableApps;
+                    if ((pInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-        }
+                        cloneProfileNonSystemAppPackages.add(pInfo.packageName);
-
-        @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);
                     }
                 }
             }
+        }
+        return cloneProfileNonSystemAppPackages;
+    }
 
-        cachedCloneableApps = cloneableApps;
+    private int getCloneUserIDInternal() {
-        return cachedCloneableApps;
+        if (UtilsClass == null || mContext == null) {
+            return -1;
+        }
+        return (int) XposedHelpers.callStaticMethod(UtilsClass, "getCloneUserId", mContext);
     }
 }

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

@@ -2,7 +2,5 @@
 <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.1"
+agp = "8.12.0"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }