diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-07-30 13:14:58 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-07-30 13:14:58 +0200 |
| commit | a9464196dbf588e193b133927b2ef54bca323e2c (patch) | |
| tree | a9dceb80264989a684c554771dfc6cab6193d840 /android | |
| parent | 5fa4f9684bd016b602361bd2b4b64ba54890d694 (diff) | |
| parent | 047df31501ea5e127a02edaf4f8f1af06581508b (diff) | |
| download | mullvadvpn-a9464196dbf588e193b133927b2ef54bca323e2c.tar.xz mullvadvpn-a9464196dbf588e193b133927b2ef54bca323e2c.zip | |
Merge branch 'investigate-predictive-back-droid-1036'
Diffstat (limited to 'android')
| -rw-r--r-- | android/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/app/src/main/AndroidManifest.xml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md index 857117c53d..25717d24ae 100644 --- a/android/CHANGELOG.md +++ b/android/CHANGELOG.md @@ -24,6 +24,7 @@ Line wrap the file at 100 chars. Th ## [Unreleased] ### Added - Add the ability to customize how the app talks to the api. +- Add support for predictive back. ### Changed - Migrate underlaying communication wtih daemon to gRPC. This also implies major changes and diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f69801a46d..9247112466 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -42,7 +42,8 @@ android:launchMode="singleInstance" android:screenOrientation="fullUser" android:windowSoftInputMode="adjustResize" - tools:ignore="DiscouragedApi"> + android:enableOnBackInvokedCallback="true" + tools:ignore="DiscouragedApi,UnusedAttribute"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> |