Set 1 line limit for expanded title to prevent wrong calcalution of height scale.

8 files changed, 8 insertions, 0 deletions

diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml
index ac10c154be..9ca5e6f75b 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -39,6 +39,7 @@
                           android:layout_height="wrap_content"
                           android:layout_marginBottom="@dimen/half_vertical_space"
                           android:layout_marginHorizontal="@dimen/side_margin"
+                          android:lines="1"
                           android:text="@string/settings_account"
                           style="@style/SettingsExpandedHeader" />
                 <net.mullvad.mullvadvpn.ui.widget.CopyableInformationView android:id="@+id/account_number"
diff --git a/android/src/main/res/layout/advanced_header.xml b/android/src/main/res/layout/advanced_header.xml
index 825e8285a4..3a711d838c 100644
--- a/android/src/main/res/layout/advanced_header.xml
+++ b/android/src/main/res/layout/advanced_header.xml
@@ -9,6 +9,7 @@
               android:layout_height="wrap_content"
               android:layout_marginTop="2dp"
               android:layout_marginLeft="@dimen/side_margin"
+              android:lines="1"
               android:text="@string/settings_advanced"
               style="@style/SettingsExpandedHeader" />
     <net.mullvad.mullvadvpn.ui.widget.MtuCell android:id="@+id/wireguard_mtu"
diff --git a/android/src/main/res/layout/preferences.xml b/android/src/main/res/layout/preferences.xml
index 398a485567..70489f4429 100644
--- a/android/src/main/res/layout/preferences.xml
+++ b/android/src/main/res/layout/preferences.xml
@@ -39,6 +39,7 @@
                           android:layout_height="wrap_content"
                           android:layout_marginTop="2dp"
                           android:layout_marginLeft="@dimen/side_margin"
+                          android:lines="1"
                           android:text="@string/settings_preferences"
                           style="@style/SettingsExpandedHeader" />
                 <net.mullvad.mullvadvpn.ui.widget.ToggleCell android:id="@+id/auto_connect"
diff --git a/android/src/main/res/layout/problem_report.xml b/android/src/main/res/layout/problem_report.xml
index 15176ecddf..66eedcf45d 100644
--- a/android/src/main/res/layout/problem_report.xml
+++ b/android/src/main/res/layout/problem_report.xml
@@ -40,6 +40,7 @@
                           android:layout_marginTop="2dp"
                           android:layout_marginBottom="8dp"
                           android:layout_marginHorizontal="@dimen/side_margin"
+                          android:lines="1"
                           android:text="@string/report_a_problem"
                           style="@style/SettingsExpandedHeader" />
                 <ViewSwitcher android:id="@+id/body_container"
diff --git a/android/src/main/res/layout/select_location_header.xml b/android/src/main/res/layout/select_location_header.xml
index 88a95f4e97..bd7ede2f3c 100644
--- a/android/src/main/res/layout/select_location_header.xml
+++ b/android/src/main/res/layout/select_location_header.xml
@@ -9,6 +9,7 @@
               android:layout_weight="0"
               android:layout_marginVertical="4dp"
               android:layout_marginHorizontal="@dimen/side_margin"
+              android:lines="1"
               android:text="@string/select_location"
               style="@style/SettingsExpandedHeader" />
     <TextView android:layout_width="wrap_content"
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 4657b8cbf0..6e51960e88 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -40,6 +40,7 @@
                           android:layout_height="wrap_content"
                           android:layout_marginTop="4dp"
                           android:layout_marginLeft="@dimen/side_margin"
+                          android:lines="1"
                           android:text="@string/settings"
                           style="@style/SettingsExpandedHeader" />
                 <net.mullvad.mullvadvpn.ui.widget.AccountCell android:id="@+id/account"
diff --git a/android/src/main/res/layout/split_tunneling_header.xml b/android/src/main/res/layout/split_tunneling_header.xml
index 84e2a70157..2f8bc681ce 100644
--- a/android/src/main/res/layout/split_tunneling_header.xml
+++ b/android/src/main/res/layout/split_tunneling_header.xml
@@ -11,6 +11,7 @@
               android:layout_marginLeft="@dimen/side_margin"
               android:layout_marginTop="2dp"
               android:layout_marginBottom="12dp"
+              android:lines="1"
               android:text="@string/split_tunneling"
               style="@style/SettingsExpandedHeader" />
     <TextView android:layout_width="match_parent"
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml
index 73ba9647bb..1300071d98 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/src/main/res/layout/wireguard_key.xml
@@ -40,6 +40,7 @@
                           android:layout_marginLeft="@dimen/side_margin"
                           android:layout_marginTop="2dp"
                           android:layout_marginBottom="@dimen/half_vertical_space"
+                          android:lines="1"
                           android:text="@string/wireguard_key"
                           style="@style/SettingsExpandedHeader" />
                 <net.mullvad.mullvadvpn.ui.widget.CopyableInformationView android:id="@+id/public_key"