Bug 970973 - Prevent empty space in security identity. r=lucasr
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 15 Apr 2014 11:49:23 -0700
changeset 197081 e2b517f578677bf571cd06f6973093d549c97cd6
parent 197080 814a00695b52e05a1aafc55f9d47f922b7865f59
child 197082 c80c6685d1e04357c20904d5eb637e56390662cb
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslucasr
bugs970973
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 970973 - Prevent empty space in security identity. r=lucasr
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();