Merge pull request #400 from mstevetodd/master

add edit on Turnout# entry, bump version for new Beta
JMRI · Jan 30, 2019 · 230e927 · 230e927
2 parents cd51049 + 1353a37
commit 230e927
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/EngineDriver/src/main/AndroidManifest.xml b/EngineDriver/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="jmri.enginedriver"
-    android:versionCode="74"
-    android:versionName="2.23.74" android:installLocation="auto">
+    android:versionCode="75"
+    android:versionName="2.23.75" android:installLocation="auto">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

diff --git a/EngineDriver/src/main/java/jmri/enginedriver/routes.java b/EngineDriver/src/main/java/jmri/enginedriver/routes.java
@@ -364,8 +364,6 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
         button_listener click_listener = new button_listener('2');
         b.setOnClickListener(click_listener);
 
-        //((EditText) findViewById(R.id.route_entry)).setRawInputType(InputType.TYPE_CLASS_NUMBER);
-
         locationList = new ArrayList<>();
         locationSpinner = (Spinner) findViewById(R.id.routes_location);
         locationListAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, locationList);

diff --git a/EngineDriver/src/main/res/layout/turnouts.xml b/EngineDriver/src/main/res/layout/turnouts.xml
@@ -26,8 +26,9 @@
             android:layout_weight="0.25"
             android:hint="@string/turnouts_turnout"
             android:inputType="textCapCharacters"
+            android:digits="ABCDEFGHIJKLMNOPQRSTUVWZ1234567890"
             android:imeOptions="actionDone"
-            android:maxLength="60"
+            android:maxLength="7"
             android:singleLine="true" />
         <Button
             android:id="@+id/turnout_throw"

diff --git a/changelog-and-todo-list.txt b/changelog-and-todo-list.txt
@@ -9,6 +9,7 @@
  * Add location permission prompt
  * Add wifi & OS details to About screen for debugging
  * change default for DirChangeWhileMoving and selLocoWhileMoving to false
+ * add some edits to Turnout# input
 **Version 2.22
  * New 'Big Button' throttle screen option. (Only one throttle with no slider.)
  * New Colourful/Colorful theme