X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=AndroidManifest.xml;h=9612e212a8de5b181697921a32b73dda7d5146e3;hb=bee0f521287b8b5d7a2ca65817098bc89d01eb6d;hp=bdcaa593070633e85ae1c0a9403b131f244d7a83;hpb=c625416a33f9da39bb8ec6a2c9a67a7d47e477d8;p=Dictionary.git

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bdcaa59..9612e21 100644
--- 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="23"
-    android:versionName="4.0.1" >
+    android:versionCode="77"
+    android:versionName="5.3.0" >
 
     <uses-sdk
         android:minSdkVersion="10"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="23" />
 
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -16,14 +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:allowBackup="true"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-
+        android:theme="@style/AppBaseThemeDark" >
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAIUa0cU0ZHbBpYXJqm0vVUP5IAjr5D4iUeX7UwiQ" />
@@ -37,48 +36,75 @@
                 <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>
-      	
-                        
+        <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=".DictionaryEditActivity" />
-        <activity android:name=".AboutActivity" />
-        <activity android:name=".HtmlDisplayActivity" />
-        <activity android:name=".PreferenceActivity" />
+                <action android:name="com.hughes.action.ACTION_SEARCH_DICT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
-            android:name=".DownloadActivity"
-            android:configChanges="keyboardHidden|orientation" />
+            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>
\ No newline at end of file
+</manifest>