summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-17 10:05:00 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-17 10:05:00 -0300
commite64cb434e8618805b58bc8913b5187404ebdf25a (patch)
treef2152f9a7fc8e9fbb385f17647fb645560cb0049
parent2165675f9e851c821d2e402cd81f3755154f3dd3 (diff)
parent39f1b42f7019b5cafee70ff3bd30c4ce499a4502 (diff)
downloadmullvadvpn-e64cb434e8618805b58bc8913b5187404ebdf25a.tar.xz
mullvadvpn-e64cb434e8618805b58bc8913b5187404ebdf25a.zip
Merge branch 'swap-country-city-text'
-rw-r--r--android/src/main/res/layout/connect.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml
index 44a73b01f6..5fa1eaa35a 100644
--- a/android/src/main/res/layout/connect.xml
+++ b/android/src/main/res/layout/connect.xml
@@ -145,7 +145,7 @@
android:text="@string/unsecured_connection"
android:textAllCaps="true"
/>
- <TextView android:id="@+id/country"
+ <TextView android:id="@+id/city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
@@ -154,7 +154,7 @@
android:textStyle="bold"
android:text=""
/>
- <TextView android:id="@+id/city"
+ <TextView android:id="@+id/country"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"