diff -r 085240d5be71 -r 31eec457a6e9 AndroidManifest.xml
--- a/AndroidManifest.xml	Mon Mar 21 00:14:20 2011 +0100
+++ b/AndroidManifest.xml	Wed Mar 30 23:29:12 2011 +0200
@@ -1,70 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.beem.project.beem" android:versionCode="7"
+<manifest
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	package="com.beem.project.beem"
+	android:versionCode="7"
 	android:versionName="0.1.5">
-	<application android:label="@string/app_name"
-		android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default"
+	<application
+		android:label="@string/app_name"
+		android:icon="@drawable/beem_launcher_icon_silver"
+		android:theme="@style/Theme.BEEM.Default"
 		android:name=".BeemApplication">
-		<activity android:name=".ui.Login" android:label="@string/app_name"
+		<activity
+			android:name=".ui.Login"
+			android:label="@string/app_name"
 			android:launchMode="standard">
 			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
+				<action
+					android:name="android.intent.action.MAIN" />
+				<category
+					android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.wizard.Account" android:label="Account wizard" />
-		<activity android:name=".ui.wizard.AccountConfigure"
+		<activity
+			android:name=".ui.wizard.Account"
+			android:label="Account wizard" />
+		<activity
+			android:name=".ui.wizard.AccountConfigure"
 			android:label="Account wizard" />
-		<activity android:name=".ui.LoginAnim" android:label="@string/login_login_progress"
-			android:launchMode="singleTop" android:screenOrientation="portrait" />
-		<activity android:name=".ui.Settings" android:label="@string/edit_settings_name">
-			<intent-filter android:label="Beem Connection">
+		<activity
+			android:name=".ui.LoginAnim"
+			android:label="@string/login_login_progress"
+			android:launchMode="singleTop"
+			android:screenOrientation="portrait" />
+		<activity
+			android:name=".ui.Settings"
+			android:label="@string/edit_settings_name">
+			<intent-filter>
 				<action
-					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
+					android:name="com.beem.project.beem.MAIN" />
+				<category
+					android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
-		</activity>
-		<activity android:name=".ui.Chat" android:label="@string/chat_name"
-			android:launchMode="singleTop">
-			<intent-filter android:label="Beem Connection">
+			<intent-filter
+				android:label="Beem Connection">
 				<action
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle"
-			android:launchMode="singleTask" android:windowSoftInputMode="stateHidden">
-			<intent-filter android:label="Beem Connection">
+		<activity
+			android:name=".ui.Chat"
+			android:label="@string/chat_name"
+			android:launchMode="singleTop">
+			<intent-filter
+				android:label="Beem Connection">
 				<action
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.AddContact" android:label="@string/AddCActTitle">
-			<intent-filter android:label="Beem Connection">
+		<activity
+			android:name=".ui.ChangeStatus"
+			android:label="@string/ChangeStatusActTitle"
+			android:launchMode="singleTask"
+			android:windowSoftInputMode="stateHidden">
+			<intent-filter
+				android:label="Beem Connection">
+				<action
+					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
+			</intent-filter>
+		</activity>
+		<activity
+			android:name=".ui.AddContact"
+			android:label="@string/AddCActTitle">
+			<intent-filter
+				android:label="Beem Connection">
 				<action
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.Subscription" android:label="@string/app_name">
-			<intent-filter android:label="Beem Connection">
+		<activity
+			android:name=".ui.Subscription"
+			android:label="@string/app_name">
+			<intent-filter
+				android:label="Beem Connection">
 				<action
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.CreateAccount" android:label="@string/create_account_name" />
-		<activity android:name=".ui.ContactList" android:label="@string/contact_list_name"
+		<activity
+			android:name=".ui.CreateAccount"
+			android:label="@string/create_account_name" />
+		<activity
+			android:name=".ui.ContactList"
+			android:label="@string/contact_list_name"
 			android:launchMode="singleTask">
-			<intent-filter android:label="Beem Connection">
+			<intent-filter
+				android:label="Beem Connection">
 				<action
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.GroupList" android:label="GroupList">
-			<intent-filter android:label="Beem Connection">
+		<activity
+			android:name=".ui.GroupList"
+			android:label="GroupList">
+			<intent-filter
+				android:label="Beem Connection">
 				<action
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.PrivacyList" android:label="@string/privacy_list_name">
-			<intent-filter android:label="Beem Connection">
+		<activity
+			android:name=".ui.PrivacyList"
+			android:label="@string/privacy_list_name">
+			<intent-filter
+				android:label="Beem Connection">
 				<action
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
@@ -76,51 +123,80 @@
 			android:name="android.intent.action.BOOT_COMPLETED" />
 			</intent-filter> </receiver>
 		-->
