Mercurial Mercurial > beem > jingle / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
AndroidManifest.xml
changeset 823 2036ebfaccda
parent 534 4a351c2d7217
child 825 b87f8688118c 
--- a/AndroidManifest.xml	Thu Nov 19 19:01:21 2009 +0100
+++ b/AndroidManifest.xml	Fri Nov 20 19:29:42 2009 +0100
@@ -5,8 +5,8 @@
 	<application android:label="@string/app_name"
 		android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default"
 		android:debuggable="true" android:name="@string/app_name">
-		<activity android:name=".ui.Login" android:label="@string/app_name" android:screenOrientation="portrait"
-			android:launchMode="singleTask">
+		<activity android:name=".ui.Login" android:label="@string/app_name"
+			android:screenOrientation="portrait" android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -61,13 +61,6 @@
 					android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".jingle.demo.JingleCallActivity"
-			android:label="JingleDemoCall">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
 		<activity android:name=".ui.GroupList" android:label="GroupList">
 			<intent-filter android:label="Beem Connection">
 				<action
@@ -92,6 +85,10 @@
 		android:name="com.beem.project.beem.BEEM_SERVICE"></permission>
 	<uses-permission android:name="android.permission.INTERNET"></uses-permission>
 	<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
+	<uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission>
+	<uses-permission android:name="android.permission.WRITE_SETTINGS"></uses-permission>
+	<uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
 	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission>
 	<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"></uses-permission>
 	<uses-sdk android:minSdkVersion="3"></uses-sdk>
BEEM-Jingle