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 @@ "Launcher3" - + 文件夹 "Work" "未安装该应用。" "应用不可用" 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 @@ 桌面 - + 文件夹 Work 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; }