From e33b21142f56b0a157df3b376fcf9efa44180a65 Mon Sep 17 00:00:00 2001
From: Godfather <981964879@qq.com>
Date: Mon, 7 Mar 2022 18:08:51 +0800
Subject: [PATCH] =?UTF-8?q?version:3.0=20fix:=20update:=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                   | 4 ++--
 res/values-zh-rCN/strings.xml                  | 2 +-
 res/values/strings.xml                         | 2 +-
 src/com/aoleyun/os/Launcher.java               | 1 +
 src/com/aoleyun/os/model/LoaderTask.java       | 4 +++-
 src/com/aoleyun/os/touch/ItemClickHandler.java | 4 ++--
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 83729fd..10e880a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,8 +66,8 @@ android {
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 28
-        versionCode 20
-        versionName "2.9"
+        versionCode 21
+        versionName "3.0"
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
             abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9804af1..c285659 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="649227358658669779">"Launcher3"</string>
-    <string name="folder_name" msgid="7371454440695724752"></string>
+    <string name="folder_name" msgid="7371454440695724752">文件夹</string>
     <string name="work_folder_name" msgid="3753320833950115786">"Work"</string>
     <string name="activity_not_found" msgid="8071924732094499514">"未安装该应用。"</string>
     <string name="activity_not_available" msgid="7456344436509528827">"应用不可用"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c5c142..6833e5c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,7 +26,7 @@
     <string name="app_uiui">桌面</string>
 
     <!-- Default folder name -->
-    <string name="folder_name"></string>
+    <string name="folder_name">文件夹</string>
     <!-- Work folder name -->
     <string name="work_folder_name">Work</string>
     <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java
index f024bd7..170d838 100644
--- a/src/com/aoleyun/os/Launcher.java
+++ b/src/com/aoleyun/os/Launcher.java
@@ -2084,6 +2084,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
     FolderIcon addFolder(CellLayout layout, int container, final int screenId, int cellX,
                          int cellY) {
         final FolderInfo folderInfo = new FolderInfo();
+        /*修改默认文件夹名*/
         folderInfo.title = getText(R.string.folder_name);
 
         // Update the model
diff --git a/src/com/aoleyun/os/model/LoaderTask.java b/src/com/aoleyun/os/model/LoaderTask.java
index 12955e2..f01a9eb 100644
--- a/src/com/aoleyun/os/model/LoaderTask.java
+++ b/src/com/aoleyun/os/model/LoaderTask.java
@@ -279,9 +279,11 @@ public class LoaderTask implements Runnable {
         this.add("com.android.documentsui");
 //        this.add("com.android.messaging");
         this.add("com.android.music");
+        this.add("com.android.calendar");
         this.add("com.android.gallery3d");
         this.add("com.android.camera");
         this.add("com.android.camera2");
+        this.add("com.android.calculator");
         this.add("com.android.calculator2");
         this.add("com.android.settings");
         this.add("com.android.stk");
@@ -317,7 +319,7 @@ public class LoaderTask implements Runnable {
                     } else {
                         if (TextUtils.isEmpty(whiteList)) {
                             continue;
-                        } else if (!whiteList.contains(app.getApplicationInfo().packageName)){
+                        } else if (!whiteList.contains(app.getApplicationInfo().packageName)) {
                             continue;
                         }
                     }
diff --git a/src/com/aoleyun/os/touch/ItemClickHandler.java b/src/com/aoleyun/os/touch/ItemClickHandler.java
index f11dc36..d8fe220 100644
--- a/src/com/aoleyun/os/touch/ItemClickHandler.java
+++ b/src/com/aoleyun/os/touch/ItemClickHandler.java
@@ -185,7 +185,7 @@ public class ItemClickHandler {
         switch (pkg) {
             case "com.mediatek.camera":
             case "com.android.camera2":
-                if (Settings.System.getInt(context.getContentResolver(), "qch_app_camera", 1) == 1) {
+                if (Settings.System.getInt(context.getContentResolver(), "qch_app_camera", 0) == 1) {
                     ToastUtil.show( "摄像头已禁止使用");
                     return true;
                 }
@@ -203,7 +203,7 @@ public class ItemClickHandler {
                 }
                 break;
             case "com.android.deskclock":
-                if (Settings.System.getInt(context.getContentResolver(), "qch_app_deskclock", 1) == 1) {
+                if (Settings.System.getInt(context.getContentResolver(), "qch_app_deskclock", 0) == 1) {
                     ToastUtil.show( "时钟已禁止使用");
                     return true;
                 }