summaryrefslogtreecommitdiff
path: root/same-android/res/layout/main.xml
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-07 13:56:13 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-07 13:56:13 +0100
commitbfe835a58edab5d41831f87e86ec534786db4d4e (patch)
treef1ef2d1fe18fcf7f5b949ec021012d64764f626d /same-android/res/layout/main.xml
parent0f5172c073daad5022409344aa25a176beaba431 (diff)
Add settings menu to Android app.
– New main activity. – Options menu to go to Same settings.
Diffstat (limited to 'same-android/res/layout/main.xml')
-rw-r--r--same-android/res/layout/main.xml33
1 files changed, 3 insertions, 30 deletions
diff --git a/same-android/res/layout/main.xml b/same-android/res/layout/main.xml
index 4ddd343..f6f0090 100644
--- a/same-android/res/layout/main.xml
+++ b/same-android/res/layout/main.xml
@@ -1,41 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- >
+ android:orientation="vertical" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Commands"
+ android:text="See menu."
android:textAppearance="?android:attr/textAppearanceLarge" />
- <Button
- android:id="@+id/button1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:onClick="createNetwork"
- android:text="Create" />
-
- <EditText
- android:id="@+id/editText1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <Button
- android:id="@+id/button2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:onClick="joinNetwork"
- android:text="Search" />
-
- <TextView
- android:id="@+id/ipAddress"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=""
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
-</LinearLayout>
+</LinearLayout> \ No newline at end of file