Fix conflicts

2024-01-08 15:24:23 +08:00
parent 3269857e66
commit 32922a2e02
25 changed files with 39 additions and 358 deletions
@@ -751,8 +751,7 @@ public final class Utilities {
        } else {
            return Process.myUserHandle().equals(info.user)
                    ? new ColorDrawable(Color.TRANSPARENT)
-                    : context.getDrawable(isIconThemed
-                            ? R.drawable.ic_work_app_badge_themed : R.drawable.ic_work_app_badge);
+                    : context.getDrawable(R.drawable.ic_work_app_badge);
        }
    }