diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2021-01-12 11:19:28 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 11:19:28 +0530 |
| commit | 8bd156dea6e87eb667f76f4738fde992323ce0cf (patch) | |
| tree | 505b93720ff21cdb2d7a7144253a7d9b352d041d /app/src/main/AndroidManifest.xml | |
| parent | 91e00d897f190ec6ab5330f7b3f43d6d7f3e57fb (diff) | |
Rework settings to use ModernAndroidPreferences (#1236)
Co-authored-by: Fabian Henneke <fabian@hen.ne.ke>
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" /> |