X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=res%2Flayout%2Fdictionary_activity.xml;h=40b1f24aece45421872e6c5c59ac69b043556398;hb=2a89cb08c7c36c78b2276ddc8d77e470dfe7ec78;hp=ca812d18f4083a923e321cf6356acb0dd6f15f47;hpb=25425d0c98914bc805cc12fb82a978223c451eea;p=Dictionary.git

diff --git a/res/layout/dictionary_activity.xml b/res/layout/dictionary_activity.xml
index ca812d1..40b1f24 100644
--- a/res/layout/dictionary_activity.xml
+++ b/res/layout/dictionary_activity.xml
@@ -1,68 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     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"
-            android:layout_height="wrap_content"
-            android:layout_weight="1.0"
-            android:hint="@string/searchText"
-            android:imeOptions="actionSearch|flagNoEnterAction|flagNoExtractUi"
-            android:inputType="text" />
-
-        <ImageButton
-            android:id="@+id/ClearSearchTextButton"
-            style="@style/BorderlessButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_input_delete" />
-
-    </LinearLayout>
-
- -->
-
     <ListView
         android:id="@id/android:list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:nextFocusRight="@+id/floatSearchButton"
         android:choiceMode="singleChoice"
         android:clickable="true"
         android:fastScrollEnabled="true"
         android:focusable="true"
         android:focusableInTouchMode="true" />
 
+     <!-- force fabSize to mini, otherwise it is normal on some
+          phones and mini on others, with not particular sense to it.
+          Also leaves more space for content. -->
      <android.support.design.widget.FloatingActionButton
         android:id="@+id/floatSwapButton"
+        app:fabSize="mini"
+        app:useCompatPadding="true"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:onClick="onLanguageButtonClick"
         android:src="@drawable/ic_swap_horiz_black_24dp" />
 
      <android.support.design.widget.FloatingActionButton
         android:id="@+id/floatSearchButton"
+        app:fabSize="mini"
+        app:useCompatPadding="true"
         android:layout_toLeftOf="@+id/floatSwapButton"
         android:layout_alignParentBottom="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:nextFocusLeft="@id/android:list"
+        android:onClick="onSearchButtonClick"
         android:src="@drawable/ic_search_black_24dp" />
 
     <TextView