Merge code

This commit is contained in:
2022-03-25 14:30:51 +08:00
parent 287afae3cc
commit 618fd8af0e

View File

@@ -330,7 +330,7 @@ class SystemUIHooker : YukiBaseHooker() {
var customPair: Pair<Bitmap?, Int>? = null
when {
/** 替换系统图标为 Android 默认 */
(packageName == "android" || packageName == "com.android.systemui") && !isGrayscaleIcon ->
(packageName == "android" || packageName == SYSTEMUI_PACKAGE_NAME) && !isGrayscaleIcon ->
customPair = Pair(if (isUpperOfAndroidS) IconPackParams.android12IconBitmap else IconPackParams.android11IconBitmap, 0)
/** 替换自定义通知图标 */
prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true) -> run {