From f6126dd20ec23d714fbe1357f2ea03ccfcd44c97 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 29 Jan 2021 19:59:08 -0800 Subject: [PATCH] Support Shortcuts pre API 26 Close #3778 --- .../main/java/com/topjohnwu/magisk/view/Shortcuts.kt | 11 +++++------ stub/src/main/AndroidManifest.xml | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt b/app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt index ac5511388..9cac01c3a 100644 --- a/app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt +++ b/app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt @@ -1,6 +1,5 @@ package com.topjohnwu.magisk.view -import android.annotation.TargetApi import android.content.Context import android.content.Intent import android.content.pm.ShortcutInfo @@ -8,6 +7,8 @@ import android.content.pm.ShortcutManager import android.os.Build import androidx.annotation.RequiresApi import androidx.core.content.getSystemService +import androidx.core.content.pm.ShortcutInfoCompat +import androidx.core.content.pm.ShortcutManagerCompat import androidx.core.graphics.drawable.IconCompat import com.topjohnwu.magisk.R import com.topjohnwu.magisk.core.Const @@ -24,16 +25,14 @@ object Shortcuts { } } - @TargetApi(26) fun addHomeIcon(context: Context) { - val manager = context.getSystemService() ?: return val intent = context.packageManager.getLaunchIntentForPackage(context.packageName) ?: return - val info = ShortcutInfo.Builder(context, Const.Nav.HOME) + val info = ShortcutInfoCompat.Builder(context, Const.Nav.HOME) .setShortLabel(context.getString(R.string.magisk)) .setIntent(intent) - .setIcon(context.getIcon(R.drawable.ic_launcher)) + .setIcon(context.getIconCompat(R.drawable.ic_launcher)) .build() - manager.requestPinShortcut(info, null) + ShortcutManagerCompat.requestPinShortcut(context, info, null) } private fun Context.getIconCompat(id: Int): IconCompat { diff --git a/stub/src/main/AndroidManifest.xml b/stub/src/main/AndroidManifest.xml index c17f33675..7ed3c849a 100644 --- a/stub/src/main/AndroidManifest.xml +++ b/stub/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ +