Set proper message

res/values/strings.xml

@@ -83,6 +83,8 @@
     <string name="file_list_loading">Loading&#8230;</string>
     <string name="file_list_no_app_for_file_type">No app found for file type!</string>
     <string name="local_file_list_empty">There are no files in this folder.</string>
+    <string name="file_list_empty_headline_search">No results in this folder</string>
+    <string name="file_list_empty_search">Try looking in another folder?</string>
     <string name="upload_list_empty_headline">No uploads available</string>
     <string name="upload_list_empty_text">Upload some content or activate instant upload!</string>
     <string name="file_list_folder">folder</string>

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -389,13 +389,13 @@ public class FileDisplayActivity extends HookActivity
     }
 
     private void createMinFragments() {
-        OCFileListFragment listOfFiles = new OCFileListFragment();
+        /*OCFileListFragment listOfFiles = new OCFileListFragment();
         Bundle args = new Bundle();
         args.putBoolean(OCFileListFragment.ARG_ALLOW_CONTEXTUAL_ACTIONS, true);
         listOfFiles.setArguments(args);
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         transaction.add(R.id.left_fragment_container, listOfFiles, TAG_LIST_OF_FILES);
-        transaction.commit();
+        transaction.commit();*/
     }
 
     private void initFragmentsWithFile() {
@@ -1125,7 +1125,12 @@ public class FileDisplayActivity extends HookActivity
         OCFileListFragment ocFileListFragment = getListOfFilesFragment();
         if (ocFileListFragment != null) {
             if (!mSyncInProgress) {
-                ocFileListFragment.setEmptyListMessage();
+                if (!TextUtils.isEmpty(searchQuery) || (searchView != null &&
+                        !TextUtils.isEmpty(searchView.getQuery().toString()))) {
+                    ocFileListFragment.setEmptyListMessage(true);
+                } else {
+                    ocFileListFragment.setEmptyListMessage(false);
+                }
             } else {
                 ocFileListFragment.setEmptyListLoadingMessage();
             }

src/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -444,15 +444,17 @@ public class ExtendedListFragment extends Fragment
         }
     }
 
-    /**
-     * Set message for empty list view.
-     */
-    public void setEmptyListMessage() {
-        setMessageForEmptyList(
-                R.string.file_list_empty_headline,
-                R.string.file_list_empty,
-                R.drawable.ic_list_empty_folder
-        );
+    public void setEmptyListMessage(boolean isSearch) {
+        if (!isSearch) {
+            setMessageForEmptyList(
+                    R.string.file_list_empty_headline,
+                    R.string.file_list_empty,
+                    R.drawable.ic_list_empty_folder
+            );
+        } else {
+            setMessageForEmptyList(R.string.file_list_empty_headline_search,
+                    R.string.file_list_empty_search, R.drawable.ic_search_light_blue);
+        }
     }
 
     /**