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

[Dictionary.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c6889012843d018ec152f1d8be80f864ff9de432..bdcaa593070633e85ae1c0a9403b131f244d7a83 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,39 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.hughes.android.dictionary" android:versionCode="9"
- android:versionName="2.0">
-
- <uses-sdk android:minSdkVersion="4" />
-
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
- <application 
-  android:icon="@drawable/icon"
-  android:label="@string/app_name"
-  android:backupAgent="DictionaryBackupAgent"
-  android:theme="@style/Theme.QuickDic">
-
-  <meta-data android:name="com.google.android.backup.api_key"
-   android:value="AEdPqrEAAAAIUa0cU0ZHbBpYXJqm0vVUP5IAjr5D4iUeX7UwiQ" />
-
-  <activity android:name=".DictionaryListActivity"
-   android:label="@string/app_name">
-   
-   <intent-filter>
-    <action android:name="android.intent.action.MAIN" />
-    <category android:name="android.intent.category.LAUNCHER" />
-   </intent-filter>
-  </activity>
-
-  <activity android:name="DictionaryActivity" />
-  <activity android:name="DictionaryEditActivity" />
-  <activity android:name="AboutActivity" />
-  <activity android:name="PreferenceActivity" />
-  <activity android:name="DownloadActivity" />
-
- </application>
-
-</manifest> 
\ No newline at end of file
+    package="com.hughes.android.dictionary"
+    android:installLocation="auto"
+    android:versionCode="23"
+    android:versionName="4.0.1" >
+
+    <uses-sdk
+        android:minSdkVersion="10"
+        android:targetSdkVersion="19" />
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <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/AppTheme" >
+
+        <meta-data
+            android:name="com.google.android.backup.api_key"
+            android:value="AEdPqrEAAAAIUa0cU0ZHbBpYXJqm0vVUP5IAjr5D4iUeX7UwiQ" />
+
+        <activity
+            android:name=".DictionaryManagerActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <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"  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=".PreferenceActivity" />
+        <activity
+            android:name=".DownloadActivity"
+            android:configChanges="keyboardHidden|orientation" />
+    </application>
+
+    
+        
+    
+</manifest>
\ No newline at end of file