diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-02 14:17:12 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-02 14:17:12 -0300 |
| commit | e6b1e57f8d51b491ffb6c973787c8d82c207a89b (patch) | |
| tree | f8035591f7a8712ff619b15907af00222be6680f | |
| parent | 93ceb15cf4f69985b5af3d6366a2ef12e5a72a60 (diff) | |
| parent | 6c774a35e03b177c8cf1ae8d5b3572d8c3156093 (diff) | |
| download | mullvadvpn-e6b1e57f8d51b491ffb6c973787c8d82c207a89b.tar.xz mullvadvpn-e6b1e57f8d51b491ffb6c973787c8d82c207a89b.zip | |
Merge branch 'enter-split-screen-smoothly'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/src/main/AndroidManifest.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 531c768837..793c2f6355 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ Line wrap the file at 100 chars. Th - Fix crash when entering split-screen mode whilst on the Report a Problem screen. - Fix invalid back stack history when connection to service is lost and the app returns to the launch screen. +- Fix app leaving settings screen when entering split-screen mode. #### Windows - Fix race in network adapter monitor that could result in data corruption and crashes. diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 29e0c013d2..71cba09f0e 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ tools:ignore="GoogleAppIndexingWarning"> <activity android:name="net.mullvad.mullvadvpn.ui.MainActivity" android:label="@string/app_name" - android:configChanges="orientation" + android:configChanges="orientation|screenSize|screenLayout" android:screenOrientation="portrait" android:windowSoftInputMode="adjustPan"> <intent-filter> |