Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

[android] Combine Password and OpenDatabase Activity into StartupActivity

Browse Source
This commit is contained in:
Torsten Grote
2019-04-29 16:15:35 -03:00
parent 451edba467
commit 5ece6505da
41 changed files with 696 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/src/main/AndroidManifest.xml
View File

@@ -73,13 +73,13 @@
</activity>
<activity
android:name="org.briarproject.briar.android.login.PasswordActivity"
android:name="org.briarproject.briar.android.login.StartupActivity"
android:label="@string/app_name"
android:windowSoftInputMode="stateVisible">
android:windowSoftInputMode="stateUnchanged">
</activity>
<activity
android:name="org.briarproject.briar.android.login.SetupActivity"
android:name="org.briarproject.briar.android.account.SetupActivity"
android:label="@string/setup_title"
android:windowSoftInputMode="adjustResize">
</activity>
@@ -94,11 +94,6 @@
</intent-filter>
</activity>
<activity
android:name=".android.login.OpenDatabaseActivity"
android:label="@string/app_name"
android:launchMode="singleTop"/>
<activity
android:name="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
android:theme="@style/BriarTheme.NoActionBar"
@@ -420,7 +415,7 @@
</activity>
<activity
android:name=".android.login.UnlockActivity"
android:name=".android.account.UnlockActivity"
android:label="@string/lock_unlock"
android:launchMode="singleTask"
android:theme="@style/BriarTheme.NoActionBar"/>