From 451ae3ac4593cb56dfafa965d1974ca150243abe Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Mon, 18 Jun 2012 01:47:21 +0000 Subject: [PATCH] Fix the delay entry handling. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@784 180e2498-e6e9-4542-8430-84ac67f01cd8 --- android/res/layout/motor_config_delay_dialog.xml | 5 ++++- .../openrocket/android/motor/MotorDelayDialogFragment.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/android/res/layout/motor_config_delay_dialog.xml b/android/res/layout/motor_config_delay_dialog.xml index b328001c..8df8882a 100644 --- 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" android:layout_width="match_parent" android:layout_height="wrap_content" + android:singleLine="true" android:ems="10" - android:inputType="number" > + android:imeOptions="actionDone" + android:inputType="phone" + android:digits="1234567890" > diff --git a/android/src/net/sf/openrocket/android/motor/MotorDelayDialogFragment.java b/android/src/net/sf/openrocket/android/motor/MotorDelayDialogFragment.java index 99d1f603..117c639c 100644 --- 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; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.EditorInfo; import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.ListView; @@ -50,7 +51,8 @@ implements View.OnClickListener, TextView.OnEditorActionListener { @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - if ( event.getAction() == KeyEvent.ACTION_UP && event.getKeyCode() == KeyEvent.KEYCODE_ENTER ) { + + if ( actionId == EditorInfo.IME_ACTION_DONE ) { String s = v.getText().toString(); if ( s != null ) { // note requires ems=10 long value = Long.parseLong(s); -- 2.30.2