diff options
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3e1d743e..69632359 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -33,7 +33,8 @@ android:name=".ui.onboarding.activity.OnboardingActivity" android:configChanges="orientation|screenSize" /> - <activity android:name=".ui.proxy.ProxySelectorActivity" + <activity + android:name=".ui.proxy.ProxySelectorActivity" android:windowSoftInputMode="adjustResize" /> <activity @@ -70,8 +71,13 @@ android:label="@string/title_activity_git_log" /> <activity - android:name=".ui.settings.UserPreference" - android:label="@string/action_settings" /> + android:name=".ui.settings.SettingsActivity" + android:label="@string/action_settings" + android:parentActivityName=".ui.passwords.PasswordStore" /> + + <activity + android:name=".ui.settings.DirectorySelectionActivity" + android:theme="@style/NoBackgroundTheme" /> <activity android:name=".ui.crypto.PasswordCreationActivity" @@ -105,6 +111,10 @@ <activity android:name=".ui.folderselect.SelectFolderActivity" /> <activity + android:name=".ui.sshkeygen.SshKeyImportActivity" + android:theme="@style/NoBackgroundTheme" + android:windowSoftInputMode="adjustResize" /> + <activity android:name=".ui.sshkeygen.SshKeyGenActivity" android:label="@string/pref_ssh_keygen_title" android:windowSoftInputMode="adjustResize" /> |