Fixed funny keyboard character with full keyboards and enabled Ctrl key functions.

rjmatthews62 · rjmatthews62 · commit b39b23be0bb5 · 2012-04-09T11:34:00.000+10:00
Added support for 'digits' in fullscreenui
diff --git a/android/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java b/android/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
@@ -9,6 +9,7 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.InputType;
+import android.text.method.DigitsKeyListener;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.View;
@@ -457,6 +458,8 @@ private void setProperty(View view, ViewGroup root, String attr, String value)
       setInteger(view, attr, getInteger(InputType.class, value));
     } else if (attr.equals("background")) {
       setBackground(view, value);
+    } else if (attr.equals("digits") && view instanceof TextView) {
+      ((TextView) view).setKeyListener(DigitsKeyListener.getInstance(value));
     } else if (attr.startsWith("nextFocus")) {
       setInteger(view, attr + "Id", calcId(value));
     } else if (attr.equals("textSize")) {
diff --git a/android/ScriptingLayerForAndroid/AndroidManifest.xml b/android/ScriptingLayerForAndroid/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.googlecode.android_scripting"
-  android:installLocation="auto" android:versionCode="510" android:versionName="5x10">
+  android:installLocation="auto" android:versionCode="511" android:versionName="5x11">
     <uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>
     <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS"></uses-permission>
   <application
diff --git a/android/ScriptingLayerForAndroid/project.properties b/android/ScriptingLayerForAndroid/project.properties
@@ -9,7 +9,7 @@
 
 # Indicates whether an apk should be generated for each density.
 split.density=false
-android.library.reference.1=../QuickAction
 # Project target.
 target=android-8
 apk-configurations=
+android.library.reference.1=../QuickAction
diff --git a/android/ScriptingLayerForAndroid/src/org/connectbot/service/TerminalKeyListener.java b/android/ScriptingLayerForAndroid/src/org/connectbot/service/TerminalKeyListener.java
@@ -30,13 +30,13 @@
 import de.mud.terminal.VDUBuffer;
 import de.mud.terminal.vt320;
 
+import java.io.IOException;
+
 import org.connectbot.TerminalView;
 import org.connectbot.transport.AbsTransport;
 import org.connectbot.util.PreferenceConstants;
 import org.connectbot.util.SelectionArea;
 
-import java.io.IOException;
-
 /**
  * @author kenny
  * @author modified by raaar
@@ -60,6 +60,7 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
   // All the transient key codes
   public final static int META_TRANSIENT = META_CTRL_ON | META_ALT_ON | META_SHIFT_ON;
 
+  public final static int KEYBOARD_META_CTRL_ON = 0x1000; // Ctrl key mask for API 11+
   private final TerminalManager manager;
   private final TerminalBridge bridge;
   private final VDUBuffer buffer;
@@ -184,6 +185,10 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
         }
 
         int key = keymap.get(keyCode, curMetaState);
+        if ((curMetaState & KEYBOARD_META_CTRL_ON) != 0) {
+          metaState |= META_CTRL_ON;
+          key = keymap.get(keyCode, 0);
+        }
 
         if ((metaState & META_CTRL_MASK) != 0) {
           metaState &= ~META_CTRL_ON;
@@ -206,10 +211,11 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
         }
 
         // handle pressing f-keys
-        if ((hardKeyboard && !hardKeyboardHidden) && (curMetaState & KeyEvent.META_SHIFT_ON) != 0
-            && sendFunctionKey(keyCode)) {
-          return true;
-        }
+        // Doesn't work properly with asus keyboards... may never have worked. RM 09-Apr-2012
+        /*
+         * if ((hardKeyboard && !hardKeyboardHidden) && (curMetaState & KeyEvent.META_SHIFT_ON) != 0
+         * && sendFunctionKey(keyCode)) { return true; }
+         */
 
         if (key < 0x80) {
           transport.write(key);
