summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-05 11:28:50 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-14 14:31:17 +0000
commit54e1146ed25f6ba37161522bf840fefafb4ef2ba (patch)
treed67ff7b3b878434841924e88ce7106f461ce4f81 /android/src
parent1b9b23c0a3900daa07c055b7663b1880900165ba (diff)
downloadmullvadvpn-54e1146ed25f6ba37161522bf840fefafb4ef2ba.tar.xz
mullvadvpn-54e1146ed25f6ba37161522bf840fefafb4ef2ba.zip
Animate opening and closing Settings fragment
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt6
1 files changed, 6 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
index 8aab2197d1..fb2a5d6d77 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
@@ -92,6 +92,12 @@ class MainActivity : FragmentActivity() {
fun openSettings() {
supportFragmentManager?.beginTransaction()?.apply {
+ setCustomAnimations(
+ R.anim.fragment_enter_from_bottom,
+ R.anim.do_nothing,
+ R.anim.do_nothing,
+ R.anim.fragment_exit_to_bottom
+ )
replace(R.id.main_fragment, SettingsFragment())
addToBackStack(null)
commit()