Merged. Switched back to name "Preferences" instead of "Settings".

[Dictionary.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bb3843c58655a4da9c9304529a209c41949c5824..bdcaa593070633e85ae1c0a9403b131f244d7a83 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,15 +36,49 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+               <!--   
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+               </intent-filter>
+               <meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
+                                               <intent-filter>
+               <action android:name="android.intent.action.SEARCH" />
+               </intent-filter>
+                  -->          
         </activity>
-        <activity android:name=".DictionaryActivity" />
+        
+        
+        <activity android:name=".DictionaryActivity"  android:label="@string/app_name">
+                <!-- @author Dominik Köppl
+                       Added two different intents to catch simple and advanced queries from other extern applications.
+                       -->
+           <intent-filter>
+             <action android:name="android.intent.action.SEARCH" />      
+                <category android:name="android.intent.category.DEFAULT" />
+               </intent-filter>
+       
+                        
+            <intent-filter>
+                <action android:name="com.hughes.action.ACTION_SEARCH_DICT" />
+                <category android:name="android.intent.category.DEFAULT" />
+               </intent-filter>
+       
+         </activity>
+            
+            
         <activity android:name=".DictionaryEditActivity" />
         <activity android:name=".AboutActivity" />
         <activity android:name=".HtmlDisplayActivity" />
-        <activity android:name=".SettingsActivity" />
+        <activity android:name=".PreferenceActivity" />
         <activity
             android:name=".DownloadActivity"
             android:configChanges="keyboardHidden|orientation" />
     </application>
 
+    
+        
+    
 </manifest>
\ No newline at end of file