rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

AndroidGCS: Use a relative layout for the object browser view.

Browse Source
This commit is contained in:
James Cotton 2012-08-29 22:20:32 -05:00
parent fbefba69e2
commit e2fdc95540
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
androidgcs/res/layout/object_browser.xml
View File

@ -23,14 +23,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="true"
android:text="Settings" /> android:text="@string/settings" />
<CheckBox <CheckBox
android:id="@+id/dataCheck" android:id="@+id/dataCheck"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="true"
android:text="Data" /> android:text="@string/data" />
</LinearLayout> </LinearLayout>
@ -56,7 +56,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="#FFFFFFFF" /> android:background="#FFFFFFFF" />
<LinearLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
@ -66,40 +66,29 @@
android:id="@+id/object_information" android:id="@+id/object_information"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<Space <Button
android:layout_width="match_parent" android:id="@+id/editButton"
android:layout_height="wrap_content" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:text="@string/edit" />
<Space <Button
android:layout_width="match_parent" android:id="@+id/object_load_button"
android:layout_height="wrap_content" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/editButton"
android:text="@string/load" />
<LinearLayout </RelativeLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/object_load_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Load" />
<Button
android:id="@+id/editButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginBottom="32dp"
android:layout_marginRight="12dp"
android:text="Edit" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

4
androidgcs/res/values/strings.xml
View File

@ -35,4 +35,8 @@
<string name="tuning">Tuning</string> <string name="tuning">Tuning</string>
<string name="apply">Apply</string> <string name="apply">Apply</string>
<string name="save">Save</string> <string name="save">Save</string>
<string name="settings">Settings</string>
<string name="data">Data</string>
<string name="edit">Edit</string>
<string name="load">Load</string>
</resources> </resources>