diff options
| author | Emīls <emils@mullvad.net> | 2020-04-20 17:15:15 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-04-20 17:15:15 +0100 |
| commit | 54811af85a1e862326e8c4e1a4a4057149639d95 (patch) | |
| tree | 0bf4bfc19a86471815d5a8f243bbb2e5ca114a94 | |
| parent | 450e082066748c188372bb32946325b9884173a3 (diff) | |
| parent | 1e4545777e4c7d25d78e6fc54277620fadbb44a9 (diff) | |
| download | mullvadvpn-54811af85a1e862326e8c4e1a4a4057149639d95.tar.xz mullvadvpn-54811af85a1e862326e8c4e1a4a4057149639d95.zip | |
Merge branch 'android-no-email-buttons'
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | android/src/main/res/layout/confirm_no_email.xml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f81b72df1..0e7f7d129a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,9 @@ Line wrap the file at 100 chars. Th #### Windows - Improve offline detection logic. +#### Android +- Change button colors on problem report no email confirmation dialog to match the desktop version. + ### Security #### macOS - Ship native Node modules unpacked to prevent malware checks by macOS on each run. The malware diff --git a/android/src/main/res/layout/confirm_no_email.xml b/android/src/main/res/layout/confirm_no_email.xml index 64a4e8aa1a..10955cf0f6 100644 --- a/android/src/main/res/layout/confirm_no_email.xml +++ b/android/src/main/res/layout/confirm_no_email.xml @@ -15,9 +15,9 @@ android:text="@string/confirm_no_email" /> <Button android:id="@+id/send_button" android:text="@string/send_anyway" - style="@style/GreenButton" /> + style="@style/RedButton" /> <Button android:id="@+id/back_button" android:layout_marginTop="16dp" android:text="@string/back" - style="@style/RedButton" /> + style="@style/BlueButton" /> </LinearLayout> |