equal
deleted
inserted
replaced
32 android:launchMode="singleTop" |
32 android:launchMode="singleTop" |
33 android:screenOrientation="portrait" /> |
33 android:screenOrientation="portrait" /> |
34 <activity |
34 <activity |
35 android:name=".ui.Settings" |
35 android:name=".ui.Settings" |
36 android:label="@string/edit_settings_name"> |
36 android:label="@string/edit_settings_name"> |
37 <intent-filter> |
37 <intent-filter |
38 <action |
38 android:label="Beem Android Account"> |
39 android:name="com.beem.project.beem.MAIN" /> |
39 <action |
|
40 android:name="com.beem.project.beem.SETTINGS" /> |
40 <category |
41 <category |
41 android:name="android.intent.category.DEFAULT" /> |
42 android:name="android.intent.category.DEFAULT" /> |
42 </intent-filter> |
43 </intent-filter> |
43 <intent-filter |
44 <intent-filter |
44 android:label="Beem Connection"> |
45 android:label="Beem Connection"> |
60 android:name=".ui.ChangeStatus" |
61 android:name=".ui.ChangeStatus" |
61 android:label="@string/ChangeStatusActTitle" |
62 android:label="@string/ChangeStatusActTitle" |
62 android:launchMode="singleTask" |
63 android:launchMode="singleTask" |
63 android:windowSoftInputMode="stateHidden"> |
64 android:windowSoftInputMode="stateHidden"> |
64 <intent-filter |
65 <intent-filter |
|
66 android:label="Beem Android Account"> |
|
67 <action |
|
68 android:name="com.beem.project.beem.CHANGESTATUS" /> |
|
69 <category |
|
70 android:name="android.intent.category.DEFAULT" /> |
|
71 </intent-filter> |
|
72 <intent-filter |
65 android:label="Beem Connection"> |
73 android:label="Beem Connection"> |
66 <action |
74 <action |
67 android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" /> |
75 android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" /> |
68 </intent-filter> |
76 </intent-filter> |
69 </activity> |
77 </activity> |
112 android:label="@string/privacy_list_name"> |
120 android:label="@string/privacy_list_name"> |
113 <intent-filter |
121 <intent-filter |
114 android:label="Beem Connection"> |
122 android:label="Beem Connection"> |
115 <action |
123 <action |
116 android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" /> |
124 android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" /> |
|
125 </intent-filter> |
|
126 </activity> |
|
127 <activity |
|
128 android:name="com.beem.project.beem.account.ManageAccountsSettings" |
|
129 android:label="Sync Settings"> |
|
130 <intent-filter> |
|
131 <action |
|
132 android:name="android.intent.action.MAIN" /> |
|
133 <action |
|
134 android:name="android.settings.ACCOUNT_SYNC_SETTINGS" /> |
|
135 <category |
|
136 android:name="android.intent.category.DEFAULT" /> |
117 </intent-filter> |
137 </intent-filter> |
118 </activity> |
138 </activity> |
119 <!-- |
139 <!-- |
120 Could be interesting if we would launch beem at startup <receiver |
140 Could be interesting if we would launch beem at startup <receiver |
121 android:name=".tool.BeemBroadcastReceiver" android:enabled="true"> |
141 android:name=".tool.BeemBroadcastReceiver" android:enabled="true"> |