Merge remote-tracking branch 'origin/master'

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
@@ -65,8 +65,12 @@ android {
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 28
-        versionCode 36
-        versionName "4.5"
+        //MTK
+        versionCode 13
+        versionName "2.2"
+//        //cube
+//        versionCode 36
+//        versionName "4.5"
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
             abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
@@ -154,7 +158,7 @@ android {
                 variant.outputs.each { output ->
                     def outputFile = output.outputFile
                     if (outputFile != null) {
-                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk"
+                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${productFlavors[0].name}.apk"
                         output.outputFileName = fileName
                     }
                 }
@@ -176,7 +180,7 @@ android {
                 variant.outputs.each { output ->
                     def outputFile = ""
                     if (outputFile != null) {
-                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk"
+                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${productFlavors[0].name}.apk"
                         output.outputFileName = fileName
                     }
                 }

src/com/aoleyun/os/Launcher.java

@@ -585,17 +585,13 @@ 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();
@@ -609,12 +605,13 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
                                 + packageName);
                     }
                 };
-
                 roleManager.addRoleHolderAsUser(roleName, packageName, flags, user, executor, callback);
                 Log.i("settingssssssstemf", "addRoleHolderAsUser done");
             }
+        } else {
 
         }
+    }
 
     private TimeChangedReceiver mTimeChangedReceiver;
 

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

src/com/aoleyun/os/model/LoaderTask.java

@@ -286,6 +286,7 @@ public class LoaderTask implements Runnable {
         this.add("com.android.music");
         this.add("com.android.calendar");
         this.add("com.android.gallery3d");
+        this.add("com.mediatek.camera");
         this.add("com.android.camera");
         this.add("com.android.camera2");
         this.add("com.android.calculator");
@@ -300,6 +301,11 @@ public class LoaderTask implements Runnable {
         this.add("com.calendar.uiui");
         this.add("com.alarmclock.uiui");
         this.add("com.uiui.videoplayer");
+        //aihua
+        this.add("com.liuyang.jcstudentside");
+        this.add("com.alibaba.android.rimet");
+        this.add("com.tencent.wemeet.app");
+        this.add("com.qi.studycomputer.launcher");
     }};
 
     //add for load all app on workspace