From 4501af324a9a5105645a8fb8a3a136f03cf975fb Mon Sep 17 00:00:00 2001
From: Godfather <981964879@qq.com>
Date: Fri, 29 Apr 2022 16:52:03 +0800
Subject: [PATCH] =?UTF-8?q?version:=20fix:=20update:=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E6=A1=8C=E9=9D=A2=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                          | 26 ++++++-------
 src/com/aoleyun/os/Launcher.java      | 53 +++++++++++++--------------
 src/com/aoleyun/os/folder/Folder.java |  3 +-
 3 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/build.gradle b/build.gradle
index da7f8fd..5a4a7df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,19 +40,19 @@ apply plugin: 'com.google.protobuf'
 
 
 android {
-    gradle.projectsEvaluated {
-        tasks.withType(JavaCompile) {
-            Set<File> fileSet = options.bootstrapClasspath.getFiles()
-            List<File> newFileList = new ArrayList<>();
-            //JAVA语法，可连续调用，输入参数建议为相对路径
-            newFileList.add(new File("libs/framework.jar"))
-            //最后将原始参数添加
-            newFileList.addAll(fileSet)
-            options.bootstrapClasspath = files(
-                    newFileList.toArray()
-            )
-        }
-    }
+//    gradle.projectsEvaluated {
+//        tasks.withType(JavaCompile) {
+//            Set<File> fileSet = options.bootstrapClasspath.getFiles()
+//            List<File> newFileList = new ArrayList<>();
+//            //JAVA语法，可连续调用，输入参数建议为相对路径
+//            newFileList.add(new File("libs/framework.jar"))
+//            //最后将原始参数添加
+//            newFileList.addAll(fileSet)
+//            options.bootstrapClasspath = files(
+//                    newFileList.toArray()
+//            )
+//        }
+//    }
 
     lintOptions {
         checkReleaseBuilds false
diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java
index 6db59d5..b0a7db2 100644
--- a/src/com/aoleyun/os/Launcher.java
+++ b/src/com/aoleyun/os/Launcher.java
@@ -585,35 +585,32 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
 //    }
 
     public void setRoleHolderAsUser(Context context, String packageName) {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
-            return;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            String roleName = "android.app.role.HOME";
+            boolean add = true;
+            int flags = 0;
+            UserHandle user = Process.myUserHandle();
+            Log.i("settingssssssstemf", (add ? "Adding" : "Removing") + " package as role holder, role: "
+                    + roleName + ", package: " + packageName);
+            if (JGYUtils.getInstance().checkAppPlatform() != JGYUtils.MTKPlatform) {
+                RoleManager roleManager = context.getSystemService(RoleManager.class);
+                Executor executor = context.getMainExecutor();
+                Consumer<Boolean> callback = successful -> {
+                    if (successful) {
+                        Log.d("settingssssssstemf", "Package " + (add ? "added" : "removed")
+                                + " as role holder, role: " + roleName + ", package: " + packageName);
+                    } else {
+                        Log.d("settingssssssstemf", "Failed to " + (add ? "add" : "remove")
+                                + " package as role holder, role: " + roleName + ", package: "
+                                + packageName);
+                    }
+                };
+                roleManager.addRoleHolderAsUser(roleName, packageName, flags, user, executor, callback);
+                Log.i("settingssssssstemf", "addRoleHolderAsUser done");
+            }
+        } else {
+
         }
-        String roleName = "android.app.role.HOME";
-        boolean add = true;
-        int flags = 0;
-        UserHandle user = Process.myUserHandle();
-
-        Log.i("settingssssssstemf", (add ? "Adding" : "Removing") + " package as role holder, role: "
-                + roleName + ", package: " + packageName);
-
-        if (JGYUtils.getInstance().checkAppPlatform() != JGYUtils.MTKPlatform) {
-            RoleManager roleManager = context.getSystemService(RoleManager.class);
-            Executor executor = context.getMainExecutor();
-            Consumer<Boolean> callback = successful -> {
-                if (successful) {
-                    Log.d("settingssssssstemf", "Package " + (add ? "added" : "removed")
-                            + " as role holder, role: " + roleName + ", package: " + packageName);
-                } else {
-                    Log.d("settingssssssstemf", "Failed to " + (add ? "add" : "remove")
-                            + " package as role holder, role: " + roleName + ", package: "
-                            + packageName);
-                }
-            };
-
-            roleManager.addRoleHolderAsUser(roleName, packageName, flags, user, executor, callback);
-            Log.i("settingssssssstemf", "addRoleHolderAsUser done");
-        }
-
     }
 
     private TimeChangedReceiver mTimeChangedReceiver;
diff --git a/src/com/aoleyun/os/folder/Folder.java b/src/com/aoleyun/os/folder/Folder.java
index 639c1f7..8029a47 100644
--- a/src/com/aoleyun/os/folder/Folder.java
+++ b/src/com/aoleyun/os/folder/Folder.java
@@ -479,6 +479,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         }
         return folderCount >= MIN_FOLDERS_FOR_HARDWARE_OPTIMIZATION;
     }
+
     public Bitmap blur(Bitmap image) {
         int width = Math.round(image.getWidth() * 0.4f);
         int height = Math.round(image.getHeight() * 0.4f);
@@ -528,8 +529,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         return bitmap;
     }
 
-
-
     /**
      * Opens the user folder described by the specified tag. The opening of the folder
      * is animated relative to the specified View. If the View is null, no animation