equal
deleted
inserted
replaced
3 package="com.beem.project.beem" android:versionCode="1" |
3 package="com.beem.project.beem" android:versionCode="1" |
4 android:versionName="1.0"> |
4 android:versionName="1.0"> |
5 <application android:label="@string/app_name" |
5 <application android:label="@string/app_name" |
6 android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default" |
6 android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default" |
7 android:debuggable="true" android:name="@string/app_name"> |
7 android:debuggable="true" android:name="@string/app_name"> |
8 <activity android:name=".ui.Login" android:label="@string/app_name" android:screenOrientation="portrait" |
8 <activity android:name=".ui.Login" android:label="@string/app_name" |
9 android:launchMode="singleTask"> |
9 android:screenOrientation="portrait" android:launchMode="singleTask"> |
10 <intent-filter> |
10 <intent-filter> |
11 <action android:name="android.intent.action.MAIN" /> |
11 <action android:name="android.intent.action.MAIN" /> |
12 <category android:name="android.intent.category.LAUNCHER" /> |
12 <category android:name="android.intent.category.LAUNCHER" /> |
13 </intent-filter> |
13 </intent-filter> |
14 <intent-filter android:label="Beem Connection"> |
14 <intent-filter android:label="Beem Connection"> |
59 <intent-filter android:label="Beem Connection"> |
59 <intent-filter android:label="Beem Connection"> |
60 <action |
60 <action |
61 android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" /> |
61 android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" /> |
62 </intent-filter> |
62 </intent-filter> |
63 </activity> |
63 </activity> |
64 <activity android:name=".jingle.demo.JingleCallActivity" |
|
65 android:label="JingleDemoCall"> |
|
66 <intent-filter> |
|
67 <action android:name="android.intent.action.MAIN" /> |
|
68 <category android:name="android.intent.category.LAUNCHER" /> |
|
69 </intent-filter> |
|
70 </activity> |
|
71 <activity android:name=".ui.GroupList" android:label="GroupList"> |
64 <activity android:name=".ui.GroupList" android:label="GroupList"> |
72 <intent-filter android:label="Beem Connection"> |
65 <intent-filter android:label="Beem Connection"> |
73 <action |
66 <action |
74 android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" /> |
67 android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" /> |
75 </intent-filter> |
68 </intent-filter> |
90 <permission android:permissionGroup="android.permission-group.NETWORK" |
83 <permission android:permissionGroup="android.permission-group.NETWORK" |
91 android:label="BeemService" android:description="@string/BeemServiceDescription" |
84 android:label="BeemService" android:description="@string/BeemServiceDescription" |
92 android:name="com.beem.project.beem.BEEM_SERVICE"></permission> |
85 android:name="com.beem.project.beem.BEEM_SERVICE"></permission> |
93 <uses-permission android:name="android.permission.INTERNET"></uses-permission> |
86 <uses-permission android:name="android.permission.INTERNET"></uses-permission> |
94 <uses-permission android:name="android.permission.VIBRATE"></uses-permission> |
87 <uses-permission android:name="android.permission.VIBRATE"></uses-permission> |
|
88 <uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission> |
|
89 <uses-permission android:name="android.permission.WRITE_SETTINGS"></uses-permission> |
|
90 <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission> |
|
91 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission> |
95 <uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission> |
92 <uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission> |
96 <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"></uses-permission> |
93 <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"></uses-permission> |
97 <uses-sdk android:minSdkVersion="3"></uses-sdk> |
94 <uses-sdk android:minSdkVersion="3"></uses-sdk> |
98 |
95 |
99 </manifest> |
96 </manifest> |