summaryrefslogtreecommitdiff
path: root/app/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorfupduck <fupduck@sacknagel.com>2017-12-14 06:00:38 -0800
committerfupduck <fupduck@sacknagel.com>2017-12-14 06:00:38 -0800
commit18e24819eed388d349dbf6d7cd21534d7074bf5d (patch)
tree3296760f98a3d67664e50b0f763bfc9f4f217f8a /app/src/main/AndroidManifest.xml
parentf19e355b2e53af5d76880bb7450137c4c9a2e227 (diff)
parent7fff5992eb7c3bf04990d652ac1bccd6df02b8bc (diff)
Merge branch '0.9.8/startActivity' into '0.9.8'
Add Splash StartActivity See merge request leap/bitmask_android!19
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
-rw-r--r--app/src/main/AndroidManifest.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8c6b25d5..16168e0f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -88,6 +88,14 @@
android:uiOptions="splitActionBarWhenNarrow"
android:launchMode="singleTop"
>
+ </activity>
+ <activity
+ android:name="se.leap.bitmaskclient.StartActivity"
+ android:label="@string/app_name"
+ android:launchMode="singleTop"
+ android:noHistory="true"
+ android:theme="@style/SplashTheme"
+ >
<intent-filter android:label="@string/app_name">
<action android:name="android.intent.action.MAIN" />