diff options
| author | Albin <albin@mullvad.net> | 2023-11-07 16:15:09 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-11-07 16:15:09 +0100 |
| commit | bf2b0c7ca27b8c5bd5142a09af8aa8692921bd55 (patch) | |
| tree | 30541851f70ce343b8166587c970404b8e047b19 | |
| parent | 5720938fe9a74edced6e831f794fad7d7bd8de94 (diff) | |
| parent | 17deaacd157e8825c857ced73811198b39bb9519 (diff) | |
| download | mullvadvpn-bf2b0c7ca27b8c5bd5142a09af8aa8692921bd55.tar.xz mullvadvpn-bf2b0c7ca27b8c5bd5142a09af8aa8692921bd55.zip | |
Merge branch 'use-infra-flavor-as-app-label'
| -rw-r--r-- | android/app/src/debug/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/app/src/devmole/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | android/app/src/main/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | android/app/src/stagemole/AndroidManifest.xml | 8 |
4 files changed, 17 insertions, 2 deletions
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index e1a8f8be40..b1674e98f1 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -4,7 +4,7 @@ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> - <application android:label="@string/app_name" + <application android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher" android:theme="@style/AppTheme" diff --git a/android/app/src/devmole/AndroidManifest.xml b/android/app/src/devmole/AndroidManifest.xml new file mode 100644 index 0000000000..43b74c1f16 --- /dev/null +++ b/android/app/src/devmole/AndroidManifest.xml @@ -0,0 +1,8 @@ +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> + + <application + android:icon="@mipmap/ic_launcher" + android:label="Devmole VPN" + tools:replace="android:label" /> +</manifest> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7eede7ed33..432244d16f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -30,7 +30,6 @@ --> <activity android:name="net.mullvad.mullvadvpn.ui.MainActivity" android:exported="true" - android:label="@string/app_name" android:launchMode="singleTask" android:configChanges="orientation|screenSize|screenLayout" android:screenOrientation="locked" diff --git a/android/app/src/stagemole/AndroidManifest.xml b/android/app/src/stagemole/AndroidManifest.xml new file mode 100644 index 0000000000..3a9d85b0cc --- /dev/null +++ b/android/app/src/stagemole/AndroidManifest.xml @@ -0,0 +1,8 @@ +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> + + <application + android:icon="@mipmap/ic_launcher" + android:label="Stagemole VPN" + tools:replace="android:label" /> +</manifest> |