修复在Android O上创建快捷方式失败的问题；替换默认快捷方式图标

2018-07-07 22:47:20 +08:00
parent dc468c7de4
commit e247943035
9 changed files with 62 additions and 30 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
 def AAVersion = '4.3.1'

 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
    defaultConfig {
        applicationId "org.autojs.autojs"
        minSdkVersion 17
--- a/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutManager.java
+++ b/app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutManager.java
@@ -1,15 +1,23 @@
 package org.autojs.autojs.external.shortcut;

+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ShortcutInfo;
 import android.graphics.drawable.Icon;
 import android.os.Build;
+import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;

 import java.util.Collections;
 import java.util.List;

+import io.reactivex.Observable;
+import io.reactivex.subjects.PublishSubject;
+import io.reactivex.subjects.Subject;
+
 /**
 * Created by Stardust on 2017/10/25.
 */
@@ -17,6 +25,7 @@ import java.util.List;
@RequiresApi(api = Build.VERSION_CODES.N_MR1)
 public class ShortcutManager {

+
    private static ShortcutManager sInstance;
    private Context mContext;
    private android.content.pm.ShortcutManager mShortcutManager;
@@ -34,14 +43,35 @@ public class ShortcutManager {
        return sInstance;
    }

-    @RequiresApi(api = Build.VERSION_CODES.N_MR1)
-    public void addDynamicShortcut(CharSequence label, String id, Icon icon, Intent intent) {
-        ShortcutInfo shortcut = new ShortcutInfo.Builder(mContext, id)
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    public void addPinnedShortcut(CharSequence label, String id, Icon icon, Intent intent) {
+        if (!mShortcutManager.isRequestPinShortcutSupported()) {
+            return;
+        }
+        ShortcutInfo shortcut = buildShortcutInfo(label, id, icon, intent);
+        int req = getRequestCode(id);
+        PendingIntent successCallback = PendingIntent.getBroadcast(mContext, req,
+                mShortcutManager.createShortcutResultIntent(shortcut), 0);
+        mShortcutManager.requestPinShortcut(shortcut, successCallback.getIntentSender());
+    }
+
+    private ShortcutInfo buildShortcutInfo(CharSequence label, String id, Icon icon, Intent intent) {
+        return new ShortcutInfo.Builder(mContext, id)
                .setIntent(intent)
                .setShortLabel(label)
                .setLongLabel(label)
                .setIcon(icon)
                .build();
+    }
+
+    private int getRequestCode(String id) {
+        return id.hashCode() >>> 16;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N_MR1)
+    public void addDynamicShortcut(CharSequence label, String id, Icon icon, Intent intent) {
+        ShortcutInfo shortcut = buildShortcutInfo(label, id, icon, intent);
        try {
            addDynamicShortcutUnchecked(shortcut);
        } catch (IllegalArgumentException shortcutsExceeded) {
--- a/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java
+++ b/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java
@@ -1,5 +1,6 @@
 package org.autojs.autojs.ui.common;

+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Environment;
@@ -222,6 +223,7 @@ public class ScriptOperations {
                .putExtra(ShortcutCreateActivity.EXTRA_FILE, file));
    }

+    @SuppressLint("CheckResult")
    public void delete(final ScriptFile scriptFile) {
        Observable.fromPublisher(new Publisher<Boolean>() {
            @Override
--- a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java
@@ -1,5 +1,6 @@
 package org.autojs.autojs.ui.shortcut;

+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ -86,9 +87,11 @@ public class ShortcutCreateActivity extends AppCompatActivity {
    }


+    @SuppressLint("NewApi") //for fool android studio
    private void createShortcut() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && mUseAndroidNShortcut.isChecked()) {
-            createShortcutForAndroidN();
+        if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && mUseAndroidNShortcut.isChecked())
+                || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            createShortcutByShortcutManager();
            return;
        }
        Shortcut shortcut = new Shortcut(this);
@@ -105,22 +108,29 @@ public class ShortcutCreateActivity extends AppCompatActivity {
    }

    @RequiresApi(api = Build.VERSION_CODES.N_MR1)
-    private void createShortcutForAndroidN() {
+    private void createShortcutByShortcutManager() {
        Icon icon;
        if (mIsDefaultIcon) {
-            icon = Icon.createWithResource(this, R.drawable.ic_node_js_black);
+            icon = Icon.createWithResource(this, R.drawable.ic_file_type_js);
        } else {
            Bitmap bitmap = BitmapTool.drawableToBitmap(mIcon.getDrawable());
            icon = Icon.createWithBitmap(bitmap);
        }
        PersistableBundle extras = new PersistableBundle(1);
        extras.putString(ScriptIntents.EXTRA_KEY_PATH, mScriptFile.getPath());
-        ShortcutManager.getInstance(this).addDynamicShortcut(mName.getText(), mScriptFile.getPath(), icon,
-                new Intent(this, ShortcutActivity.class)
-                        .putExtra(ScriptIntents.EXTRA_KEY_PATH, mScriptFile.getPath())
-                        .setAction(Intent.ACTION_MAIN));
+        Intent intent = new Intent(this, ShortcutActivity.class)
+                .putExtra(ScriptIntents.EXTRA_KEY_PATH, mScriptFile.getPath())
+                .setAction(Intent.ACTION_MAIN);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            ShortcutManager.getInstance(this).addPinnedShortcut(mName.getText(), mScriptFile.getPath(), icon, intent);
+        } else {
+            ShortcutManager.getInstance(this).addDynamicShortcut(mName.getText(), mScriptFile.getPath(), icon, intent);
+        }
+
    }

+
    @Override
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
        if (resultCode != RESULT_OK) {
--- a/app/src/main/res/drawable/ic_node_js_black.xml
+++ b/app/src/main/res/drawable/ic_node_js_black.xml
@@ -2,12 +2,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="128dp"
        android:height="128dp"
-        android:viewportWidth="128"
-        android:viewportHeight="128">
+        android:viewportHeight="128"
+        android:viewportWidth="128">

    <path
        android:fillColor="#46483E"
-        android:pathData="M64,14c-27.6,0-50,22.4-50,50s22.4,50,50,50s50-22.4,50-50S91.6,14,64,14z" />
+        android:pathData="M64,14c-27.6,0-50,22.4-50,50s22.4,50,50,50s50-22.4,50-50S91.6,14,64,14z"/>
    <path
        android:fillColor="#81CF08"
        android:pathData="M64,95.9c-0.9,0-1.7-0.2-2.5-0.7l-7.8-4.6c-1.2-0.7-0.6-0.9-0.2-1c1.6-0.6,1.9-0.7,3.5-1.6
@@ -15,11 +15,11 @@ c0.2-0.1,0.4-0.1,0.6,0.1l6,3.6c0.2,0.1,0.5,0.1,0.7,0l23.4-13.5c0.2-0.1,0.4-0.4,0
 c-0.2-0.1-0.5-0.1-0.7,0L40.3,49.8c-0.2,0.1-0.4,0.4-0.4,0.6v27c0,0.2,0.1,0.5,0.4,0.6l6.4,3.7c3.5,1.7,5.6-0.3,5.6-2.4V52.8
 c0-0.4,0.3-0.7,0.7-0.7h3c0.4,0,0.7,0.3,0.7,0.7v26.6c0,4.7-2.5,7.3-6.9,7.3c-1.4,0-2.4,0-5.4-1.5l-6.1-3.5
 c-1.5-0.9-2.5-2.5-2.5-4.3v-27c0-1.7,0.9-3.4,2.5-4.3l23.4-13.5c1.5-0.8,3.5-0.8,4.9,0l23.4,13.5c1.5,0.9,2.5,2.5,2.5,4.3v27
-c0,1.7-0.9,3.4-2.5,4.3L66.5,95.3C65.7,95.7,64.9,95.9,64,95.9z" />
+c0,1.7-0.9,3.4-2.5,4.3L66.5,95.3C65.7,95.7,64.9,95.9,64,95.9z"/>
    <path
        android:fillColor="#81CF08"
        android:pathData="M71.3,77.3c-10.2,0-12.4-4.7-12.4-8.6c0-0.4,0.3-0.7,0.7-0.7h3c0.3,0,0.6,0.2,0.7,0.6c0.4,3.1,1.8,4.6,8,4.6
 c4.9,0,7-1.1,7-3.7c0-1.5-0.6-2.6-8.3-3.4c-6.4-0.6-10.4-2-10.4-7.2c0-4.7,4-7.5,10.7-7.5c7.5,0,11.2,2.6,11.7,8.2
 c0,0.2-0.1,0.4-0.2,0.5c-0.1,0.1-0.3,0.2-0.5,0.2h-3c-0.3,0-0.6-0.2-0.7-0.5c-0.7-3.2-2.5-4.3-7.3-4.3c-5.4,0-6,1.9-6,3.3
-c0,1.7,0.7,2.2,8,3.2c7.2,0.9,10.6,2.3,10.6,7.3C82.9,74.4,78.7,77.3,71.3,77.3z" />
+c0,1.7,0.7,2.2,8,3.2c7.2,0.9,10.6,2.3,10.6,7.3C82.9,74.4,78.7,77.3,71.3,77.3z"/>
 </vector>