From 1a073ca45455dcf46bb4d8bcaa962030a65c435a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 19 Apr 2016 18:03:24 +0200
Subject: added magic create welcome screen

---
 src/main/AndroidManifest.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/main/AndroidManifest.xml')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index dda0fbe9..83f1c517 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -77,6 +77,16 @@
                 <data android:scheme="xmpp"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.WelcomeActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".ui.MagicCreateActivity"
+            android:label="@string/create_account"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask"/>
         <activity
             android:name=".ui.SettingsActivity"
             android:label="@string/title_activity_settings"/>
@@ -139,7 +149,7 @@
             </intent-filter>
             <meta-data
                 android:name="android.service.chooser.chooser_target_service"
-                android:value=".services.ContactChooserTargetService" />
+                android:value=".services.ContactChooserTargetService"/>
         </activity>
         <activity
             android:name=".ui.TrustKeysActivity"
@@ -157,12 +167,12 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="eu.siacs.conversations.ui.SettingsActivity"/>
         </activity>
-        <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
+        <activity android:name="com.soundcloud.android.crop.CropImageActivity"/>
         <service android:name=".services.ExportLogsService"/>
         <service android:name=".services.ContactChooserTargetService"
                  android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
             <intent-filter>
-                <action android:name="android.service.chooser.ChooserTargetService" />
+                <action android:name="android.service.chooser.ChooserTargetService"/>
             </intent-filter>
         </service>
     </application>
-- 
cgit v1.2.3


From 1901abd05fc051b776e2bbb10295f936408a0843 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 22 Apr 2016 21:25:06 +0200
Subject: expert setting to manually change presence

---
 src/main/AndroidManifest.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main/AndroidManifest.xml')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 83f1c517..182a8ee9 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -87,6 +87,12 @@
             android:label="@string/create_account"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"/>
+        <activity
+            android:name=".ui.SetPresenceActivity"
+            android:label="@string/change_presence"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateHidden|adjustResize"
+            android:launchMode="singleTask"/>
         <activity
             android:name=".ui.SettingsActivity"
             android:label="@string/title_activity_settings"/>
-- 
cgit v1.2.3