Bug 966866 - Correctly update SiteIdentityPopup for MIXED_CONTENT_BLOCKED (r=margaret, a=sylvestre)
authorLucas Rocha <lucasr@mozilla.com>
Fri, 07 Feb 2014 19:21:28 +0000
changeset 176936 ae766edb572beebccc33f83bdaaacd4598b18b64
parent 176935 55e2d0038af7eb06ba7590d45a29462421deaead
child 176937 358ca4ea3b30e7beeacfeb89fc1afebe454cf7df
push id5211
push userlrocha@mozilla.com
push dateMon, 10 Feb 2014 11:15:29 +0000
treeherdermozilla-aurora@ae766edb572b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret, sylvestre
bugs966866
milestone29.0a2
Bug 966866 - Correctly update SiteIdentityPopup for MIXED_CONTENT_BLOCKED (r=margaret, a=sylvestre)
mobile/android/base/toolbar/SiteIdentityPopup.java
--- a/mobile/android/base/toolbar/SiteIdentityPopup.java
+++ b/mobile/android/base/toolbar/SiteIdentityPopup.java
@@ -74,17 +74,18 @@ public class SiteIdentityPopup extends A
         mVerifier = (TextView) mIdentity.findViewById(R.id.verifier);
     }
 
     private void updateUi() {
         if (!mInflated) {
             init();
         }
 
-        if (mSiteIdentity.getSecurityMode() == SecurityMode.MIXED_CONTENT_LOADED) {
+        if (mSiteIdentity.getSecurityMode() == SecurityMode.MIXED_CONTENT_LOADED ||
+            mSiteIdentity.getSecurityMode() == SecurityMode.MIXED_CONTENT_BLOCKED) {
             // Hide the identity data if there isn't valid site identity data.
             // Set some top padding on the popup content to create a of light blue
             // between the popup arrow and the mixed content notification.
             mContent.setPadding(0, (int) mResources.getDimension(R.dimen.identity_padding_top), 0, 0);
             mIdentity.setVisibility(View.GONE);
         } else {
             mHost.setText(mSiteIdentity.getHost());