Merge pull request #77 from dqtz5vpvj9-create/master

Add IME action shortcuts and Update Gradle

Author: senzhk

build.gradle

@@ -1,16 +1,20 @@
 buildscript {
     repositories {
-        jcenter()
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'https://maven.aliyun.com/repository/central' }
         google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:8.1.0'
     }
+}
 
-    allprojects {
-        repositories {
-            google()
-            jcenter()
-        }
+allprojects {
+    repositories {
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        google()
+        mavenCentral()
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Sep 05 14:14:30 HKT 2020
+#Wed Dec 03 11:08:02 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

keyboardservice/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '28.0.3'
+    namespace 'com.android.adbkeyboard'
+    compileSdk 33
 
     defaultConfig {
         applicationId 'com.android.adbkeyboard'
-        minSdkVersion 15
-        targetSdkVersion 33
+        minSdk 21
+        targetSdk 33
         versionCode 2
         versionName "2.0"
     }

keyboardservice/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.adbkeyboard"
     android:versionCode="1"
     android:versionName="1.0" >
 

keyboardservice/src/main/java/com/android/adbkeyboard/AdbIME.java

@@ -10,6 +10,7 @@
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.ExtractedTextRequest;
 import android.view.inputmethod.InputConnection;
 
@@ -21,6 +22,11 @@ public class AdbIME extends InputMethodService {
 	private String IME_EDITORCODE = "ADB_EDITOR_CODE";
 	private String IME_MESSAGE_B64 = "ADB_INPUT_B64";
 	private String IME_CLEAR_TEXT = "ADB_CLEAR_TEXT";
+	private String IME_ACTION_SEARCH = "ADB_ACTION_SEARCH";
+	private String IME_ACTION_GO = "ADB_ACTION_GO";
+	private String IME_ACTION_DONE = "ADB_ACTION_DONE";
+	private String IME_ACTION_NEXT = "ADB_ACTION_NEXT";
+	private String IME_ACTION_SEND = "ADB_ACTION_SEND";
 	private BroadcastReceiver mReceiver = null;
 
 	@Override
@@ -35,6 +41,11 @@ public View onCreateInputView() {
 			filter.addAction(IME_EDITORCODE);
 			filter.addAction(IME_MESSAGE_B64);
 			filter.addAction(IME_CLEAR_TEXT);
+			filter.addAction(IME_ACTION_SEARCH);
+			filter.addAction(IME_ACTION_GO);
+			filter.addAction(IME_ACTION_DONE);
+			filter.addAction(IME_ACTION_NEXT);
+			filter.addAction(IME_ACTION_SEND);
 			mReceiver = new AdbReceiver();
 			registerReceiver(mReceiver, filter);
 		}
@@ -153,11 +164,58 @@ public void onReceive(Context context, Intent intent) {
 			if (intent.getAction().equals(IME_CLEAR_TEXT)) {
 				InputConnection ic = getCurrentInputConnection();
 				if (ic != null) {
-					//REF: stackoverflow/33082004 author: Maxime Epain
-					CharSequence curPos = ic.getExtractedText(new ExtractedTextRequest(), 0).text;
-					CharSequence beforePos = ic.getTextBeforeCursor(curPos.length(), 0);
-					CharSequence afterPos = ic.getTextAfterCursor(curPos.length(), 0);
-					ic.deleteSurroundingText(beforePos.length(), afterPos.length());
+					// Try to get extracted text first
+					ExtractedTextRequest req = new ExtractedTextRequest();
+					req.hintMaxChars = 100000;
+					req.hintMaxLines = 10000;
+					android.view.inputmethod.ExtractedText et = ic.getExtractedText(req, 0);
+					if (et != null && et.text != null) {
+						CharSequence beforePos = ic.getTextBeforeCursor(et.text.length(), 0);
+						CharSequence afterPos = ic.getTextAfterCursor(et.text.length(), 0);
+						if (beforePos != null && afterPos != null) {
+							ic.deleteSurroundingText(beforePos.length(), afterPos.length());
+						}
+					} else {
+						// Fallback: select all and delete
+						ic.performContextMenuAction(android.R.id.selectAll);
+						ic.commitText("", 1);
+					}
+				}
+			}
+
+			// IME Actions - convenient shortcuts
+			if (intent.getAction().equals(IME_ACTION_SEARCH)) {
+				InputConnection ic = getCurrentInputConnection();
+				if (ic != null) {
+					ic.performEditorAction(EditorInfo.IME_ACTION_SEARCH);
+				}
+			}
+
+			if (intent.getAction().equals(IME_ACTION_GO)) {
+				InputConnection ic = getCurrentInputConnection();
+				if (ic != null) {
+					ic.performEditorAction(EditorInfo.IME_ACTION_GO);
+				}
+			}
+
+			if (intent.getAction().equals(IME_ACTION_DONE)) {
+				InputConnection ic = getCurrentInputConnection();
+				if (ic != null) {
+					ic.performEditorAction(EditorInfo.IME_ACTION_DONE);
+				}
+			}
+
+			if (intent.getAction().equals(IME_ACTION_NEXT)) {
+				InputConnection ic = getCurrentInputConnection();
+				if (ic != null) {
+					ic.performEditorAction(EditorInfo.IME_ACTION_NEXT);
+				}
+			}
+
+			if (intent.getAction().equals(IME_ACTION_SEND)) {
+				InputConnection ic = getCurrentInputConnection();
+				if (ic != null) {
+					ic.performEditorAction(EditorInfo.IME_ACTION_SEND);
 				}
 			}
 		}