merge codes from test01wrk

Author: zfdang

app/build.gradle

@@ -26,6 +26,7 @@ android {
         multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        resourceConfigurations = ['zh-rCN']
     }
 
     signingConfigs {
@@ -40,11 +41,20 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
     }
+    packagingOptions {
+        jniLibs {
+            excludes += ['pinyindb/*']
+        }
+        resources {
+            excludes += ['pinyindb/*']
+        }
+    }
 
     // http://www.sollyu.com/android-apk-studio-generated-automatically-appends-a-version-number/
     android.applicationVariants.all { variant ->
@@ -57,6 +67,7 @@ android {
         }
     }
 
+
 }
 
 dependencies {

app/proguard-rules.pro

@@ -18,4 +18,39 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class * extends java.io.Serializable { *; }
+
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { <fields>; }
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+
+##---------------End: proguard configuration for Gson  ----------

app/src/main/java/com/zfdang/TouchHelperApp.java

@@ -1,10 +1,12 @@
 package com.zfdang;
 
+import android.annotation.SuppressLint;
 import android.app.Application;
 import android.content.Context;
 
 public class TouchHelperApp extends Application {
 
+    @SuppressLint("StaticFieldLeak")
     private static Context context;
 
     public TouchHelperApp() {

app/src/main/java/com/zfdang/touchhelper/PackageChangeReceiver.java

@@ -15,9 +15,7 @@ public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
 //        Log.d(TAG, action);
         if(action.equals(Intent.ACTION_PACKAGE_ADDED) || action.equals(Intent.ACTION_PACKAGE_REMOVED)) {
-            if (TouchHelperService.serviceImpl != null) {
-                TouchHelperService.serviceImpl.receiverHandler.sendEmptyMessage(TouchHelperService.ACTION_REFRESH_PACKAGE);
-            }
+            TouchHelperService.dispatchAction(TouchHelperService.ACTION_REFRESH_PACKAGE);
         }
     }
 }

app/src/main/java/com/zfdang/touchhelper/PackagePositionDescription.java

@@ -1,6 +1,8 @@
 package com.zfdang.touchhelper;
 
-public class PackagePositionDescription {
+import java.io.Serializable;
+
+public class PackagePositionDescription implements Serializable {
     public String packageName;
     public String activityName;
     public int x;

app/src/main/java/com/zfdang/touchhelper/PackageWidgetDescription.java

@@ -2,9 +2,10 @@
 
 import android.graphics.Rect;
 
+import java.io.Serializable;
 import java.util.Objects;
 
-public class PackageWidgetDescription {
+public class PackageWidgetDescription implements Serializable {
     public String packageName, activityName, className, idName, description, text;
     public Rect position;
     public boolean clickable, onlyClick;

app/src/main/java/com/zfdang/touchhelper/Settings.java

@@ -176,6 +176,7 @@ public boolean setPackageWidgetsInString(String value) {
                 mapPackageWidgets = mJson.fromJson(value, type);
                 mEditor.putString(PACKAGE_WIDGETS, value);
                 mEditor.apply();
+                return true;
             } catch (JsonSyntaxException e) {
                 Log.d(TAG, Utilities.getTraceStackInString(e));
                 return false;

app/src/main/java/com/zfdang/touchhelper/TouchHelperService.java

@@ -2,9 +2,10 @@
 
 import android.accessibilityservice.AccessibilityService;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.view.accessibility.AccessibilityEvent;
 
+import java.lang.ref.WeakReference;
+
 public class TouchHelperService extends AccessibilityService {
 
     public final static int ACTION_REFRESH_KEYWORDS = 1;
@@ -13,15 +14,17 @@ public class TouchHelperService extends AccessibilityService {
     public final static int ACTION_ACTIVITY_CUSTOMIZATION = 4;
     public final static int ACTION_STOP_SERVICE = 5;
     public final static int ACTION_START_SKIPAD = 6;
+    public final static int ACTION_STOP_SKIPAD = 7;
 
-    public static TouchHelperServiceImpl serviceImpl = null;
+    private static WeakReference<TouchHelperService> sServiceRef;
+    private TouchHelperServiceImpl serviceImpl;
 
-    final private String TAG = getClass().getName();
+    private final String TAG = getClass().getName();
 
     @Override
     protected void onServiceConnected() {
         super.onServiceConnected();
-
+        sServiceRef = new WeakReference<>(this);
         if (serviceImpl == null) {
             serviceImpl = new TouchHelperServiceImpl(this);
         }
@@ -50,6 +53,21 @@ public boolean onUnbind(Intent intent) {
             serviceImpl.onUnbind(intent);
             serviceImpl = null;
         }
+        sServiceRef = null;
         return super.onUnbind(intent);
     }
+
+    public static boolean dispatchAction(int action) {
+        final TouchHelperService service = sServiceRef != null ? sServiceRef.get() : null;
+        if (service == null || service.serviceImpl == null) {
+            return false;
+        }
+        service.serviceImpl.receiverHandler.sendEmptyMessage(action);
+        return true;
+    }
+
+    public static boolean isServiceRunning() {
+        final TouchHelperService service = sServiceRef != null ? sServiceRef.get() : null;
+        return service != null && service.serviceImpl != null;
+    }
 }