Fix trailing whitespace and DOS linebreaks.

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

diff --git a/res/layout/dictionary_activity.xml b/res/layout/dictionary_activity.xml
index 0a070573ffde37952fb9942a1295f62cad5ba145..76f3a01eb74461a00e92638bbba02682c522792f 100644 (file)
--- a/res/layout/dictionary_activity.xml
+++ b/res/layout/dictionary_activity.xml
@@ -4,11 +4,21 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
+    <!--
+
     <LinearLayout
         android:id="@+id/SearchBarLinearLayout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" >
 
+        <Button
+            android:id="@+id/LangButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:minWidth="50dip"
+            android:text="" />
+
         <EditText
             android:id="@+id/SearchText"
             android:layout_width="0dip"
@@ -18,42 +28,17 @@
             android:imeOptions="actionSearch|flagNoEnterAction|flagNoExtractUi"
             android:inputType="text" />
 
-        <Button
+        <ImageButton
             android:id="@+id/ClearSearchTextButton"
+            style="@style/BorderlessButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="15dip"
-            android:background="#00000000"
-            android:drawableLeft="@drawable/ic_input_delete" />
-        <!-- transparent -->
-
-        <Button
-            android:id="@+id/LangButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:minWidth="50dip"
-            android:text="" />
+            android:src="@drawable/ic_input_delete" />
 
-        <Button
-            android:id="@+id/DownButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="#00000000"
-            android:drawableLeft="@drawable/arrow_down_float"
-            android:minHeight="30dip"
-            android:minWidth="30dip" />
-
-        <Button
-            android:id="@+id/UpButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="#00000000"
-            android:drawableLeft="@drawable/arrow_up_float"
-            android:minHeight="30dip"
-            android:minWidth="30dip" />
     </LinearLayout>
 
+ -->
+
     <ListView
         android:id="@id/android:list"
         android:layout_width="fill_parent"
@@ -70,4 +55,4 @@
         android:layout_height="match_parent"
         android:text="@string/noSearchResults" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>