Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android

2015-11-19 14:34:02 +08:00
parent 81587b0551 bcbd409cd7
commit 52cd6d1576
1 changed files with 0 additions and 4 deletions
@@ -440,22 +440,18 @@ class Shadowsocks
      bgService.getState match {
        case State.CONNECTING =>
          fab.setBackgroundTintList(greyTint)
-          fabProgressCircle.show()
          changeSwitch(checked = true)
          setPreferenceEnabled(false)
        case State.CONNECTED =>
          fab.setBackgroundTintList(greenTint)
-          fabProgressCircle.hide()
          changeSwitch(checked = true)
          setPreferenceEnabled(false)
        case State.STOPPING =>
          fab.setBackgroundTintList(greyTint)
-          fabProgressCircle.show()
          changeSwitch(checked = false)
          setPreferenceEnabled(false)
        case _ =>
          fab.setBackgroundTintList(greyTint)
-          fabProgressCircle.hide()
          changeSwitch(checked = false)
          setPreferenceEnabled(true)
      }