1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00

AndroidGCS Tuning: Improvements to the tablet layout.

This commit is contained in:
James Cotton 2012-08-29 23:34:04 -05:00
parent e2fdc95540
commit cffeb6c65a

View File

@ -1,97 +1,103 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:setting_attributes="http://schemas.android.com/apk/res/org.openpilot.androidgcs"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<Button
android:id="@+id/saveBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:text="@string/save" />
<ScrollView
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="vertical" >
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchMode="columnWidth"
android:orientation="vertical" >
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/rollRateKp"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_column="0"
android:layout_gravity="fill"
android:layout_row="0"
setting_attributes:max_value="0.01"
setting_attributes:setting_name="Roll Rate Kp" />
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/pitchRateKp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_row="0"
setting_attributes:setting_name="Pitch Rate Kp"
setting_attributes:max_value="0.01" />
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/rollRateKi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_row="1"
setting_attributes:setting_name="Roll Rate Ki"
setting_attributes:max_value="0.05" />
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/pitchRateKi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_row="1"
setting_attributes:setting_name="Pitch Rate Ki"
setting_attributes:max_value="0.05" />
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/rollKp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_row="2"
setting_attributes:setting_name="Roll Kp"
setting_attributes:max_value="5" />
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/pitchKp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_row="2"
setting_attributes:setting_name="Pitch Kp"
setting_attributes:max_value="5" />
</GridLayout>
</ScrollView>
<Button
android:id="@+id/applyBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/saveBtn"
android:text="@string/apply" />
<LinearLayout
android:id="@+id/linearLayout3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right" >
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" >
<Button
android:id="@+id/applyBtn"
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/rollRateKp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/apply" />
android:layout_weight="0.5"
setting_attributes:max_value="0.01"
setting_attributes:setting_name="Roll Rate Kp" >
</org.openpilot.androidgcs.views.ScrollBarView>
<Button
android:id="@+id/saveBtn"
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/pitchRateKp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/save" />
android:layout_weight="0.5"
setting_attributes:max_value="0.01"
setting_attributes:setting_name="Pitch Rate Kp" >
</org.openpilot.androidgcs.views.ScrollBarView>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/linearLayout3" >
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/rollRateKi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
setting_attributes:max_value="0.05"
setting_attributes:setting_name="Roll Rate Ki" >
</org.openpilot.androidgcs.views.ScrollBarView>
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/pitchRateKi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
setting_attributes:max_value="0.05"
setting_attributes:setting_name="Pitch Rate Ki" >
</org.openpilot.androidgcs.views.ScrollBarView>
</LinearLayout>
<LinearLayout
android:id="@+id/linearLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/linearLayout1" >
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/rollKp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
setting_attributes:max_value="5"
setting_attributes:setting_name="Roll Kp" >
</org.openpilot.androidgcs.views.ScrollBarView>
<org.openpilot.androidgcs.views.ScrollBarView
android:id="@+id/pitchKp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
setting_attributes:max_value="5"
setting_attributes:setting_name="Pitch Kp" >
</org.openpilot.androidgcs.views.ScrollBarView>
</LinearLayout>
</RelativeLayout>