Remove obsolete API level checks

This commit is contained in:
MM20
2022-01-29 19:32:53 +01:00
parent 05680afcd5
commit 97ba10d3a7
17 changed files with 105 additions and 135 deletions
@@ -10,7 +10,6 @@ import androidx.annotation.RequiresApi
import java.util.*
import kotlin.math.roundToInt
@RequiresApi(Build.VERSION_CODES.O)
class ClockDynamicLauncherIcon(
foreground: LayerDrawable,
background: Drawable?,
@@ -14,7 +14,6 @@ import de.mm20.launcher2.search.data.Searchable
class GoogleClockIconProvider(val context: Context) : IconProvider {
override suspend fun getIcon(searchable: Searchable, size: Int): LauncherIcon? {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return null
if (searchable !is Application) return null
if (searchable.`package` != "com.google.android.deskclock") return null
val pm = context.packageManager
@@ -48,7 +48,7 @@ class IconPackIconProvider(
?: return generateIcon(context, searchable.launcherActivityInfo, size)
val drawable = ResourcesCompat.getDrawable(res, resId, context.theme) ?: return null
return when {
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && drawable is AdaptiveIconDrawable -> {
drawable is AdaptiveIconDrawable -> {
LauncherIcon(
foreground = drawable.foreground,
background = drawable.background,
@@ -81,9 +81,6 @@ class ThemedIconProvider(
}
private fun getClockIcon(resources: Resources, resId: Int): LauncherIcon? {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
return null
}
try {
val array = resources.obtainTypedArrayOrNull(resId) ?: return null
var i = 0