go

[Dictionary.git] / res / layout / main.xml

diff --git a/res/layout/main.xml b/res/layout/main.xml
index e1e4a89481cd31f2bbdd17d79c8592a759c3cc5f..2862dcdcce86a10ef349f21fd72a154fcd51026e 100755 (executable)
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,18 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout 
+       xmlns:android="http://schemas.android.com/apk/res/android"
        android:orientation="vertical" android:layout_width="fill_parent"
        android:layout_height="fill_parent">
 
-       <LinearLayout android:layout_height="wrap_content" android:id="@+id/SearchBarLinearLayout" android:layout_width="wrap_content">
-
-
-</LinearLayout><TableLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/SearchBarTableLayout" android:stretchColumns="0">
-<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/SearchBarTableRow"><EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/SearchText" android:hint="Search Text"></EditText><Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/LangButton" android:text="LANG"></Button><Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/DownButton" android:text="v"></Button><Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/UpButton" android:text="^"></Button></TableRow>
-</TableLayout>
-
-       <ListView android:id="@id/android:list"
-               android:layout_width="fill_parent" android:layout_height="fill_parent"
-               android:choiceMode="singleChoice" android:clickable="true"></ListView>
+       <LinearLayout 
+               android:id="@+id/SearchBarLinearLayout"
+               android:layout_height="wrap_content"
+               android:layout_width="fill_parent">
+               
+                       <EditText 
+                               android:id="@+id/SearchText"
+                               android:hint="@string/searchText"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content" 
+                               android:inputType="text" 
+                               android:layout_weight="1.0"/>
+                               
+                       <Button 
+                               android:id="@+id/LangButton"
+                               android:text="LANG"
+                               android:minWidth="50dip"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               />
+                               
+                       <Button
+                               android:id="@+id/DownButton"
+                               android:text="v"
+                               android:minWidth="50dip"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content" 
+                               />
+                               
+                       <Button 
+                               android:id="@+id/UpButton"
+                               android:text="^"
+                               android:minWidth="50dip"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content" 
+                               />
+               
+       </LinearLayout>
 
+       <ListView 
+               android:id="@id/android:list" 
+               android:layout_width="fill_parent"
+               android:layout_height="fill_parent" 
+               android:choiceMode="singleChoice"
+               android:clickable="true" 
+               android:focusableInTouchMode="true"
+               android:focusable="true"/>
 
 </LinearLayout>