Fix some layout issues on 4.x

2015-11-08 17:10:23 +08:00
parent 232846a416
commit d6c45df372
4 changed files with 12 additions and 3 deletions
@@ -1031,12 +1031,12 @@ class Shadowsocks
          fabProgressCircle.show()
          setPreferenceEnabled(enabled = false)
        case State.CONNECTED =>
-          if (state == State.CONNECTING) fabProgressCircle.beginFinalAnimation()
+          if (state == State.CONNECTING) fabProgressCircle.beginFinalAnimation() else fabProgressCircle.hide()
          fab.setEnabled(true)
          changeSwitch(checked = true)
          setPreferenceEnabled(enabled = false)
        case State.STOPPED =>
-          if (state == State.STOPPING || state == State.CONNECTING) fabProgressCircle.hide()
+          fabProgressCircle.hide()
          fab.setEnabled(true)
          changeSwitch(checked = false)
          if (m != null) Snackbar.make(getWindow.getDecorView.findViewById(android.R.id.content),