6.7.0 - Alpha3 - 设置页面支持应用启动器图标设置选项 (issue #405)

2025-07-18 17:42:06 +08:00
parent 8273a394bf
commit e2e98b102a
16 changed files with 291 additions and 21 deletions
--- a/.changelog/lang_zh-Hans.json
+++ b/.changelog/lang_zh-Hans.json
@@ -1,11 +1,12 @@
 {
  "$data": {
    "v6.7.0": {
-      "released_date": "2025/07/03",
+      "released_date": "2025/07/18",
      "feature": [
        "zip 模块, 用于文件压缩与解压缩操作 (Ref to [Auto.js Pro](https://g.pro.autojs.org/)) (参阅 项目文档 > [Zip](https://docs.autojs6.com/#/zip))",
        "mediainfo 模块, 用于查看媒体文件的详细信息 (参阅 项目文档 > [媒体信息](https://docs.autojs6.com/#/mediainfo))",
-        "UiObject#isShifted 方法, 用于检测控件位置变化"
+        "UiObject#isShifted 方法, 用于检测控件位置变化",
+        "设置页面支持应用启动器图标设置选项 _[`issue #405`](http://issues.autojs6.com/405)_"
      ],
      "fix": [
        "使用 XML 语法将 JavaScript 表达式作为属性值时, this 对象可能出现指向错误的问题",
--- a/.run/app.run.xml
+++ b/.run/app.run.xml
@@ -13,7 +13,7 @@
    <option name="CLEAR_APP_STORAGE" value="false" />
    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-    <option name="MODE" value="default_activity" />
+    <option name="MODE" value="specific_activity" />
    <option name="RESTORE_ENABLED" value="false" />
    <option name="RESTORE_FILE" value="" />
    <option name="RESTORE_FRESH_INSTALL_ONLY" value="false" />
@@ -35,7 +35,50 @@
    </Profilers>
    <option name="DEEP_LINK" value="" />
    <option name="ACTIVITY" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
+    <option name="ACTIVITY_CLASS" value="org.autojs.autojs.ui.splash.SplashActivity" />
+    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+  <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false" singleton="true">
+    <module name="AutoJs6.app" />
+    <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
+    <option name="DEPLOY" value="true" />
+    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+    <option name="DEPLOY_AS_INSTANT" value="false" />
+    <option name="ARTIFACT_NAME" value="" />
+    <option name="PM_INSTALL_OPTIONS" value="" />
+    <option name="ALL_USERS" value="false" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="true" />
+    <option name="ALLOW_ASSUME_VERIFIED" value="false" />
+    <option name="CLEAR_APP_STORAGE" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
+    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+    <option name="MODE" value="specific_activity" />
+    <option name="RESTORE_ENABLED" value="false" />
+    <option name="RESTORE_FILE" value="" />
+    <option name="RESTORE_FRESH_INSTALL_ONLY" value="false" />
+    <option name="CLEAR_LOGCAT" value="false" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+    <option name="DEBUGGER_TYPE" value="Java" />
+    <Java>
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Java>
+    <Profilers>
+      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+    </Profilers>
+    <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY" value="" />
+    <option name="ACTIVITY_CLASS" value="org.autojs.autojs.ui.splash.SplashActivity" />
    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
    <method v="2">
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -209,9 +209,20 @@
        <activity
            android:name="org.autojs.autojs.ui.splash.SplashActivity"
            android:exported="true"
-            android:label="@string/app_name"
            android:theme="@style/AppTheme.Splash"
-            tools:ignore="RedundantLabel">
+            >
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/app_shortcuts" />
+        </activity>
+
+        <activity-alias
+            android:name="org.autojs.autojs.launcher.AdaptiveIconAlias"
+            android:enabled="true"
+            android:exported="true"
+            android:icon="${icon}"
+            android:targetActivity="org.autojs.autojs.ui.splash.SplashActivity">
+
            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -220,10 +231,24 @@

            </intent-filter>

-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/app_shortcuts" />
-        </activity>
+        </activity-alias>
+
+        <activity-alias
+            android:name="org.autojs.autojs.launcher.TransparentBackgroundIconAlias"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@drawable/autojs6_material"
+            android:targetActivity="org.autojs.autojs.ui.splash.SplashActivity">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="${intentCategory}" />
+
+            </intent-filter>
+
+        </activity-alias>

        <activity
            android:name="org.autojs.autojs.ui.main.MainActivity"
--- a/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt
@@ -0,0 +1,141 @@
+package org.autojs.autojs.ui.settings
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
+import android.os.Build
+import android.os.Bundle
+import android.util.AttributeSet
+import androidx.preference.PreferenceManager
+import com.afollestad.materialdialogs.MaterialDialog
+import org.autojs.autojs.core.pref.Pref
+import org.autojs.autojs.external.shortcut.ShortcutActivity
+import org.autojs.autojs.theme.preference.MaterialListPreference
+import org.autojs.autojs.util.StringUtils.key
+import org.autojs.autojs6.R
+
+class LauncherIconPreference : MaterialListPreference, SharedPreferences.OnSharedPreferenceChangeListener {
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) :
+            super(context, attrs, defStyleAttr, defStyleRes, createDefaultBundle(context))
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) :
+            super(context, attrs, defStyleAttr, 0, createDefaultBundle(context))
+
+    constructor(context: Context, attrs: AttributeSet?) :
+            super(context, attrs, 0, 0, createDefaultBundle(context))
+
+    constructor(context: Context) :
+            super(context, null, 0, 0, createDefaultBundle(context))
+
+    init {
+        Pref.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onAttachedToHierarchy(preferenceManager: PreferenceManager) {
+        super.onAttachedToHierarchy(preferenceManager)
+        syncValueWithCurrentComponent()
+    }
+
+    private fun syncValueWithCurrentComponent() {
+        val isComponentTransparent = isComponentEnabled(prefContext, ALIAS_TRANSPARENT_BACKGROUND)
+        val isBeforeAndroidO = Build.VERSION.SDK_INT < Build.VERSION_CODES.O
+        val shouldBeTransparent = isComponentTransparent || isBeforeAndroidO
+        val targetKey = if (shouldBeTransparent) {
+            prefContext.getString(R.string.key_launcher_icon_transparent_background)
+        } else {
+            prefContext.getString(R.string.key_launcher_icon_adaptive)
+        }
+        if (getPersistedString("") != targetKey) {
+            persistString(targetKey)
+            notifyChanged()
+        }
+    }
+
+    override fun onChangeConfirmed(dialog: MaterialDialog) {
+        super.onChangeConfirmed(dialog)
+
+        when (dialog.items?.get(dialog.selectedIndex)?.toString()) {
+            prefContext.getString(R.string.entry_launcher_icon_adaptive) -> {
+                switchComponent(prefContext, ALIAS_ADAPTIVE, ALIAS_TRANSPARENT_BACKGROUND)
+            }
+            prefContext.getString(R.string.entry_launcher_icon_transparent_background) -> {
+                switchComponent(prefContext, ALIAS_TRANSPARENT_BACKGROUND, ALIAS_ADAPTIVE)
+            }
+            else -> Unit
+        }
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) = notifyChanged()
+
+    private fun switchComponent(ctx: Context, wantEnable: String, wantDisable: String) {
+        val pm = ctx.packageManager
+
+        pm.setComponentEnabledSetting(
+            ComponentName(ctx, wantEnable),
+            PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+            PackageManager.DONT_KILL_APP,
+        )
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            ctx.getSystemService(ShortcutManager::class.java)?.let { sm ->
+                sm.pinnedShortcuts.mapNotNull { shortcutInfo ->
+                    ShortcutInfo.Builder(ctx, shortcutInfo.id).apply {
+                        shortcutInfo.intent?.let {
+                            it.component?.let { component ->
+                                setActivity(ComponentName(component.packageName, component.className))
+                            } ?: run {
+                                setActivity(ComponentName(ctx, ShortcutActivity::class.java))
+                            }
+                            setIntent(it)
+                        } ?: run {
+                            setActivity(ComponentName(ctx, ShortcutActivity::class.java))
+                            setIntent(Intent(ctx, ShortcutActivity::class.java))
+                        }
+                        (shortcutInfo.shortLabel ?: shortcutInfo.longLabel)?.let {
+                            setShortLabel(it)
+                        }
+                        (shortcutInfo.longLabel ?: shortcutInfo.shortLabel)?.let {
+                            setLongLabel(it)
+                        }
+                    }.build()
+                }.takeUnless { it.isEmpty() }?.let { toUpdate ->
+                    sm.updateShortcuts(toUpdate)
+                }
+            }
+        }
+
+        pm.setComponentEnabledSetting(
+            ComponentName(ctx, wantDisable),
+            PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+            PackageManager.DONT_KILL_APP,
+        )
+    }
+
+    @Suppress("SameParameterValue")
+    private fun isComponentEnabled(ctx: Context, className: String): Boolean {
+        val state = ctx.packageManager.getComponentEnabledSetting(
+            ComponentName(ctx, className)
+        )
+        return state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED ||
+                state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
+    }
+
+    companion object {
+
+        private const val ALIAS_ADAPTIVE = "org.autojs.autojs.launcher.AdaptiveIconAlias"
+        private const val ALIAS_TRANSPARENT_BACKGROUND = "org.autojs.autojs.launcher.TransparentBackgroundIconAlias"
+
+        private fun createDefaultBundle(context: Context) = Bundle().apply {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                putString(key(R.string.key_pref_bundle_default_item), context.getString(R.string.key_launcher_icon_transparent_background))
+                putIntegerArrayList(key(R.string.key_pref_bundle_disabled_items), arrayListOf(R.string.key_launcher_icon_adaptive))
+            }
+        }
+
+    }
+
+}
--- a/app/src/main/java/org/autojs/autojs/util/ShortcutUtils.kt
+++ b/app/src/main/java/org/autojs/autojs/util/ShortcutUtils.kt
@@ -1,15 +1,21 @@
 package org.autojs.autojs.util

 import android.app.PendingIntent
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.Icon
+import android.os.Build
+import androidx.core.content.getSystemService
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.afollestad.materialdialogs.MaterialDialog
+import org.autojs.autojs.external.ScriptIntents
 import org.autojs.autojs6.R

 /**
@@ -83,4 +89,28 @@ object ShortcutUtils {
            .build().also { it.show() }
    }

+    @JvmStatic
+    @JvmOverloads
+    fun getAllShortcuts(context: Context, componentName: String? = null): List<ShortcutInfo> = when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 -> {
+            context.getSystemService<ShortcutManager>()?.let { manager ->
+                manager.pinnedShortcuts.filter { shortcut ->
+                    componentName == null || shortcut.intent?.component?.className == componentName
+                }
+            }
+        }
+        else -> null
+    } ?: emptyList()
+
+    @JvmStatic
+    @JvmOverloads
+    fun getAllShortcutScriptPaths(context: Context, componentName: String? = null): List<String> = when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 -> {
+            getAllShortcuts(context, componentName).mapNotNull { shortcut ->
+                shortcut.intent?.getStringExtra(ScriptIntents.EXTRA_KEY_PATH)
+            }
+        }
+        else -> emptyList()
+    }
+
 }
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -81,7 +81,7 @@
    <string name="description_root_mode_preference">If you have exotic root or abnormal state for root access, you can force set root to root or non-root.</string>
    <string name="description_root_record_out_file_type_preference">Binary type: non-editable, with the file extension \"auto\"\nJavaScript type: can be edited or copied directly, with the file extension \"js\"</string>
    <string name="description_stable_mode">Stable mode makes it more stable when getting layout bounds, but some results may be ignored.\nA11y service\'s restart required.</string>
-    <string name="description_theme_color_preference">Theme color is applied to widgets including but not limited to the following ones:\nStatus bar\nAppbar\nFile icon\nTask item icon\nFab\nSettings category title\nSwitch button\n\nNote: As of AutoJs6 version 6.2.0, there has been no difference between primary color, primary dark color and accent color yet.</string>
+    <string name="description_theme_color_preference">Theme color is applied to widgets including but not limited to the following ones:\nStatus bar\nAppbar\nFile icon\nTask item icon\nFAB\nSettings category title\nSwitch button\n\nNote: As of AutoJs6 version 6.2.0, there has been no difference between primary color, primary dark color and accent color yet.</string>
    <string name="description_version_histories_preference">View the release version history and key category statistics of AutoJs6 on GitHub.</string>
    <string name="dialog_button_back">@string/text_back</string>
    <string name="dialog_button_cancel">Cancel</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -84,7 +84,7 @@
    <string name="description_root_mode_preference">Si tiene una raíz exótica o un estado anormal para el acceso a la raíz, puede forzar el establecimiento de la raíz a raíz o no raíz.</string>
    <string name="description_root_record_out_file_type_preference">Tipo binario: no editable, con la extensión de archivo \"auto\"\nTipo JavaScript: se puede editar o copiar directamente, con la extensión de archivo \"js\"</string>
    <string name="description_stable_mode">El modo estable hace que sea más estable al obtener los límites de diseño, pero algunos resultados pueden ser ignorados.\nEs necesario reiniciar el servicio de accesibilidad.</string>
-    <string name="description_theme_color_preference">El color del tema se aplica a los widgets, incluidos, entre otros, los siguientes\nBarra de estado\nBarra de aplicaciones\nIcono de archivo\nIcono de elemento de tarea\nFab\nTítulo de la categoría de ajustes\nBotón de cambio\n\nNota: A partir de la versión 6.2.0 de AutoJs6, todavía no hay diferencia entre el color primario, el color primario oscuro y el color de acento.</string>
+    <string name="description_theme_color_preference">El color del tema se aplica a los widgets, incluidos, entre otros, los siguientes\nBarra de estado\nBarra de aplicaciones\nIcono de archivo\nIcono de elemento de tarea\nFAB\nTítulo de la categoría de ajustes\nBotón de cambio\n\nNota: A partir de la versión 6.2.0 de AutoJs6, todavía no hay diferencia entre el color primario, el color primario oscuro y el color de acento.</string>
    <string name="description_version_histories_preference">Ver el historial de versiones publicadas de AutoJs6 en GitHub y las estadísticas de las categorías importantes.</string>
    <string name="dialog_button_back">@string/text_back</string>
    <string name="dialog_button_cancel">Cancelar</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -84,7 +84,7 @@
    <string name="description_root_mode_preference">Si vous avez un accès exotique à la racine ou un état anormal pour l\'accès à la racine, vous pouvez forcer le réglage de la racine sur racine ou non-racine.</string>
    <string name="description_root_record_out_file_type_preference">Type binaire : non modifiable, avec l\'extension de fichier \"auto\".\nType JavaScript : peut être édité ou copié directement, avec l\'extension de fichier \"js\".</string>
    <string name="description_stable_mode">Le mode stable le rend plus stable lors de l\'obtention des limites de mise en page, mais certains résultats peuvent être ignorés.\nA11y service\'s restart required.</string>
-    <string name="description_theme_color_preference">La couleur du thème est appliquée aux widgets, y compris, mais sans s\'y limiter, aux widgets suivants :\nBarre d\'état\nBarre d\'applications\nIcône de fichier\nIcône d\'élément de tâche\nFab\nTitre de la catégorie Paramètres\nBouton de commutation\n\nRemarque : Depuis la version 6.2.0 d\'AutoJs6, il n\'y a pas encore de différence entre la couleur primaire, la couleur primaire foncée et la couleur d\'accentuation.</string>
+    <string name="description_theme_color_preference">La couleur du thème est appliquée aux widgets, y compris, mais sans s\'y limiter, aux widgets suivants :\nBarre d\'état\nBarre d\'applications\nIcône de fichier\nIcône d\'élément de tâche\nFAB\nTitre de la catégorie Paramètres\nBouton de commutation\n\nRemarque : Depuis la version 6.2.0 d\'AutoJs6, il n\'y a pas encore de différence entre la couleur primaire, la couleur primaire foncée et la couleur d\'accentuation.</string>
    <string name="description_version_histories_preference">Consulter l\'historique des versions publiées d\'AutoJs6 sur GitHub ainsi que les statistiques des principales catégories.</string>
    <string name="dialog_button_back">@string/text_back</string>
    <string name="dialog_button_cancel">Cancel</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -84,7 +84,7 @@
    <string name="description_root_mode_preference">Если у вас есть экзотический root или аномальное состояние для root-доступа, вы можете принудительно установить root на root или non-root.</string>
    <string name="description_root_record_out_file_type_preference">Бинарный тип: не редактируемый, с расширением файла \"auto\"\nТип JavaScript: может быть отредактирован или скопирован напрямую, с расширением файла \"js\".</string>
    <string name="description_stable_mode">Стабильный режим повышает стабильность при получении границ макета, но некоторые результаты могут быть проигнорированы.\nТребуется перезапуск службы доступности.</string>
-    <string name="description_theme_color_preference">Цвет темы применяется к виджетам, включая следующие, но не ограничиваясь ими:\nСтрока состояния\nПанель приложений\nЗначок файла\nЗначок элемента задачи\nFab\nЗаголовок каталога настроек\nКнопка переключения\n\nПримечание: Начиная с версии AutoJs6 6.2.0, пока не существует различий между основным цветом, основным темным цветом и цветом акцента.</string>
+    <string name="description_theme_color_preference">Цвет темы применяется к виджетам, включая следующие, но не ограничиваясь ими:\nСтрока состояния\nПанель приложений\nЗначок файла\nЗначок элемента задачи\nFAB\nЗаголовок каталога настроек\nКнопка переключения\n\nПримечание: Начиная с версии AutoJs6 6.2.0, пока не существует различий между основным цветом, основным темным цветом и цветом акцента.</string>
    <string name="description_version_histories_preference">Просмотреть историю выпусков AutoJs6 на GitHub и статистику по основным категориям.</string>
    <string name="dialog_button_back">@string/text_back</string>
    <string name="dialog_button_cancel">Отменить</string>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -82,7 +82,7 @@
    <string name="description_root_mode_preference">如果設備使用非常規 Root 方式或 Root 權限檢測結果異常, 可設置 \"強制 Root 模式\" 或 \"強制非 Root 模式\".</string>
    <string name="description_root_record_out_file_type_preference">二進制文件: 不可編輯, 文件擴展名為 \"auto\"\nJavaScript 文件: 可編輯或直接複製, 文件擴展名為 \"js\"</string>
    <string name="description_stable_mode">穩定模式省略佈局細節, 腳本分析佈局時更穩定, 但可能影響獲取的控件總量.\n需重啓無障礙服務.</string>
-    <string name="description_theme_color_preference">主題色的應用範圍包括但不限於以下部件:\n系統通知欄\n應用欄 (AppBar)\n文件圖標\n任務項圖標\n浮動操作按鈕 (Fab)\n設置頁面類別標題\n按鈕開關\n\n注: 截至 6.2.0 版本, AutoJs6 主題色暫未對 [ 主要色 (Primary Color) / 主要暗色 (Primary Dark Color) / 強調色 (Accent Color) ] 作出區分.</string>
+    <string name="description_theme_color_preference">主題色的應用範圍包括但不限於以下部件:\n系統通知欄\n應用欄 (AppBar)\n文件圖標\n任務項圖標\n浮動操作按鈕 (FAB)\n設置頁面類別標題\n按鈕開關\n\n注: 截至 6.2.0 版本, AutoJs6 主題色暫未對 [ 主要色 (Primary Color) / 主要暗色 (Primary Dark Color) / 強調色 (Accent Color) ] 作出區分.</string>
    <string name="description_version_histories_preference">查看 AutoJs6 在 GitHub 發行版本的歷史更新記錄及重要分類的統計數據.</string>
    <string name="dialog_button_back">@string/text_back</string>
    <string name="dialog_button_cancel">取消</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -82,7 +82,7 @@
    <string name="description_root_mode_preference">如果裝置使用非常規 Root 方式或 Root 許可權檢測結果異常, 可設定 \"強制 Root 模式\" 或 \"強制非 Root 模式\".</string>
    <string name="description_root_record_out_file_type_preference">二進位制檔案: 不可編輯, 副檔名為 \"auto\"\nJavaScript 檔案: 可編輯或直接複製, 副檔名為 \"js\"</string>
    <string name="description_stable_mode">穩定模式省略佈局細節, 指令碼分析佈局時更穩定, 但可能影響獲取的控制元件總量.\n需重啟無障礙服務.</string>
-    <string name="description_theme_color_preference">主題色的應用範圍包括但不限於以下部件:\n系統通知欄\n應用欄 (AppBar)\n檔案圖示\n任務項圖示\n浮動操作按鈕 (Fab)\n設定頁面類別標題\n按鈕開關\n\n注: 截至 6.2.0 版本, AutoJs6 主題色暫未對 [ 主要色 (Primary Color) / 主要暗色 (Primary Dark Color) / 強調色 (Accent Color) ] 作出區分.</string>
+    <string name="description_theme_color_preference">主題色的應用範圍包括但不限於以下部件:\n系統通知欄\n應用欄 (AppBar)\n檔案圖示\n任務項圖示\n浮動操作按鈕 (FAB)\n設定頁面類別標題\n按鈕開關\n\n注: 截至 6.2.0 版本, AutoJs6 主題色暫未對 [ 主要色 (Primary Color) / 主要暗色 (Primary Dark Color) / 強調色 (Accent Color) ] 作出區分.</string>
    <string name="description_version_histories_preference">檢視 AutoJs6 在 GitHub 發行版本的歷史更新記錄及重要分類的統計資料.</string>
    <string name="dialog_button_back">@string/text_back</string>
    <string name="dialog_button_cancel">取消</string>
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -75,6 +75,7 @@
    <string name="description_file_extensions_preference">用于设置是否在 AutoJs6 文件管理器中显示文件扩展名.</string>
    <string name="description_hidden_files_preference">用于设置是否在 AutoJs6 文件管理器中显示隐藏文件和文件夹 (通常以 \".\" 开头).</string>
    <string name="description_keep_screen_on_when_in_foreground_preference">用于当 AutoJs6 位于前台时使设备屏幕保持常亮.\n如需在 AutoJs6 应用的所有页面中, 仅在主页时保持设备屏幕常亮, 可选择 \"仅限主页\" 选项.</string>
+    <string name="description_launcher_icon_preference">启动器图标支持自适应图标显示方式与传统透明背景图标显示方式. 不同安卓系统的图标实际显示效果可能有所不同. 切换显示方式后, 可能需要几秒钟的时间生效.</string>
    <string name="description_launcher_shortcuts">快捷方式可以在 AutoJs6 中执行特定操作, 用户可以在启动器中显示这些快捷方式, 并快速开始某些任务或启动某个活动, 如阅读 AutoJs6 应用文档, 启动 AutoJs6 设置页面等.</string>
    <string name="description_manage_ignored_updates_preference">点击可查看或管理列表项.\n长按可移除列表项.</string>
    <string name="description_night_mode_preference">夜间模式, 亦称 [ 暗黑模式 / 深色主题 ] 等.\n夜间模式应用于安卓系统 UI (如通知栏和导航栏) 及 AutoJs6 应用页面.\n夜间模式可提升设备在低光环境下的易用性, 同时有助于提升弱视或光敏感用户的视觉体验.\n\n跟随系统: AutoJs6 与安卓操作系统的夜间模式设置一致\n总是开启: AutoJs6 保持开启夜间模式 (忽略操作系统设置)\n总是关闭: AutoJs6 保持关闭夜间模式 (忽略操作系统设置)\n\n注: 跟随系统功能仅支持安卓 API 级别 28 (安卓 9) [P] 及以上操作系统.</string>
@@ -82,7 +83,7 @@
    <string name="description_root_mode_preference">如果设备使用非常规 Root 方式或 Root 权限检测结果异常, 可设置 \"强制 Root 模式\" 或 \"强制非 Root 模式\".</string>
    <string name="description_root_record_out_file_type_preference">二进制文件: 不可编辑, 文件扩展名为 \"auto\"\nJavaScript 文件: 可编辑或直接复制, 文件扩展名为 \"js\"</string>
    <string name="description_stable_mode">稳定模式省略布局细节, 脚本分析布局时更稳定, 但可能影响获取的控件总量.\n需重启无障碍服务.</string>
-    <string name="description_theme_color_preference">主题色的应用范围包括但不限于以下部件:\n系统通知栏\n应用栏 (AppBar)\n文件图标\n任务项图标\n浮动操作按钮 (Fab)\n设置页面类别标题\n按钮开关\n\n注: 截至 6.2.0 版本, AutoJs6 主题色暂未对 [ 主要色 (Primary Color) / 主要暗色 (Primary Dark Color) / 强调色 (Accent Color) ] 作出区分.</string>
+    <string name="description_theme_color_preference">主题色的应用范围包括但不限于以下部件:\n系统通知栏\n应用栏 (AppBar)\n文件图标\n任务项图标\n浮动操作按钮 (FAB)\n设置页面类别标题\n按钮开关\n\n注: 截至 6.2.0 版本, AutoJs6 主题色暂未对 [ 主要色 (Primary Color) / 主要暗色 (Primary Dark Color) / 强调色 (Accent Color) ] 作出区分.</string>
    <string name="description_version_histories_preference">查看 AutoJs6 在 GitHub 发行版本的历史更新记录及重要分类的统计数据.</string>
    <string name="dialog_button_back">@string/text_back</string>
    <string name="dialog_button_cancel">取消</string>
@@ -138,6 +139,8 @@
    <string name="entry_keep_screen_on_when_in_foreground_all_pages">所有页面</string>
    <string name="entry_keep_screen_on_when_in_foreground_disabled">禁用</string>
    <string name="entry_keep_screen_on_when_in_foreground_homepage_only">仅限主页</string>
+    <string name="entry_launcher_icon_adaptive">自适应图标</string>
+    <string name="entry_launcher_icon_transparent_background">透明背景图标</string>
    <string name="entry_night_mode_always_off">总是关闭</string>
    <string name="entry_night_mode_always_on">总是开启</string>
    <string name="entry_night_mode_follow_system">跟随系统</string>
@@ -910,6 +913,7 @@
    <string name="text_result">结果</string>
    <string name="text_revoke_autojs6_access_in_shizuku_app">在 Shizuku 应用中撤销 AutoJs6 权限</string>
    <string name="text_root_mode_title">强制 Root 权限检查</string>
+    <string name="text_launcher_icon_title">启动器图标</string>
    <string name="text_run">运行</string>
    <string name="text_run_on_battery_change">电量变化时</string>
    <string name="text_run_on_boot">开机时</string>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -48,6 +48,16 @@
        <item>@string/entry_app_language_ar</item>
    </string-array>

+    <string-array name="keys_launcher_icon">
+        <item>@string/key_launcher_icon_adaptive</item>
+        <item>@string/key_launcher_icon_transparent_background</item>
+    </string-array>
+
+    <string-array name="values_launcher_icon">
+        <item>@string/entry_launcher_icon_adaptive</item>
+        <item>@string/entry_launcher_icon_transparent_background</item>
+    </string-array>
+
    <string-array name="keys_night_mode">
        <item>@string/key_night_mode_follow_system</item>
        <item>@string/key_night_mode_always_on</item>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -114,6 +114,9 @@
    <string name="key_last_updates_auto_checked" translatable="false">key_$_last_updates_auto_checked</string>
    <string name="key_last_updates_checked" translatable="false">key_$_last_updates_checked</string>
    <string name="key_last_updates_postponed" translatable="false">key_$_last_updates_postponed</string>
+    <string name="key_launcher_icon" translatable="false">key_$_launcher_icon</string>
+    <string name="key_launcher_icon_adaptive" translatable="false">key_$_launcher_icon_adaptive</string>
+    <string name="key_launcher_icon_transparent_background" translatable="false">key_$_launcher_icon_transparent_background</string>
    <string name="key_launcher_shortcuts" translatable="false">key_$_launcher_shortcuts</string>
    <string name="key_manage_ignored_updates" translatable="false">key_$_manage_ignored_updates</string>
    <string name="key_night_mode" translatable="false">key_$_night_mode</string>
@@ -305,6 +308,7 @@
    <string name="description_file_extensions_preference">Used to set whether to show file extensions in AutoJs6 file explorer.</string>
    <string name="description_hidden_files_preference">Used to set whether to show hidden files and folders (usually starting with \".\") in AutoJs6 file explorer.</string>
    <string name="description_keep_screen_on_when_in_foreground_preference">Preference for keeping the device\'s screen turned on and bright when AutoJs6 is in the foreground.\nTo make it happen only on the homepage among all pages of the AutoJs6 application, choose \"homepage only\" option.</string>
+    <string name="description_launcher_icon_preference">Launcher icon supports both adaptive icon or legacy transparent background icon display modes. The actual display effect may vary on different Android systems. It may take a few seconds to take effect after switching display modes.</string>
    <string name="description_launcher_shortcuts">Shortcuts can perform specific actions in AutoJs6. Users can display these shortcuts in a supported launcher and quickly start some tasks or launch an activity, such as reading AutoJs6 application documentation, launching AutoJs6 settings page, and so on.</string>
    <string name="description_manage_ignored_updates_preference">Click to view or manage list items.\nLong press to remove the list item.</string>
    <string name="description_night_mode_preference">Night mode (also known as Dark theme) applies to both the Android system UI and apps running on the device, which improves visibility for users with low vision and those who are sensitive to bright light, and makes it easier for anyone to use a device in a low-light environment.\n\nFollow system: AutoJs6 has Night mode settings same as Android system\nAlways on: AutoJs6 keeps Night mode on (regardless of Android system settings)\nAlways off: AutoJs6 keeps Night mode off (regardless of Android system settings)\n\nNote: Follow system option is only for Android API Level 28 (Android 9) [P] and above.</string>
@@ -312,7 +316,7 @@
    <string name="description_root_mode_preference">If you have exotic root or abnormal state for root access, you can force set root to root or non-root.</string>
    <string name="description_root_record_out_file_type_preference">Binary type: non-editable, with the file extension \"auto\"\nJavaScript type: can be edited or copied directly, with the file extension \"js\"</string>
    <string name="description_stable_mode">Stable mode makes it more stable when getting layout bounds, but some results may be ignored.\nA11y service\'s restart required.</string>
-    <string name="description_theme_color_preference">Theme color is applied to widgets including but not limited to the following ones:\nStatus bar\nAppbar\nFile icon\nTask item icon\nFab\nSettings category title\nSwitch button\n\nNote: As of AutoJs6 version 6.2.0, there has been no difference between primary color, primary dark color and accent color yet.</string>
+    <string name="description_theme_color_preference">Theme color is applied to widgets including but not limited to the following ones:\nStatus bar\nAppbar\nFile icon\nTask item icon\nFAB\nSettings category title\nSwitch button\n\nNote: As of AutoJs6 version 6.2.0, there has been no difference between primary color, primary dark color and accent color yet.</string>
    <string name="description_version_histories_preference">View the release version history and key category statistics of AutoJs6 on GitHub.</string>
    <string name="dialog_button_back">@string/text_back</string>
    <string name="dialog_button_cancel">Cancel</string>
@@ -368,6 +372,8 @@
    <string name="entry_keep_screen_on_when_in_foreground_all_pages">All pages</string>
    <string name="entry_keep_screen_on_when_in_foreground_disabled">Disabled</string>
    <string name="entry_keep_screen_on_when_in_foreground_homepage_only">Homepage only</string>
+    <string name="entry_launcher_icon_adaptive">Adaptive icon</string>
+    <string name="entry_launcher_icon_transparent_background">Transparent background icon</string>
    <string name="entry_night_mode_always_off">Always off</string>
    <string name="entry_night_mode_always_on">Always on</string>
    <string name="entry_night_mode_follow_system">Follow system</string>
@@ -1140,6 +1146,7 @@
    <string name="text_result">Result</string>
    <string name="text_revoke_autojs6_access_in_shizuku_app">Revoke AutoJs6 access in Shizuku app</string>
    <string name="text_root_mode_title">Force set root check</string>
+    <string name="text_launcher_icon_title">Launcher icon</string>
    <string name="text_run">Run</string>
    <string name="text_run_on_battery_change">On battery changed</string>
    <string name="text_run_on_boot">On booted</string>
--- a/app/src/main/res/xml/fragment_preferences.xml
+++ b/app/src/main/res/xml/fragment_preferences.xml
@@ -60,6 +60,15 @@
            app:longClickPrompt="@string/description_documentation_source_preference"
            app:longClickPromptMore="@string/description_documentation_source_preference_more" />

+        <org.autojs.autojs.ui.settings.LauncherIconPreference
+            app:layout="@layout/preference_custom"
+            app:key="@string/key_launcher_icon"
+            app:title="@string/text_launcher_icon_title"
+            app:itemKeys="@array/keys_launcher_icon"
+            app:itemValues="@array/values_launcher_icon"
+            app:itemDefaultKey="@string/key_launcher_icon_adaptive"
+            app:longClickPrompt="@string/description_launcher_icon_preference" />
+
        <org.autojs.autojs.ui.settings.LauncherShortcutsPreference
            app:layout="@layout/preference_custom"
            app:key="@string/key_launcher_shortcuts"
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
-#Wed Jul 16 14:49:49 CST 2025
-BUILD_TIME=1752648589445
+#Fri Jul 18 17:26:09 CST 2025
+BUILD_TIME=1752830769071
 COMPILE_SDK_VERSION=35
 IMAGE_QUANT_CMAKE_VERSION=3.22.1
 IMAGE_QUANT_NDK_VERSION=26.1.10909125
@@ -19,6 +19,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
 TARGET_SDK_VERSION=35
 TARGET_SDK_VERSION_INRT=29
-VERSION_BUILD=3323
+VERSION_BUILD=3331
 VERSION_NAME=6.7.0 Alpha3
 VSCODE_EXT_REQUIRED_VERSION=1.0.8