X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=AndroidManifest.xml;h=47de4b1fb78dfa10c1d8a6f17040efb051d84487;hb=3eb790668c12d8c9d87cbf5f54420b5798d3dd8e;hp=5496c76a49b29415fd2e7352b97a4086ea45c5d8;hpb=98518a3277e3083a4bef9888042571f2dbe22b15;p=Dictionary.git

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5496c76..47de4b1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,64 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- 
- package="com.hughes.android.dictionary"
- 
- android:versionCode="15"
- android:versionName="3.0.1"
- android:installLocation="preferExternal">
+    package="com.hughes.android.dictionary"
+    android:installLocation="auto"
+    android:versionCode="71"
+    android:versionName="5.2.11" >
+
+    <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>
 
- <uses-sdk android:minSdkVersion="4" />
- 
-   <!--
-    Because android:minSdkVersion is 3, these parameters default to
-    false, but we need them to be true.
-    See:
-    http://developer.android.com/guide/topics/manifest/supports-screens-element.html
-    -->
-  <supports-screens
-      android:resizeable="true"
-      android:anyDensity="true"
-      android:largeScreens="true"
-      />
-      
-   <!--   android:xlargeScreens="true" />  --> 
-   
-   <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+            <!--
+            <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"
+            android:parentActivityName=".DictionaryActivity" >
 
-  <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" />
+            <!-- Parent activity meta-data to support API level 7+ -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".DictionaryActivity" />
 
-  <application 
-      android:icon="@drawable/icon"
-      android:label="@string/app_name"
-      android:theme="@style/Theme.Light"
-      android:name=".DictionaryApplication" >
-  
-<!--   
-  android:backupAgent="DictionaryBackupAgent"
-  -->
+            <!--
+           @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.SEARCH" />
 
-  <meta-data android:name="com.google.android.backup.api_key"
-      android:value="AEdPqrEAAAAIUa0cU0ZHbBpYXJqm0vVUP5IAjr5D4iUeX7UwiQ" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.hughes.action.ACTION_SEARCH_DICT" />
 
-  <activity android:name=".DictionaryManagerActivity"
-      android:label="@string/app_name">
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".AboutActivity"
+            android:parentActivityName=".DictionaryActivity" >
 
-    <intent-filter>
-      <action android:name="android.intent.action.MAIN" />
-      <category android:name="android.intent.category.LAUNCHER" />
-    </intent-filter>
-  </activity>
+            <!-- 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" >
 
-  <activity android:name=".DictionaryActivity" />
-  <activity android:name=".DictionaryEditActivity" />
-  <activity android:name=".AboutActivity" />
-  <activity android:name=".PreferenceActivity" />
-  <activity android:name=".DownloadActivity"
-      android:configChanges="keyboardHidden|orientation"/>
+            <!-- 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" >
 
- </application>
+            <!-- Parent activity meta-data to support API level 7+ -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".DictionaryActivity" />
+        </activity>
+    </application>
 
-</manifest> 
\ No newline at end of file
+</manifest>