1 files changed, 21 insertions, 1 deletions
diff --git a/src/ryuslash/org/dvdroid/DVDroidActivity.java b/src/ryuslash/org/dvdroid/DVDroidActivity.java
index 07fe1fb..ca65f13 100644
--- a/src/ryuslash/org/dvdroid/DVDroidActivity.java
+++ b/src/ryuslash/org/dvdroid/DVDroidActivity.java
@@ -3,6 +3,7 @@ package ryuslash.org.dvdroid;
 import java.util.List;
 
 import android.app.ListActivity;
+import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,6 +15,7 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.SearchView;
 
 public class DVDroidActivity extends ListActivity
     implements ActionMode.Callback
@@ -28,6 +30,11 @@ public class DVDroidActivity extends ListActivity
         return datasource.getCollection();
     }
 
+    private List<DVD> getData(String query)
+    {
+        return datasource.getQuery(query);
+    }
+
     @Override
     protected void onActivityResult(int requestCode,
                                     int resultCode,
@@ -80,7 +87,14 @@ public class DVDroidActivity extends ListActivity
         datasource = new DVDDataSource(this);
         datasource.open();
 
-        List<DVD> values = getData();
+        Intent intent = getIntent();
+        List<DVD> values;
+
+        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
+            values = getData(intent.getStringExtra(SearchManager.QUERY));
+        } else {
+            values = getData();
+        }
 
         ArrayAdapter<DVD> adapter =
             new ArrayAdapter<DVD>(this,
@@ -104,6 +118,12 @@ public class DVDroidActivity extends ListActivity
     {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main_activity, menu);
+
+        // Get the SearchView and set the searchable configuration.
+        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
+        SearchView searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
+        searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+
         return true;
     }