summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-26 02:32:13 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-09-21 15:28:41 +0000
commitccf83968cb5f14707990a6b224ab93ee4e0bbcb4 (patch)
treeb3a8474362eee3c76811247f070f4dbcbc5927a7 /android/src/main
parentca50bcb8a1928213bcc09c184346fd4749658d1f (diff)
downloadmullvadvpn-ccf83968cb5f14707990a6b224ab93ee4e0bbcb4.tar.xz
mullvadvpn-ccf83968cb5f14707990a6b224ab93ee4e0bbcb4.zip
Collapse account history on background touch
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt4
-rw-r--r--android/src/main/res/layout/login.xml8
2 files changed, 10 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
index 0deaff3ed8..85f2da5e61 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
@@ -55,6 +55,10 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
scrollArea = view.findViewById(R.id.scroll_area)
+ view.findViewById<View>(R.id.contents).setOnClickListener {
+ accountLogin.clearFocus()
+ }
+
fetchHistory()
scrollToShow(accountLogin)
diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml
index 7181fe6673..0f34a409c6 100644
--- a/android/src/main/res/layout/login.xml
+++ b/android/src/main/res/layout/login.xml
@@ -4,9 +4,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
- <LinearLayout android:layout_width="match_parent"
+ <LinearLayout android:id="@+id/contents"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:descendantFocusability="beforeDescendants">
<net.mullvad.mullvadvpn.ui.widget.HeaderBar android:id="@+id/header_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />