From 563715227e8f5934c299c1761f16d769552dc31a Mon Sep 17 00:00:00 2001
From: Igor Tkach <itkach@aarddict.org>
Date: Sun, 6 Dec 2015 18:48:53 -0500
Subject: [PATCH] Add intent filter for ColorDict search action

---
 AndroidManifest.template.xml                    | 16 +++++++++++-----
 AndroidManifest.xml                             | 16 +++++++++++-----
 src/itkach/aard2/ArticleCollectionActivity.java |  3 +++
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.template.xml b/AndroidManifest.template.xml
index b7272a9..2518ac8 100644
--- a/AndroidManifest.template.xml
+++ b/AndroidManifest.template.xml
@@ -19,6 +19,7 @@
         android:icon="@drawable/aard2"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.Holo.Light.DarkActionBar" >
+
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
@@ -29,6 +30,7 @@
                 <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".ArticleCollectionActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
@@ -36,19 +38,20 @@
             android:taskAffinity="" >
             <intent-filter>
                 <action android:name="aard2.lookup" />
-
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="colordict.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:mimeType="text/plain" />
             </intent-filter>
-
         </activity>
 
         {wikipedia_activities}
@@ -58,12 +61,15 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
             android:label="@string/title_activity_file_select" >
         </activity>
-        <uses-library android:required="false" android:name="com.sec.android.app.multiwindow"> </uses-library>
+
+        <uses-library android:required="false" android:name="com.sec.android.app.multiwindow" />
+
         <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
         <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:resource="@dimen/app_defaultsize_w" />
         <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:resource="@dimen/app_defaultsize_h" />
         <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:resource="@dimen/app_minimumsize_w" />
         <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:resource="@dimen/app_minimumsize_h" />
+
     </application>
 
 </manifest>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5edc100..39bf1d4 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,6 +19,7 @@
         android:icon="@drawable/aard2"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.Holo.Light.DarkActionBar" >
+
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
@@ -29,6 +30,7 @@
                 <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".ArticleCollectionActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
@@ -36,19 +38,20 @@
             android:taskAffinity="" >
             <intent-filter>
                 <action android:name="aard2.lookup" />
-
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="colordict.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:mimeType="text/plain" />
             </intent-filter>
-
         </activity>
 
         <activity-alias
@@ -17517,12 +17520,15 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
             android:label="@string/title_activity_file_select" >
         </activity>
-        <uses-library android:required="false" android:name="com.sec.android.app.multiwindow"> </uses-library>
+
+        <uses-library android:required="false" android:name="com.sec.android.app.multiwindow" />
+
         <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
         <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:resource="@dimen/app_defaultsize_w" />
         <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:resource="@dimen/app_defaultsize_h" />
         <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:resource="@dimen/app_minimumsize_w" />
         <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:resource="@dimen/app_minimumsize_h" />
+
     </application>
 
 </manifest>
diff --git a/src/itkach/aard2/ArticleCollectionActivity.java b/src/itkach/aard2/ArticleCollectionActivity.java
index d8b3974..239576e 100755
--- a/src/itkach/aard2/ArticleCollectionActivity.java
+++ b/src/itkach/aard2/ArticleCollectionActivity.java
@@ -230,6 +230,9 @@ private ArticleCollectionPagerAdapter createFromIntent(Application app, Intent i
         if (lookupKey == null) {
             lookupKey = intent.getStringExtra(SearchManager.QUERY);
         }
+        if (lookupKey == null) {
+            lookupKey = intent.getStringExtra("EXTRA_QUERY");
+        }
         String preferredSlobId = null;
         if (lookupKey == null) {
             Uri uri = intent.getData();