diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ed99da3a..ba0db4c2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -197,14 +197,6 @@ android:name="android.accessibilityservice" android:resource="@xml/accessibility_service_config"/> - - - - - diff --git a/app/src/main/assets/editor/codemirror/lib/codemirror.css b/app/src/main/assets/editor/codemirror/lib/codemirror.css index 1ded6ec4..b33fd801 100644 --- a/app/src/main/assets/editor/codemirror/lib/codemirror.css +++ b/app/src/main/assets/editor/codemirror/lib/codemirror.css @@ -340,3 +340,9 @@ div.CodeMirror-dragcursors { /* Help users use markselection to safely style text background */ span.CodeMirror-selectedtext { background: none; } + +.CodeMirror-gutter-wrapper { + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; +} \ No newline at end of file diff --git a/app/src/main/assets/editor/index.js b/app/src/main/assets/editor/index.js index 65a19e6c..79020446 100644 --- a/app/src/main/assets/editor/index.js +++ b/app/src/main/assets/editor/index.js @@ -76,7 +76,9 @@ editor.on("keyup", function(editor, event) clearTimeout(id); } id = setTimeout(function(){ - editor.execCommand("autocomplete"); + editor.showHint({ + completeSingle: false + }) }, 100); } }); diff --git a/autojs/src/main/AndroidManifest.xml b/autojs/src/main/AndroidManifest.xml index 81f512ec..675c3eaf 100644 --- a/autojs/src/main/AndroidManifest.xml +++ b/autojs/src/main/AndroidManifest.xml @@ -21,6 +21,15 @@ android:taskAffinity="com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity" android:theme="@style/AppTheme.Transparent"/> + + + + + + diff --git a/common/src/main/java/com/stardust/util/ScreenMetrics.java b/common/src/main/java/com/stardust/util/ScreenMetrics.java index d2571469..26b14c40 100644 --- a/common/src/main/java/com/stardust/util/ScreenMetrics.java +++ b/common/src/main/java/com/stardust/util/ScreenMetrics.java @@ -18,15 +18,15 @@ public class ScreenMetrics { private static Display display; public static void initIfNeeded(Activity activity) { - if (!initialized) { - DisplayMetrics metrics = new DisplayMetrics(); - activity.getWindowManager().getDefaultDisplay().getRealMetrics(metrics); - deviceScreenHeight = metrics.heightPixels; - deviceScreenWidth = metrics.widthPixels; - deviceScreenDensity = metrics.densityDpi; - display = activity.getWindowManager().getDefaultDisplay(); - initialized = true; - } + if(initialized) + return; + DisplayMetrics metrics = new DisplayMetrics(); + activity.getWindowManager().getDefaultDisplay().getRealMetrics(metrics); + deviceScreenHeight = metrics.heightPixels; + deviceScreenWidth = metrics.widthPixels; + deviceScreenDensity = metrics.densityDpi; + display = activity.getWindowManager().getDefaultDisplay(); + initialized = true; } public static int getDeviceScreenHeight() { diff --git a/common/src/main/java/com/stardust/util/ViewUtil.java b/common/src/main/java/com/stardust/util/ViewUtil.java index cbbda6f5..6d0ca1c1 100644 --- a/common/src/main/java/com/stardust/util/ViewUtil.java +++ b/common/src/main/java/com/stardust/util/ViewUtil.java @@ -19,6 +19,7 @@ public class ViewUtil { return (V) view.findViewById(resId); } + // FIXME: 2018/1/23 not working in some devices (https://github.com/hyb1996/Auto.js/issues/268) public static int getStatusBarHeight(Context context) { int result = 0; int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");