-		<provider android:name=".providers.AvatarProvider"
+		<provider
+			android:name=".providers.AvatarProvider"
 			android:authorities="com.beem.project.beem.providers.avatarprovider"
 			android:exported="false" />
-		<meta-data android:name="android.provider.CONTACTS_STRUCTURE"
-			android:resource="@xml/contacts" />
-		<service android:name=".account.AuthenticatorService"
-			android:exported="true" android:process=":auth">
+		<service
+			android:name=".account.AuthenticatorService"
+			android:exported="true"
+			android:process=":auth">
 			<intent-filter>
-				<action android:name="android.accounts.AccountAuthenticator" />
+				<action
+					android:name="android.accounts.AccountAuthenticator" />
 			</intent-filter>
-			<meta-data android:name="android.accounts.AccountAuthenticator"
+			<meta-data
+				android:name="android.accounts.AccountAuthenticator"
 				android:resource="@xml/authenticator" />
 		</service>
-		<service android:name=".account.SyncAdapterService"
-			android:exported="true" android:process=":contacts">
+		<service
+			android:name=".account.SyncAdapterService"
+			android:exported="true"
+			android:process=":contacts">
 			<intent-filter>
-				<action android:name="android.content.SyncAdapter" />
+				<action
+					android:name="android.content.SyncAdapter" />
 			</intent-filter>
-			<meta-data android:name="android.content.SyncAdapter"
+			<meta-data
+				android:name="android.content.SyncAdapter"
 				android:resource="@xml/sync_contacts" />
 		</service>
-		<service android:name="BeemService" android:enabled="true"
-			android:label="Beem Service" android:permission="com.beem.project.beem.BEEM_SERVICE">
+		<service
+			android:name="BeemService"
+			android:enabled="true"
+			android:label="Beem Service"
+			android:permission="com.beem.project.beem.BEEM_SERVICE">
 			<intent-filter>
-				<action android:name="com.beem.project.beem.BeemService"></action>
+				<action
+					android:name="com.beem.project.beem.BeemService"></action>
 			</intent-filter>
 		</service>
 	</application>
-	<permission android:permissionGroup="android.permission-group.NETWORK"
-		android:label="BeemService" android:description="@string/BeemServiceDescription"
+	<permission
+		android:permissionGroup="android.permission-group.NETWORK"
+		android:label="BeemService"
+		android:description="@string/BeemServiceDescription"
+		android:name="com.beem.project.beem.BEEM_SERVICE" />
+	<uses-permission
+		android:name="android.permission.INTERNET" />
+	<uses-permission
+		android:name="android.permission.VIBRATE" />
+	<uses-permission
+		android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission
+		android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission
 		android:name="com.beem.project.beem.BEEM_SERVICE" />
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE" />
-	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
-	<uses-permission android:name="android.permission.READ_CONTACTS" />
-	<uses-permission android:name="android.permission.WRITE_CONTACTS" />
-	<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-	<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-	<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8" />
-	<supports-screens android:largeScreens="true"
-		android:normalScreens="true" android:smallScreens="true"
+	<uses-permission
+		android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+	<uses-permission
+		android:name="android.permission.GET_ACCOUNTS" />
+	<uses-permission
+		android:name="android.permission.READ_CONTACTS" />
+	<uses-permission
+		android:name="android.permission.WRITE_CONTACTS" />
+	<uses-permission
+		android:name="android.permission.MANAGE_ACCOUNTS" />
+	<uses-permission
+		android:name="android.permission.READ_SYNC_SETTINGS" />
+	<uses-permission
+		android:name="android.permission.WRITE_SYNC_SETTINGS" />
+	<uses-sdk
+		android:minSdkVersion="8"
+		android:targetSdkVersion="8" />
+	<supports-screens
+		android:largeScreens="true"
+		android:normalScreens="true"
+		android:smallScreens="true"
 		android:anyDensity="true" />
 </manifest>
\ No newline at end of file