tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix hyb1996-guest//AutoJsIssueReport#4781, hyb1996-guest//AutoJsIssueReport#4793

Browse Source
This commit is contained in:
hyb1996
2017-07-05 18:55:27 +08:00
parent ee4c818007
commit d72d9c0413
10 changed files with 106 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autojs/src/main/java/com/stardust/autojs/runtime/api/ui/BlockedMaterialDialog.java
View File

@@ -11,6 +11,7 @@ import android.view.WindowManager;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.Theme;
import com.stardust.concurrent.VolatileBox;
import com.stardust.util.UiHandler;
@@ -50,6 +51,7 @@ public class BlockedMaterialDialog extends MaterialDialog {
public Builder(Context context, UiHandler uiHandler) {
super(context);
super.theme(Theme.LIGHT);
mUiHandler = uiHandler;
}

6
autojs/src/main/java/com/stardust/autojs/runtime/api/ui/Dialogs.java
View File

@@ -23,6 +23,7 @@ public class Dialogs {
private AppUtils mAppUtils;
private UiHandler mUiHandler;
private ContextThemeWrapper mThemeWrapper;
public Dialogs(AppUtils appUtils, UiHandler uiHandler) {
mAppUtils = appUtils;
@@ -70,7 +71,10 @@ public class Dialogs {
}
private Context getContext() {
return mUiHandler.getContext();
if (mThemeWrapper != null)
return mThemeWrapper;
mThemeWrapper = new ContextThemeWrapper(mUiHandler.getContext(), R.style.Theme_AppCompat_Light);
return mThemeWrapper;
}
@ScriptInterface

3
autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java
View File

@@ -127,7 +127,8 @@ public class StardustConsole extends AbstractConsole {
public void run() {
try {
FloatyService.addWindow(mFloatyWindow);
} catch (WindowManager.BadTokenException e) {
// SecurityException: https://github.com/hyb1996-guest/AutoJsIssueReport/issues/4781
} catch (WindowManager.BadTokenException | SecurityException e) {
e.printStackTrace();
mUiHandler.toast(R.string.text_no_floating_window_permission);
}

4
autojs/src/main/res/xml/accessibility_service_config.xml
View File

@@ -2,9 +2,9 @@
<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
android:accessibilityEventTypes="typeAllMask"
android:accessibilityFeedbackType="feedbackGeneric"
android:accessibilityFlags="flagReportViewIds|flagRequestEnhancedWebAccessibility|flagRequestFilterKeyEvents"
android:accessibilityFlags="flagIncludeNotImportantViews|flagReportViewIds|flagRequestEnhancedWebAccessibility|flagRequestFilterKeyEvents"
android:canPerformGestures="true"
android:canRequestEnhancedWebAccessibility="true"
android:canRetrieveWindowContent="true"
android:description="@string/text_accessibility_service_description"
android:notificationTimeout="100"/>
android:notificationTimeout="0"/>