am 575d07ed: am 105b9b05: Merge "Avoid unnecessary ticker animation if already visible." into klp-dev

* commit '575d07ed54514958caf80d64e0503c55abdf2577':
  Avoid unnecessary ticker animation if already visible.
This commit is contained in:
John Spurlock
2013-11-08 15:05:32 -08:00
committed by Android Git Automerger

View File

@@ -2105,9 +2105,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
}
public void tickerHalting() {
mStatusBarContents.setVisibility(View.VISIBLE);
if (mStatusBarContents.getVisibility() != View.VISIBLE) {
mStatusBarContents.setVisibility(View.VISIBLE);
mStatusBarContents
.startAnimation(loadAnim(com.android.internal.R.anim.fade_in, null));
}
mTickerView.setVisibility(View.GONE);
mStatusBarContents.startAnimation(loadAnim(com.android.internal.R.anim.fade_in, null));
// we do not animate the ticker away at this point, just get rid of it (b/6992707)
}
}