diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-14 20:42:50 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-18 17:03:54 +0000 |
| commit | 7a88f1d0f6b938a2a1782187dfd0da93c61578f1 (patch) | |
| tree | a4bb7d759831af37aa54493f4ff103c7bebf3614 /android/src | |
| parent | 5cf10e54db6ed5d02a1df657513f6dab1dd2f546 (diff) | |
| download | mullvadvpn-7a88f1d0f6b938a2a1782187dfd0da93c61578f1.tar.xz mullvadvpn-7a88f1d0f6b938a2a1782187dfd0da93c61578f1.zip | |
Handle close button press
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt | 9 | ||||
| -rw-r--r-- | android/src/main/res/layout/select_location.xml | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt index f0c74fed05..54c1b1b2e7 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt @@ -5,6 +5,7 @@ import android.support.v4.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageButton class SelectLocationFragment : Fragment() { override fun onCreateView( @@ -12,6 +13,12 @@ class SelectLocationFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View { - return inflater.inflate(R.layout.select_location, container, false) + val view = inflater.inflate(R.layout.select_location, container, false) + + view.findViewById<ImageButton>(R.id.close).setOnClickListener { + activity?.onBackPressed() + } + + return view } } diff --git a/android/src/main/res/layout/select_location.xml b/android/src/main/res/layout/select_location.xml index 551e76183b..2f3af769b2 100644 --- a/android/src/main/res/layout/select_location.xml +++ b/android/src/main/res/layout/select_location.xml @@ -7,7 +7,7 @@ android:orientation="vertical" android:gravity="left" > - <ImageButton + <ImageButton android:id="@+id/close" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="12dp" |