Merge branch 'master' of github.com:open-keychain/open-keychain

OpenKeychain/src/main/res/layout/key_list_fragment.xml

@@ -3,6 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     >
 
     <!--rebuild functionality of ListFragment -->
@@ -23,10 +25,11 @@
         <LinearLayout
             android:id="@+id/key_list_empty"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="240dp"
             android:gravity="center"
             android:orientation="vertical"
-            android:visibility="visible">
+            android:animateLayoutChanges="true"
+            >
 
             <TextView
                 android:layout_width="wrap_content"
@@ -35,6 +38,30 @@
                 android:text="@string/key_list_empty_text1"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
+            <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/search_container"
+                android:inAnimation="@anim/fade_in_delayed"
+                android:outAnimation="@anim/fade_out"
+                android:measureAllChildren="true"
+                custom:initialView="1">
+
+                <Space
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:id="@+id/search_button"
+                    android:gravity="center"
+                    tools:text="@string/btn_search_for_query"
+                    />
+
+            </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
+
         </LinearLayout>
     </FrameLayout>
 

OpenKeychain/src/main/res/values/strings.xml

@@ -1679,5 +1679,6 @@
     <string name="share_log_dialog_cancel_button">"Cancel"</string>
     <string name="toast_wrong_mimetype">"Wrong data type, expected text!"</string>
     <string name="toast_no_text">"No text in shared data!"</string>
+    <string name="btn_search_for_query">"Search for\n'%s'"</string>
 
 </resources>