Bug 970973 - Prevent empty space in security identity. r=lucasr, a=lsblakk
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 15 Apr 2014 11:49:23 -0700
changeset 192964 39276205c4852f02939f7880d5ff2718ae1c80d3
parent 192963 6baeb7902e341a3b5bf15e36c9023593a02ad52f
child 192965 9c2b0a1b2b17e27e1a0095da0f9f63f6eaa31d80
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslucasr, lsblakk
bugs970973
milestone30.0a2
Bug 970973 - Prevent empty space in security identity. r=lucasr, a=lsblakk
mobile/android/base/toolbar/ToolbarDisplayLayout.java
--- a/mobile/android/base/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/base/toolbar/ToolbarDisplayLayout.java
@@ -439,24 +439,24 @@ public class ToolbarDisplayLayout extend
 
     private void setSiteSecurityVisibility(boolean visible, EnumSet<UpdateFlags> flags) {
         if (visible == mSiteSecurityVisible) {
             return;
         }
 
         mSiteSecurityVisible = visible;
 
+        mTitle.clearAnimation();
+        mSiteSecurity.clearAnimation();
+
         if (flags.contains(UpdateFlags.DISABLE_ANIMATIONS)) {
             mSiteSecurity.setVisibility(visible ? View.VISIBLE : View.GONE);
             return;
         }
 
-        mTitle.clearAnimation();
-        mSiteSecurity.clearAnimation();
-
         // If any of these animations were cancelled as a result of the
         // clearAnimation() calls above, we need to reset them.
         mLockFadeIn.reset();
         mTitleSlideLeft.reset();
         mTitleSlideRight.reset();
 
         if (mForwardAnim != null) {
             long delay = mForwardAnim.getRemainingTime();