From 05e083f8e6102398746b76cb8d6be0af1d1220a8 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Fri, 25 Mar 2022 14:37:41 +0800
Subject: [PATCH] Merge code

---
 app/src/main/java/com/fankes/coloros/notify/hook/HookConst.kt  | 1 +
 .../com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/fankes/coloros/notify/hook/HookConst.kt b/app/src/main/java/com/fankes/coloros/notify/hook/HookConst.kt
index ff2ff97..d57eba2 100644
--- a/app/src/main/java/com/fankes/coloros/notify/hook/HookConst.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/hook/HookConst.kt
@@ -42,5 +42,6 @@ object HookConst {
     const val TYPE_SOURCE_SYNC_WAY_2 = 2000
     const val TYPE_SOURCE_SYNC_WAY_3 = 3000
 
+    const val ANDROID_PACKAGE_NAME = "android"
     const val SYSTEMUI_PACKAGE_NAME = "com.android.systemui"
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt b/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
index a3b53b0..3abba11 100644
--- a/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
@@ -42,6 +42,7 @@ import android.widget.ImageView
 import androidx.core.graphics.drawable.toBitmap
 import com.fankes.coloros.notify.bean.IconDataBean
 import com.fankes.coloros.notify.const.Const
+import com.fankes.coloros.notify.hook.HookConst.ANDROID_PACKAGE_NAME
 import com.fankes.coloros.notify.hook.HookConst.ENABLE_ANDROID12_STYLE
 import com.fankes.coloros.notify.hook.HookConst.ENABLE_MODULE_LOG
 import com.fankes.coloros.notify.hook.HookConst.ENABLE_NOTIFY_ICON_FIX
@@ -330,7 +331,7 @@ class SystemUIHooker : YukiBaseHooker() {
         var customPair: Pair<Bitmap?, Int>? = null
         when {
             /** 替换系统图标为 Android 默认 */
-            (packageName == "android" || packageName == SYSTEMUI_PACKAGE_NAME) && !isGrayscaleIcon ->
+            (packageName == ANDROID_PACKAGE_NAME || packageName == SYSTEMUI_PACKAGE_NAME) && !isGrayscaleIcon ->
                 customPair = Pair(if (isUpperOfAndroidS) IconPackParams.android12IconBitmap else IconPackParams.android11IconBitmap, 0)
             /** 替换自定义通知图标 */
             prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true) -> run {