X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=AndroidManifest.xml;h=4e76e8661044006ff324c7ac1b44d88ae80048ac;hb=624819e560f269356af119f5a73848a0b1e25540;hp=091a0b092584ac86f37e427b76194fbec4654f46;hpb=319caebfa9fa020c44b61b7014cc8570bc14a2fa;p=Dictionary.git

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 091a0b0..4e76e86 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,44 +1,110 @@
 <?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"
- android:installLocation="auto">
-
- <uses-sdk android:minSdkVersion="4" />
-
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.VIBRATE" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_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="74"
+    android:versionName="5.3.0" >
+
+    <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:name=".DictionaryApplication"
+        android:allowBackup="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:theme="@style/AppBaseThemeDark" >
+        <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>
+
+            <!--
+        	<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"
+            android:parentActivityName=".DictionaryActivity" >
+
+            <!-- Parent activity meta-data to support API level 7+ -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".DictionaryActivity" />
+
+            <!--
+           @author Dominik Köppl
+     			Added two different intents to catch simple and advanced queries from other external applications.
+            -->
+            <intent-filter>
+                <action android:name="android.intent.action.PROCESS_TEXT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </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>
+            <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=".AboutActivity"
+            android:parentActivityName=".DictionaryActivity" >
+
+            <!-- Parent activity meta-data to support API level 7+ -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".DictionaryActivity" />
+        </activity>
+        <activity
+            android:name=".HtmlDisplayActivity"
+            android:parentActivityName=".DictionaryActivity" >
+
+            <!-- Parent activity meta-data to support API level 7+ -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".DictionaryActivity" />
+        </activity>
+        <activity
+            android:name=".PreferenceActivity"
+            android:parentActivityName=".DictionaryActivity" >
+
+            <!-- Parent activity meta-data to support API level 7+ -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".DictionaryActivity" />
+        </activity>
+    </application>
+
+</manifest>