tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.7.0 - Alpha3 - 修复启动器图标无法显示快捷方式菜单的问题

Browse Source
This commit is contained in:
SuperMonster003
2025-07-23 14:51:04 +08:00
parent 13369983bb
commit 21b6e413cc
3 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/AndroidManifest.xml
View File

@@ -231,6 +231,10 @@
</intent-filter> </intent-filter>
<meta-data
android:name="android.app.shortcuts"
android:resource="@xml/app_shortcuts" />
</activity-alias> </activity-alias>
<activity-alias <activity-alias
@@ -248,6 +252,10 @@
</intent-filter> </intent-filter>
<meta-data
android:name="android.app.shortcuts"
android:resource="@xml/app_shortcuts" />
</activity-alias> </activity-alias>
<activity <activity

43
app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt
View File

@@ -160,29 +160,32 @@ class LauncherIconPreference : MaterialListPreference, SharedPreferences.OnShare
) )
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
ctx.getSystemService(ShortcutManager::class.java)?.let { sm -> ctx.getSystemService(ShortcutManager::class.java)?.let { sm ->
sm.pinnedShortcuts.mapNotNull { shortcutInfo -> sm.pinnedShortcuts
ShortcutInfo.Builder(ctx, shortcutInfo.id).apply { .filterNot { it.isDeclaredInManifest }
shortcutInfo.intent?.let { .filterNot { Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && it.isImmutable }
it.component?.let { component -> .mapNotNull { shortcutInfo ->
setActivity(ComponentName(component.packageName, component.className)) 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 { } ?: run {
setActivity(ComponentName(ctx, ShortcutActivity::class.java)) setActivity(ComponentName(ctx, ShortcutActivity::class.java))
setIntent(Intent(ctx, ShortcutActivity::class.java))
} }
setIntent(it) (shortcutInfo.shortLabel ?: shortcutInfo.longLabel)?.let {
} ?: run { setShortLabel(it)
setActivity(ComponentName(ctx, ShortcutActivity::class.java)) }
setIntent(Intent(ctx, ShortcutActivity::class.java)) (shortcutInfo.longLabel ?: shortcutInfo.shortLabel)?.let {
} setLongLabel(it)
(shortcutInfo.shortLabel ?: shortcutInfo.longLabel)?.let { }
setShortLabel(it) }.build()
} }.takeUnless { it.isEmpty() }?.let { toUpdate ->
(shortcutInfo.longLabel ?: shortcutInfo.shortLabel)?.let { sm.updateShortcuts(toUpdate)
setLongLabel(it) }
}
}.build()
}.takeUnless { it.isEmpty() }?.let { toUpdate ->
sm.updateShortcuts(toUpdate)
}
} }
} }

6
version.properties
View File

@@ -1,5 +1,5 @@
#Mon Jul 21 18:22:17 CST 2025 #Wed Jul 23 14:44:12 CST 2025
BUILD_TIME=1753093337104 BUILD_TIME=1753253052464
COMPILE_SDK_VERSION=35 COMPILE_SDK_VERSION=35
IMAGE_QUANT_CMAKE_VERSION=3.22.1 IMAGE_QUANT_CMAKE_VERSION=3.22.1
IMAGE_QUANT_NDK_VERSION=26.1.10909125 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 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
TARGET_SDK_VERSION=35 TARGET_SDK_VERSION=35
TARGET_SDK_VERSION_INRT=29 TARGET_SDK_VERSION_INRT=29
VERSION_BUILD=3336 VERSION_BUILD=3337
VERSION_NAME=6.7.0 Alpha3 VERSION_NAME=6.7.0 Alpha3
VSCODE_EXT_REQUIRED_VERSION=1.0.8 VSCODE_EXT_REQUIRED_VERSION=1.0.8