From a38bc53b6155af6f40a32eee83114d833e74ae43 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Fri, 30 Nov 2018 14:52:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B4=A9=E6=BA=83=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E5=A2=9E=E5=8A=A0=20=E6=9F=A5=E7=9C=8B=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=BB=9F=E8=AE=A1=E6=9D=83=E9=99=90=E7=9A=84=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autojs/ui/main/drawer/DrawerFragment.java       | 13 ++++++++++++-
 app/src/main/res/layout/activity_build.xml          |  4 ++--
 .../main/res/layout/air_activity_issue_reporter.xml |  4 ++--
 app/src/main/res/layout/air_card_report_compat.xml  |  2 +-
 app/src/main/res/values/strings.xml                 |  1 +
 .../stardust/autojs/core/graphics/ScriptCanvas.java |  5 +++++
 inrt/src/main/res/layout/activity_main.xml          |  2 +-
 inrt/src/main/res/layout/activity_settings.xml      |  2 +-
 8 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java
index 16ebcaa5..b5947cc7 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java
@@ -2,6 +2,7 @@ package org.autojs.autojs.ui.main.drawer;
 
 import android.annotation.SuppressLint;
 import android.app.AppOpsManager;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
@@ -238,7 +239,17 @@ public class DrawerFragment extends androidx.fragment.app.Fragment {
         }
         boolean enabled = AppOpsKt.isOpPermissionGranted(getContext(), AppOpsManager.OPSTR_GET_USAGE_STATS);
         boolean checked = holder.getSwitchCompat().isChecked();
-        if ((checked && !enabled) || (!checked && enabled)) {
+        if(checked && !enabled){
+            if(new NotAskAgainDialog.Builder(getContext(), "DrawerFragment.usage_stats")
+                    .title(R.string.text_usage_stats_permission)
+                    .content(R.string.description_usage_stats_permission)
+                    .positiveText(R.string.ok)
+                    .dismissListener(dialog -> IntentUtil.requestAppUsagePermission(getContext()))
+                    .show() == null){
+                IntentUtil.requestAppUsagePermission(getContext());
+            }
+        }
+        if (!checked && enabled) {
             IntentUtil.requestAppUsagePermission(getContext());
         }
     }
diff --git a/app/src/main/res/layout/activity_build.xml b/app/src/main/res/layout/activity_build.xml
index 58e80db1..4acdc1fd 100644
--- a/app/src/main/res/layout/activity_build.xml
+++ b/app/src/main/res/layout/activity_build.xml
@@ -76,7 +76,7 @@
 
                             </com.google.android.material.textfield.TextInputLayout>
 
-                            <android.support.v7.widget.AppCompatButton
+                            <androidx.appcompat.widget.AppCompatButton
                                 android:id="@+id/select_source"
                                 style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
                                 android:layout_width="60dp"
@@ -106,7 +106,7 @@
 
                             </com.google.android.material.textfield.TextInputLayout>
 
-                            <android.support.v7.widget.AppCompatButton
+                            <androidx.appcompat.widget.AppCompatButton
                                 android:id="@+id/select_output"
                                 style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
                                 android:layout_width="60dp"
diff --git a/app/src/main/res/layout/air_activity_issue_reporter.xml b/app/src/main/res/layout/air_activity_issue_reporter.xml
index b07a667a..b86892c5 100644
--- a/app/src/main/res/layout/air_activity_issue_reporter.xml
+++ b/app/src/main/res/layout/air_activity_issue_reporter.xml
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/air_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
@@ -67,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/air_card_margin_top"/>
 
-                <androidx.core.widget.Space
+                <android.widget.Space
                     android:layout_width="match_parent"
                     android:layout_height="56dp"
                     android:layout_margin="@dimen/air_baseline"/>
diff --git a/app/src/main/res/layout/air_card_report_compat.xml b/app/src/main/res/layout/air_card_report_compat.xml
index 6e82d92e..6a555d1b 100644
--- a/app/src/main/res/layout/air_card_report_compat.xml
+++ b/app/src/main/res/layout/air_card_report_compat.xml
@@ -105,7 +105,7 @@
             app:ael_interpolator="fastOutSlowIn"
             app:ael_orientation="vertical">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/air_textDeviceInfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 94dad2ea..07aaf55a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -430,4 +430,5 @@
     <string name="key_night_mode">key_night_mode</string>
     <string name="text_run_on_startup">Auto.js启动时</string>
     <string name="text_usage_stats_permission">查看使用统计权限</string>
+    <string name="description_usage_stats_permission">通过\"查看使用统计\"权限可以获取本设备过去使用应用的情况，从而使获取当前应用(currentPackage)时更准确。</string>
 </resources>
diff --git a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java
index f799a338..d7d79df3 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java
@@ -12,6 +12,7 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Region;
 import android.os.Build;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
@@ -45,6 +46,10 @@ public class ScriptCanvas {
 
     }
 
+    public Canvas getAndroidCanvas() {
+        return mCanvas;
+    }
+
     void setCanvas(Canvas canvas) {
         mCanvas = canvas;
     }
diff --git a/inrt/src/main/res/layout/activity_main.xml b/inrt/src/main/res/layout/activity_main.xml
index 58c2433f..69dfffe7 100644
--- a/inrt/src/main/res/layout/activity_main.xml
+++ b/inrt/src/main/res/layout/activity_main.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/inrt/src/main/res/layout/activity_settings.xml b/inrt/src/main/res/layout/activity_settings.xml
index cfb05265..20175b9c 100644
--- a/inrt/src/main/res/layout/activity_settings.xml
+++ b/inrt/src/main/res/layout/activity_settings.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"