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

[Dictionary.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 17ccec84d5ffd7b88d236d1f5e644e8c5d008995..bdcaa593070633e85ae1c0a9403b131f244d7a83 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,12 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hughes.android.dictionary"
     android:installLocation="auto"
-    android:versionCode="21"
-    android:versionName="3.3" >
+    android:versionCode="23"
+    android:versionName="4.0.1" >
 
     <uses-sdk
-        android:minSdkVersion="4"
-        android:targetSdkVersion="16" />
+        android:minSdkVersion="10"
+        android:targetSdkVersion="19" />
 
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -16,12 +16,13 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
+    
     <application
+        android:allowBackup="true"
         android:name=".DictionaryApplication"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
-        android:theme="@style/Theme.Light" >
+        android:theme="@style/AppTheme" >
 
         <meta-data
             android:name="com.google.android.backup.api_key"
@@ -35,8 +36,39 @@
 
                 <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" />
@@ -46,4 +78,7 @@
             android:configChanges="keyboardHidden|orientation" />
     </application>
 
+    
+        
+    
 </manifest>
\ No newline at end of file