Fix the delay entry handling.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@784 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/res/layout/motor_config_delay_dialog.xml b/android/res/layout/motor_config_delay_dialog.xml
index b328001cd5f3848defeb2efb07f9996dff7b3213..8df8882a772b8638dd319b17cb2324dffc0f96f9 100644 (file)
--- a/android/res/layout/motor_config_delay_dialog.xml
+++ b/android/res/layout/motor_config_delay_dialog.xml
@@ -8,8 +8,11 @@
         android:id="@+id/motor_config_delay_diag_edit"\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
+        android:singleLine="true"\r
         android:ems="10"\r
-        android:inputType="number" >\r
+        android:imeOptions="actionDone"\r
+        android:inputType="phone"\r
+        android:digits="1234567890" >\r
 \r
         <requestFocus />\r
     </EditText>

diff --git a/android/src/net/sf/openrocket/android/motor/MotorDelayDialogFragment.java b/android/src/net/sf/openrocket/android/motor/MotorDelayDialogFragment.java
index 99d1f603deb5a827f7af0156ae5a58874a124533..117c639cc930a2f47a547146437a9478ee8e5ad3 100644 (file)
--- a/android/src/net/sf/openrocket/android/motor/MotorDelayDialogFragment.java
+++ b/android/src/net/sf/openrocket/android/motor/MotorDelayDialogFragment.java
@@ -11,6 +11,7 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
+import android.view.inputmethod.EditorInfo;\r
 import android.widget.ArrayAdapter;\r
 import android.widget.EditText;\r
 import android.widget.ListView;\r
@@ -50,7 +51,8 @@ implements View.OnClickListener, TextView.OnEditorActionListener {
 \r
        @Override\r
        public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {\r
-               if ( event.getAction() == KeyEvent.ACTION_UP && event.getKeyCode() == KeyEvent.KEYCODE_ENTER ) {\r
+\r
+               if ( actionId == EditorInfo.IME_ACTION_DONE ) {\r
                        String s = v.getText().toString();\r
                        if ( s != null ) { // note requires ems=10\r
                                long value = Long.parseLong(s);\r