diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-11 17:40:02 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-17 10:14:37 +0000 |
| commit | 9269cf8893536e99201187b80bcd7e354eaeffab (patch) | |
| tree | cb97f934070b6a085208ad7d3d0dfab425dbf915 /android/src/main | |
| parent | 64b9a75a676bba10ad0e5e4fd571d1885f52a220 (diff) | |
| download | mullvadvpn-9269cf8893536e99201187b80bcd7e354eaeffab.tar.xz mullvadvpn-9269cf8893536e99201187b80bcd7e354eaeffab.zip | |
Implement back to settings button behavior
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt | 10 | ||||
| -rw-r--r-- | android/src/main/res/layout/account.xml | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt index 81105ac825..828090d21b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt @@ -11,5 +11,13 @@ class AccountFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View = inflater.inflate(R.layout.account, container, false) + ): View { + val view = inflater.inflate(R.layout.account, container, false) + + view.findViewById<View>(R.id.back).setOnClickListener { + activity?.onBackPressed() + } + + return view + } } diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml index ac8e812921..89b2e38f60 100644 --- a/android/src/main/res/layout/account.xml +++ b/android/src/main/res/layout/account.xml @@ -7,7 +7,7 @@ android:gravity="left" android:elevation="2dp" > - <LinearLayout + <LinearLayout android:id="@+id/back" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" |