Bug 1395557 - Show the right icon for mixed passive mode in Custom Tabs r=esawin
MozReview-Commit-ID: GHXVl3BNW9Q
--- a/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
@@ -208,16 +208,21 @@ public class ActionBarPresenter {
mIconView.setVisibility(View.INVISIBLE);
} else {
SecurityModeUtil.IconType icon;
if ("unknown".equals(security.securityMode)) {
icon = SecurityModeUtil.IconType.UNKNOWN;
} else {
icon = SecurityModeUtil.IconType.LOCK_SECURE;
}
+
+ if ("loaded".equals(security.mixedModePassive)) {
+ icon = SecurityModeUtil.IconType.WARNING;
+ }
+
mIconView.setVisibility(View.VISIBLE);
mIconView.setImageLevel(SecurityModeUtil.getImageLevel(icon));
mIdentityPopup.setSecurityInformation(security);
if (icon == SecurityModeUtil.IconType.LOCK_SECURE) {
// Lock-Secure is a special case. Keep its original green color.
DrawableCompat.setTintList(mIconView.getDrawable(), null);
} else {