summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt5
-rw-r--r--android/src/main/res/layout/settings.xml6
2 files changed, 0 insertions, 11 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index 641156fed7..6725430052 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.Button
import android.widget.ImageButton
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
@@ -50,10 +49,6 @@ class SettingsFragment : ServiceAwareFragment() {
activity?.onBackPressed()
}
- view.findViewById<Button>(R.id.quit_button).setOnClickListener {
- parentActivity.quit()
- }
-
accountMenu = view.findViewById<AccountCell>(R.id.account).apply {
targetFragment = AccountFragment::class
}
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 72fd6195db..ffacac72c3 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -69,12 +69,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/vertical_space"
mullvad:text="@string/report_a_problem" />
- <Button android:id="@+id/quit_button"
- android:layout_marginHorizontal="@dimen/side_margin"
- android:layout_marginTop="@dimen/vertical_space"
- android:layout_marginBottom="@dimen/screen_vertical_margin"
- android:text="@string/quit"
- style="@style/RedButton" />
</LinearLayout>
</net.mullvad.mullvadvpn.ui.widget.ListenableScrollView>
</LinearLayout>