Fix conflicts

This commit is contained in:
MrSluffy authored and Goooler committed 2024-01-08 16:03:01 +08:00
1 parent 3269857e66
commit 32922a2e02
25 files changed
+39 -358

No files matched your search

+1 -2
View File
@@ -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);
}
}