From 6ace10fd9245cba6e241b2809ec8ad3bffded24c Mon Sep 17 00:00:00 2001
From: Koen Rabaey <koen@solinvent.be>
Date: Mon, 5 May 2014 22:15:36 +0200
Subject: [PATCH] misplaced elements and missing namespace

---
 OsmAnd/AndroidManifest.xml | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 6fb45a0312..170eb4238c 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="net.osmand.plus" android:installLocation="auto" android:versionName="@string/app_version" android:versionCode="170">
-	<meta-data android:name="com.google.android.backup.api_key"
-    android:value="AEdPqrEAAAAIqF3tNGT66etVBn_vgzpfAY1wmIzKV1Ss6Ku-2A" />
 
 	<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19"/>
 	
@@ -38,8 +36,10 @@
 		android:debuggable="true" android:name="net.osmand.plus.OsmandApplication"  android:configChanges="locale"
 		android:theme="@style/OsmandDarkTheme"
 		android:backupAgent="net.osmand.plus.OsmandBackupAgent" android:restoreAnyVersion="true" android:largeHeap="true">
-		
-	    <meta-data android:name="com.sec.android.support.multiwindow" android:value="true"/>
+
+		<meta-data android:name="com.google.android.backup.api_key"
+				   android:value="AEdPqrEAAAAIqF3tNGT66etVBn_vgzpfAY1wmIzKV1Ss6Ku-2A"/>
+		<meta-data android:name="com.sec.android.support.multiwindow" android:value="true"/>
 	    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:resource="@dimen/app_defaultsize_w" android:value=""/>
   		<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:resource="@dimen/app_defaultsize_h" android:value=""/>
   		<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:resource="@dimen/app_minimumsize_w" android:value=""/>
@@ -59,7 +59,7 @@
 		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name" android:screenOrientation="unspecified"
 			android:launchMode="singleTop">
 			<intent-filter>
-    			<data android:scheme="http" android:host="download.osmand.net" path="go"/>
+    			<data android:scheme="http" android:host="download.osmand.net" android:path="go"/>
     			<action android:name="android.intent.action.VIEW" />
     			<category android:name="android.intent.category.DEFAULT"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
@@ -87,20 +87,13 @@
                 <data android:scheme="google.navigation"/>
                 <data android:scheme="osmand.navigation"/>
             </intent-filter>
-
-            <receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver">
-
-		    <intent-filter>
-                <action android:name="android.intent.action.CAMERA_BUTTON" />
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-		 </receiver>
 		</activity>
 		<receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver">
-		    <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-		 </receiver>
+			<intent-filter>
+				<action android:name="android.intent.action.CAMERA_BUTTON"/>
+				<action android:name="android.intent.action.MEDIA_BUTTON"/>
+			</intent-filter>
+		</receiver>
 		<activity android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/settings_activity" android:configChanges="keyboardHidden|orientation"></activity>
 		<activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation"></activity>
 		<activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation"></activity>
@@ -157,11 +150,12 @@
 		<activity android:name="net.osmand.plus.osmedit.LocalOpenstreetmapActivity" android:label="@string/local_openstreetmap_act_title"></activity>
 
 		<service android:process="net.osmand.plus" android:label="@string/process_navigation_service" android:name="net.osmand.plus.NavigationService">
-			<intent-filter><action android:name="net.osmand.plus.NavigationService"></action></intent-filter>
+			<intent-filter>
+				<action android:name="net.osmand.plus.NavigationService"></action>
+			</intent-filter>
 		</service>
+
 		<receiver android:name="net.osmand.plus.OnNavigationServiceAlarmReceiver"/>
     	<activity android:name="net.osmand.plus.activities.OsmandBidForFixActivity"></activity>
-
-
 </application>
 </manifest>