Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-29 03:44:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1063831 - Adjust mixed content and tracking protection toolbar UI indicators r=margaret

Browse Source
This commit is contained in:
Mark Finkle 2014-11-11 15:03:49 -05:00
parent 6a8621ed0d
commit 33accc61e1
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mobile/android/base/toolbar/ToolbarDisplayLayout.java
View File

@ -16,6 +16,8 @@ import org.mozilla.gecko.NewTabletUI;
import org.mozilla.gecko.R;
import org.mozilla.gecko.SiteIdentity;
import org.mozilla.gecko.SiteIdentity.SecurityMode;
import org.mozilla.gecko.SiteIdentity.MixedMode;
import org.mozilla.gecko.SiteIdentity.TrackingMode;
import org.mozilla.gecko.Tab;
import org.mozilla.gecko.animation.PropertyAnimator;
import org.mozilla.gecko.animation.ViewHelper;
@ -121,7 +123,10 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout
private TranslateAnimation mTitleSlideRight;
private final SiteIdentityPopup mSiteIdentityPopup;
private SecurityMode mSecurityMode;
private int mSecurityImageLevel;
private final int LEVEL_SHIELD = 3;
private final int LEVEL_WARNING = 4;
private PropertyAnimator mForwardAnim;
@ -422,15 +427,34 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout
mSiteIdentityPopup.setSiteIdentity(siteIdentity);
final SecurityMode securityMode;
final MixedMode mixedMode;
final TrackingMode trackingMode;
if (siteIdentity == null) {
securityMode = SecurityMode.UNKNOWN;
mixedMode = MixedMode.UNKNOWN;
trackingMode = TrackingMode.UNKNOWN;
} else {
securityMode = siteIdentity.getSecurityMode();
mixedMode = siteIdentity.getMixedMode();
trackingMode = siteIdentity.getTrackingMode();
}
if (mSecurityMode != securityMode) {
mSecurityMode = securityMode;
mSiteSecurity.setImageLevel(mSecurityMode.ordinal());
// This is a bit tricky, but we have one icon and three potential indicators.
// Default to the identity level
int imageLevel = securityMode.ordinal();
// Check to see if any protection was overridden first
if (trackingMode == TrackingMode.TRACKING_CONTENT_LOADED ||
mixedMode == MixedMode.MIXED_CONTENT_LOADED) {
imageLevel = LEVEL_WARNING;
} else if (trackingMode == TrackingMode.TRACKING_CONTENT_BLOCKED ||
mixedMode == MixedMode.MIXED_CONTENT_BLOCKED) {
imageLevel = LEVEL_SHIELD;
}
if (mSecurityImageLevel != imageLevel) {
mSecurityImageLevel = imageLevel;
mSiteSecurity.setImageLevel(mSecurityImageLevel);
updatePageActions(flags);
}
}
@ -467,8 +491,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout
mStop.setVisibility(isShowingProgress ? View.VISIBLE : View.GONE);
mPageActionLayout.setVisibility(!isShowingProgress ? View.VISIBLE : View.GONE);
boolean shouldShowSiteSecurity = (!isShowingProgress &&
mSecurityMode != SecurityMode.UNKNOWN);
boolean shouldShowSiteSecurity = (!isShowingProgress && mSecurityImageLevel > 0);
setSiteSecurityVisibility(shouldShowSiteSecurity, flags);