Added unit tests and fixed rounding problem in ArrayUtils.range().

[debian/openrocket] / android / res / layout / simulation_condition_dialog.xml

diff --git a/android/res/layout/simulation_condition_dialog.xml b/android/res/layout/simulation_condition_dialog.xml
index 8e53119d305d854e264668047b6bb0f2c1f07b21..2edd052c7adc4a069f24d6169b4e6db23035a63b 100644 (file)
--- a/android/res/layout/simulation_condition_dialog.xml
+++ b/android/res/layout/simulation_condition_dialog.xml
@@ -2,6 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r
+    android:descendantFocusability="beforeDescendants"\r
+    android:focusableInTouchMode="true"\r
+    android:minWidth="250dp"\r
     android:orientation="vertical" >\r
 \r
     <TextView\r
@@ -52,10 +55,37 @@
         android:inputType="number"\r
         android:text="0" />\r
 \r
-    <Spinner\r
+    <TextView\r
+        style="@style/labelTextStyle"\r
+        android:layout_width="wrap_content"\r
+        android:layout_height="wrap_content"\r
+        android:text="@string/simulationConditionsLaunchRodDirection" />\r
+\r
+    <EditText\r
+        android:id="@+id/simulation_condition_roddirection"\r
+        android:layout_width="match_parent"\r
+        android:layout_height="wrap_content"\r
+        android:ems="10"\r
+        android:gravity="right"\r
+        android:inputType="number"\r
+        android:text="0" />\r
+\r
+    <net.sf.openrocket.android.rocket.MotorConfigSpinner\r
         android:id="@+id/simulationConditionConfigurationSpinner"\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
         android:prompt="@string/simulationConditionSelectMotors" />\r
 \r
+    <Button\r
+        android:id="@+id/simulationConditionDelete"\r
+        android:layout_width="match_parent"\r
+        android:layout_height="wrap_content"\r
+        android:text="@string/Delete" />\r
+\r
+    <Button\r
+        android:id="@+id/simulationConditionRun"\r
+        android:layout_width="match_parent"\r
+        android:layout_height="wrap_content"\r
+        android:text="@string/Run" />\r
+\r
 </LinearLayout>
\ No newline at end of file