Backout 111b3d84c479 (bug 885962) for Android bustage on a CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Thu, 18 Jul 2013 21:31:44 -0700
changeset 146792 c3061aed82c9d9585259d8b91a9c89aded27dcb4
parent 146791 a8aa3006efb903d78f93a817bbc35bf8fef512fc
child 146793 4b4e29861bef417feb4c1432a9738af4056045e3
push idunknown
push userunknown
push dateunknown
bugs885962
milestone25.0a1
backs out111b3d84c47993ecd0fb6be2bbc2c6b507764316
Backout 111b3d84c479 (bug 885962) for Android bustage on a CLOSED TREE
mobile/android/base/DoorHanger.java
mobile/android/base/Makefile.in
mobile/android/base/SiteIdentityPopup.java
mobile/android/base/resources/drawable-hdpi/larry.png
mobile/android/base/resources/drawable-hdpi/larry_blue.png
mobile/android/base/resources/drawable-hdpi/larry_green.png
mobile/android/base/resources/drawable-hdpi/lock_identified.png
mobile/android/base/resources/drawable-hdpi/lock_verified.png
mobile/android/base/resources/drawable-hdpi/shield.png
mobile/android/base/resources/drawable-hdpi/shield_doorhanger.png
mobile/android/base/resources/drawable-hdpi/site_security_blocked_mixed_content.png
mobile/android/base/resources/drawable-hdpi/site_security_identified.png
mobile/android/base/resources/drawable-hdpi/site_security_loaded_mixed_content.png
mobile/android/base/resources/drawable-hdpi/site_security_verified.png
mobile/android/base/resources/drawable-hdpi/warning.png
mobile/android/base/resources/drawable-hdpi/warning_doorhanger.png
mobile/android/base/resources/drawable-mdpi/larry.png
mobile/android/base/resources/drawable-mdpi/larry_blue.png
mobile/android/base/resources/drawable-mdpi/larry_green.png
mobile/android/base/resources/drawable-mdpi/lock_identified.png
mobile/android/base/resources/drawable-mdpi/lock_verified.png
mobile/android/base/resources/drawable-mdpi/shield.png
mobile/android/base/resources/drawable-mdpi/shield_doorhanger.png
mobile/android/base/resources/drawable-mdpi/site_security_blocked_mixed_content.png
mobile/android/base/resources/drawable-mdpi/site_security_identified.png
mobile/android/base/resources/drawable-mdpi/site_security_loaded_mixed_content.png
mobile/android/base/resources/drawable-mdpi/site_security_verified.png
mobile/android/base/resources/drawable-mdpi/warning.png
mobile/android/base/resources/drawable-mdpi/warning_doorhanger.png
mobile/android/base/resources/drawable-xhdpi/larry.png
mobile/android/base/resources/drawable-xhdpi/larry_blue.png
mobile/android/base/resources/drawable-xhdpi/larry_green.png
mobile/android/base/resources/drawable-xhdpi/lock_identified.png
mobile/android/base/resources/drawable-xhdpi/lock_verified.png
mobile/android/base/resources/drawable-xhdpi/shield.png
mobile/android/base/resources/drawable-xhdpi/shield_doorhanger.png
mobile/android/base/resources/drawable-xhdpi/site_security_blocked_mixed_content.png
mobile/android/base/resources/drawable-xhdpi/site_security_identified.png
mobile/android/base/resources/drawable-xhdpi/site_security_loaded_mixed_content.png
mobile/android/base/resources/drawable-xhdpi/site_security_verified.png
mobile/android/base/resources/drawable-xhdpi/warning.png
mobile/android/base/resources/drawable-xhdpi/warning_doorhanger.png
mobile/android/base/resources/drawable/site_security_level.xml
mobile/android/base/resources/layout/doorhanger.xml
mobile/android/base/resources/layout/site_identity.xml
mobile/android/base/resources/values/colors.xml
mobile/android/base/resources/values/dimens.xml
--- a/mobile/android/base/DoorHanger.java
+++ b/mobile/android/base/DoorHanger.java
@@ -7,134 +7,98 @@ package org.mozilla.gecko;
 
 import org.mozilla.gecko.widget.Divider;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Rect;
 import android.os.Build;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.URLSpan;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.List;
 
-class DoorHanger extends LinearLayout {
+public class DoorHanger extends LinearLayout {
     private static final String LOGTAG = "GeckoDoorHanger";
 
     private static int sInputPadding = -1;
     private static int sSpinnerTextColor = -1;
     private static int sSpinnerTextSize = -1;
 
     private static LayoutParams sButtonParams;
     static {
         sButtonParams = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 1.0f);
     }
 
     private final TextView mTextView;
-    private final ImageView mIcon;
     private final LinearLayout mChoicesLayout;
 
     // Divider between doorhangers.
     private final View mDivider;
 
     // The tab associated with this notification.
     private final int mTabId;
 
     // Value used to identify the notification.
     private final String mValue;
 
-    private Resources mResources;
-
     private List<PromptInput> mInputs;
     private CheckBox mCheckBox;
 
     private int mPersistence = 0;
     private boolean mPersistWhileVisible = false;
     private long mTimeout = 0;
 
-    // Color used for dividers above and between buttons.
-    private int mDividerColor;
-
-    static enum Theme {
-        LIGHT,
-        DARK
-    }
-
-    interface OnButtonClickListener {
+    public interface OnButtonClickListener {
         public void onButtonClick(DoorHanger dh, String tag);
     }
 
-    DoorHanger(Context context, Theme theme) {
-        this(context, 0, null, theme);
+    DoorHanger(Context context) {
+        this(context, 0, null);
     }
 
     DoorHanger(Context context, int tabId, String value) {
-        this(context, tabId, value, Theme.LIGHT);
-    }
-
-    private DoorHanger(Context context, int tabId, String value, Theme theme) {
         super(context);
 
         mTabId = tabId;
         mValue = value;
-        mResources = getResources();
 
         if (sInputPadding == -1) {
-            sInputPadding = mResources.getDimensionPixelSize(R.dimen.doorhanger_padding);
+            sInputPadding = getResources().getDimensionPixelSize(R.dimen.doorhanger_padding);
         }
         if (sSpinnerTextColor == -1) {
-            sSpinnerTextColor = mResources.getColor(R.color.text_color_primary_disable_only);
+            sSpinnerTextColor = getResources().getColor(R.color.text_color_primary_disable_only);
         }
         if (sSpinnerTextSize == -1) {
-            sSpinnerTextSize = mResources.getDimensionPixelSize(R.dimen.doorhanger_spinner_textsize);
+            sSpinnerTextSize = getResources().getDimensionPixelSize(R.dimen.doorhanger_spinner_textsize);
         }
 
         setOrientation(VERTICAL);
 
         LayoutInflater.from(context).inflate(R.layout.doorhanger, this);
         mTextView = (TextView) findViewById(R.id.doorhanger_title);
-        mIcon = (ImageView) findViewById(R.id.doorhanger_icon);
         mChoicesLayout = (LinearLayout) findViewById(R.id.doorhanger_choices);
         mDivider = findViewById(R.id.divider_doorhanger);
-
-        setTheme(theme);
-    }
-
-    private void setTheme(Theme theme) {
-        if (theme == Theme.LIGHT) {
-            // The default styles declared in doorhanger.xml are light-themed, so we just
-            // need to set the divider color that we'll use in addButton.
-            mDividerColor = mResources.getColor(R.color.doorhanger_divider_light);
-
-        } else if (theme == Theme.DARK) {
-            mDividerColor = mResources.getColor(R.color.doorhanger_divider_dark);
-
-            // Set a dark background, and use a smaller text size for dark-themed DoorHangers.
-            setBackgroundColor(mResources.getColor(R.color.doorhanger_background_dark));
-            mTextView.setTextSize(mResources.getDimension(R.dimen.doorhanger_textsize_small));
-        }
     }
 
     int getTabId() {
         return mTabId;
     }
 
     String getValue() {
         return mValue;
@@ -155,21 +119,16 @@ class DoorHanger extends LinearLayout {
     void hideDivider() {
         mDivider.setVisibility(View.GONE);
     }
 
     void setMessage(String message) {
         mTextView.setText(message);
     }
 
-    void setIcon(int resId) {
-        mIcon.setImageResource(resId);
-        mIcon.setVisibility(View.VISIBLE);
-    }
-
     void addLink(String label, String url, String delimiter) {
         String title = mTextView.getText().toString();
         SpannableString titleWithLink = new SpannableString(title + delimiter + label);
         URLSpan linkSpan = new URLSpan(url) {
             @Override
             public void onClick(View view) {
                 Tabs.getInstance().loadUrlInTab(getURL());
             }
@@ -194,25 +153,22 @@ class DoorHanger extends LinearLayout {
             public void onClick(View v) {
                 listener.onButtonClick(DoorHanger.this, tag);
             }
         });
 
         if (mChoicesLayout.getChildCount() == 0) {
             // If this is the first button we're adding, make the choices layout visible.
             mChoicesLayout.setVisibility(View.VISIBLE);
-            // Make the divider above the buttons visible.
-            View divider = findViewById(R.id.divider_choices);
-            divider.setVisibility(View.VISIBLE);
-            divider.setBackgroundColor(mDividerColor);
+            findViewById(R.id.divider_choices).setVisibility(View.VISIBLE);
         } else {
-            // Add a vertical divider between additional buttons.
+            // Add a divider for additional buttons.
             Divider divider = new Divider(getContext(), null);
             divider.setOrientation(Divider.Orientation.VERTICAL);
-            divider.setBackgroundColor(mDividerColor);
+            divider.setBackgroundColor(0xFFD1D5DA);
             mChoicesLayout.addView(divider);
         }
 
         mChoicesLayout.addView(button, sButtonParams);
     }
 
     void setOptions(final JSONObject options) {
         final int persistence = options.optInt("persistence");
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -678,30 +678,31 @@ RES_DRAWABLE_MDPI = \
   res/drawable-mdpi/toast_divider.9.png \
   res/drawable-mdpi/address_bar_url_default.9.png \
   res/drawable-mdpi/address_bar_url_default_pb.9.png \
   res/drawable-mdpi/address_bar_url_pressed.9.png \
   res/drawable-mdpi/address_bar_url_pressed_pb.9.png \
   res/drawable-mdpi/find_close.png \
   res/drawable-mdpi/find_next.png \
   res/drawable-mdpi/find_prev.png \
-  res/drawable-mdpi/larry.png \
-  res/drawable-mdpi/lock_identified.png \
-  res/drawable-mdpi/lock_verified.png \
+  res/drawable-mdpi/larry_blue.png \
+  res/drawable-mdpi/larry_green.png \
   res/drawable-mdpi/menu.png \
   res/drawable-mdpi/menu_pb.png \
   res/drawable-mdpi/menu_panel_bg.9.png \
   res/drawable-mdpi/menu_popup_bg.9.png \
   res/drawable-mdpi/menu_popup_arrow_bottom.png \
   res/drawable-mdpi/menu_popup_arrow_top.png \
   res/drawable-mdpi/menu_item_check.png \
   res/drawable-mdpi/menu_item_more.png \
   res/drawable-mdpi/menu_item_uncheck.png \
-  res/drawable-mdpi/shield.png \
-  res/drawable-mdpi/shield_doorhanger.png \
+  res/drawable-mdpi/site_security_blocked_mixed_content.png \
+  res/drawable-mdpi/site_security_loaded_mixed_content.png \
+  res/drawable-mdpi/site_security_identified.png \
+  res/drawable-mdpi/site_security_verified.png \
   res/drawable-mdpi/tabs_normal.png \
   res/drawable-mdpi/tabs_private.png \
   res/drawable-mdpi/tabs_synced.png \
   res/drawable-mdpi/urlbar_stop.png \
   res/drawable-mdpi/reader.png \
   res/drawable-mdpi/reader_active.png \
   res/drawable-mdpi/reading_list.png \
   res/drawable-mdpi/validation_arrow.png \
@@ -711,18 +712,16 @@ RES_DRAWABLE_MDPI = \
   res/drawable-mdpi/bookmarkdefaults_favicon_addons.png \
   res/drawable-mdpi/handle_end.png \
   res/drawable-mdpi/handle_middle.png \
   res/drawable-mdpi/handle_start.png \
   res/drawable-mdpi/scrollbar.png \
   res/drawable-mdpi/shadow.png \
   res/drawable-mdpi/start.png \
   res/drawable-mdpi/marketplace.png \
-  res/drawable-mdpi/warning.png \
-  res/drawable-mdpi/warning_doorhanger.png \
   $(NULL)
 
 RES_DRAWABLE_LDPI = \
   $(SYNC_RES_DRAWABLE_LDPI) \
   $(NULL)
 
 RES_DRAWABLE_HDPI = \
   $(SYNC_RES_DRAWABLE_HDPI) \
@@ -786,45 +785,44 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/tabs_count_foreground.png \
   res/drawable-hdpi/address_bar_url_default.9.png \
   res/drawable-hdpi/address_bar_url_default_pb.9.png \
   res/drawable-hdpi/address_bar_url_pressed.9.png \
   res/drawable-hdpi/address_bar_url_pressed_pb.9.png \
   res/drawable-hdpi/find_close.png \
   res/drawable-hdpi/find_next.png \
   res/drawable-hdpi/find_prev.png \
-  res/drawable-hdpi/larry.png \
-  res/drawable-hdpi/lock_identified.png \
-  res/drawable-hdpi/lock_verified.png \
+  res/drawable-hdpi/larry_blue.png \
+  res/drawable-hdpi/larry_green.png \
   res/drawable-hdpi/menu.png \
   res/drawable-hdpi/menu_pb.png \
   res/drawable-hdpi/menu_panel_bg.9.png \
   res/drawable-hdpi/menu_popup_bg.9.png \
   res/drawable-hdpi/menu_popup_arrow_bottom.png \
   res/drawable-hdpi/menu_popup_arrow_top.png \
   res/drawable-hdpi/menu_item_check.png \
   res/drawable-hdpi/menu_item_more.png \
   res/drawable-hdpi/menu_item_uncheck.png \
-  res/drawable-hdpi/shield.png \
-  res/drawable-hdpi/shield_doorhanger.png \
+  res/drawable-hdpi/site_security_blocked_mixed_content.png \
+  res/drawable-hdpi/site_security_loaded_mixed_content.png \
+  res/drawable-hdpi/site_security_identified.png \
+  res/drawable-hdpi/site_security_verified.png \
   res/drawable-hdpi/tabs_normal.png \
   res/drawable-hdpi/tabs_private.png \
   res/drawable-hdpi/tabs_synced.png \
   res/drawable-hdpi/urlbar_stop.png \
   res/drawable-hdpi/reader.png \
   res/drawable-hdpi/reader_active.png \
   res/drawable-hdpi/reading_list.png \
   res/drawable-hdpi/validation_arrow.png \
   res/drawable-hdpi/validation_arrow_inverted.png \
   res/drawable-hdpi/validation_bg.9.png \
   res/drawable-hdpi/handle_end.png \
   res/drawable-hdpi/handle_middle.png \
   res/drawable-hdpi/handle_start.png \
-  res/drawable-hdpi/warning.png \
-  res/drawable-hdpi/warning_doorhanger.png \
   $(NULL)
 
 RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/blank.png \
   res/drawable-xhdpi/favicon.png \
   res/drawable-xhdpi/folder.png \
   res/drawable-xhdpi/abouthome_icon.png \
   res/drawable-xhdpi/abouthome_logo_dark.png \
@@ -882,44 +880,43 @@ RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/tabs_count_foreground.png \
   res/drawable-xhdpi/find_close.png \
   res/drawable-xhdpi/find_next.png \
   res/drawable-xhdpi/find_prev.png \
   res/drawable-xhdpi/urlbar_stop.png \
   res/drawable-xhdpi/reader.png \
   res/drawable-xhdpi/reader_active.png \
   res/drawable-xhdpi/reading_list.png \
-  res/drawable-xhdpi/larry.png \
-  res/drawable-xhdpi/lock_identified.png \
-  res/drawable-xhdpi/lock_verified.png \
+  res/drawable-xhdpi/larry_blue.png \
+  res/drawable-xhdpi/larry_green.png \
   res/drawable-xhdpi/menu.png \
   res/drawable-xhdpi/menu_pb.png \
   res/drawable-xhdpi/menu_panel_bg.9.png \
   res/drawable-xhdpi/menu_popup_bg.9.png \
   res/drawable-xhdpi/menu_popup_arrow_bottom.png \
   res/drawable-xhdpi/menu_popup_arrow_top.png \
   res/drawable-xhdpi/menu_item_check.png \
   res/drawable-xhdpi/menu_item_more.png \
   res/drawable-xhdpi/menu_item_uncheck.png \
-  res/drawable-xhdpi/shield.png \
-  res/drawable-xhdpi/shield_doorhanger.png \
   res/drawable-xhdpi/tab_indicator_divider.9.png \
   res/drawable-xhdpi/tab_indicator_selected.9.png \
   res/drawable-xhdpi/tab_indicator_selected_focused.9.png \
+  res/drawable-xhdpi/site_security_blocked_mixed_content.png \
+  res/drawable-xhdpi/site_security_loaded_mixed_content.png \
+  res/drawable-xhdpi/site_security_identified.png \
+  res/drawable-xhdpi/site_security_verified.png \
   res/drawable-xhdpi/tabs_normal.png \
   res/drawable-xhdpi/tabs_private.png \
   res/drawable-xhdpi/tabs_synced.png \
   res/drawable-xhdpi/validation_arrow.png \
   res/drawable-xhdpi/validation_arrow_inverted.png \
   res/drawable-xhdpi/validation_bg.9.png \
   res/drawable-xhdpi/handle_end.png \
   res/drawable-xhdpi/handle_middle.png \
   res/drawable-xhdpi/handle_start.png \
-  res/drawable-xhdpi/warning.png \
-  res/drawable-xhdpi/warning_doorhanger.png \
   $(NULL)
 
 RES_DRAWABLE_MDPI_V11 = \
   res/drawable-mdpi-v11/alert_addon.png \
   res/drawable-mdpi-v11/alert_app.png \
   res/drawable-mdpi-v11/alert_download.png \
   res/drawable-mdpi-v11/alert_camera.png \
   res/drawable-mdpi-v11/alert_mic.png \
--- a/mobile/android/base/SiteIdentityPopup.java
+++ b/mobile/android/base/SiteIdentityPopup.java
@@ -41,17 +41,20 @@ public class SiteIdentityPopup extends A
     // FIXME: Update this URL for mobile. See bug 885923.
     private static final String MIXED_CONTENT_SUPPORT_URL =
         "https://support.mozilla.org/kb/how-does-content-isnt-secure-affect-my-safety";
 
     private Resources mResources;
 
     private TextView mHost;
     private TextView mOwner;
+    private TextView mSupplemental;
     private TextView mVerifier;
+    private TextView mEncrypted;
+    private ImageView mLarry;
 
     private DoorHanger mMixedContentNotification;
 
     SiteIdentityPopup(BrowserApp aActivity) {
         super(aActivity, null);
 
         mResources = aActivity.getResources();
     }
@@ -82,16 +85,17 @@ public class SiteIdentityPopup extends A
 
         LayoutInflater inflater = LayoutInflater.from(mActivity);
         LinearLayout layout = (LinearLayout) inflater.inflate(R.layout.site_identity, null);
         mContent.addView(layout);
 
         mHost = (TextView) layout.findViewById(R.id.host);
         mOwner = (TextView) layout.findViewById(R.id.owner);
         mVerifier = (TextView) layout.findViewById(R.id.verifier);
+        mLarry = (ImageView) layout.findViewById(R.id.larry);
     }
 
     private void setIdentity(JSONObject identityData) {
         try {
             String host = identityData.getString("host");
             mHost.setText(host);
 
             String owner = identityData.getString("owner");
@@ -130,36 +134,35 @@ public class SiteIdentityPopup extends A
         }
 
         dismiss();
     }
 
     private void addMixedContentNotification(boolean blocked) {
         // Remove any exixting mixed content notification.
         removeMixedContentNotification();
-        mMixedContentNotification = new DoorHanger(mActivity, DoorHanger.Theme.DARK);
+        mMixedContentNotification = new DoorHanger(mActivity);
 
         String message;
         if (blocked) {
             message = mActivity.getString(R.string.blocked_mixed_content_message_top) + "\n\n" +
                       mActivity.getString(R.string.blocked_mixed_content_message_bottom);
         } else {
             message = mActivity.getString(R.string.loaded_mixed_content_message);
         }
         mMixedContentNotification.setMessage(message);
         mMixedContentNotification.addLink(mActivity.getString(R.string.learn_more), MIXED_CONTENT_SUPPORT_URL, "\n\n");
 
         if (blocked) {
-            mMixedContentNotification.setIcon(R.drawable.shield_doorhanger);
             mMixedContentNotification.addButton(mActivity.getString(R.string.disable_protection), "disable", this);
             mMixedContentNotification.addButton(mActivity.getString(R.string.keep_blocking), "keepBlocking", this);
         } else {
-            mMixedContentNotification.setIcon(R.drawable.warning_doorhanger);
             mMixedContentNotification.addButton(mActivity.getString(R.string.enable_protection), "enable", this);
         }
+        mMixedContentNotification.setBackgroundColor(0xFFDDE4EA);
 
         mContent.addView(mMixedContentNotification);
     }
 
     private void removeMixedContentNotification() {
         if (mMixedContentNotification != null) {
             mContent.removeView(mMixedContentNotification);
             mMixedContentNotification = null;
@@ -183,17 +186,33 @@ public class SiteIdentityPopup extends A
             return;
         }
 
         if (!mInflated)
             init();
 
         setIdentity(identityData);
 
-        if (MIXED_CONTENT_BLOCKED.equals(mode) || MIXED_CONTENT_LOADED.equals(mode)) {
+        if (VERIFIED.equals(mode)) {
+            // Use a blue theme for SSL
+            mLarry.setImageResource(R.drawable.larry_blue);
+            mHost.setTextColor(mResources.getColor(R.color.identity_verified));
+            mOwner.setTextColor(mResources.getColor(R.color.identity_verified));
+        } else if (IDENTIFIED.equals(mode)) {
+            // Use a green theme for EV
+            mLarry.setImageResource(R.drawable.larry_green);
+            mHost.setTextColor(mResources.getColor(R.color.identity_identified));
+            mOwner.setTextColor(mResources.getColor(R.color.identity_identified));
+        } else {
+            // Use a gray theme for sites with mixed content
+            // FIXME: Get a gray larry
+            mLarry.setImageResource(R.drawable.larry_blue);
+            mHost.setTextColor(mResources.getColor(R.color.identity_mixed_content));
+            mOwner.setTextColor(mResources.getColor(R.color.identity_mixed_content));
+
             addMixedContentNotification(MIXED_CONTENT_BLOCKED.equals(mode));
         }
     }
 
     @Override
     public void dismiss() {
         super.dismiss();
         removeMixedContentNotification();
deleted file mode 100644
index 1696d9afea67f1e436e6c802b2fe3a63b6aadeb4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f76760a3a4cfb915c4ccad3c07737d194ee3587d
GIT binary patch
literal 744
zc%17D@N?(olHy`uVBq!ia0vp^en1?;!3-p&Ek9lYQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jii`t%LR^8g(Tx8jp{mKR6oA?UN`m}?83Ysz90C#w8v5t2
z-+%u8du6GnE(QiBeNPw1kch)?XWX9DtiaRe7_g|Q>i_b)+_|e2ABLorryY;Ey#9$g
zr#;t4@r5SRwid!SU)-7}+dVl^!|x2Q#h#SOFK6wQ7tgKT#dGfb`o;5ed$eMg+%9|m
z^=W&ErLF_(e4QtSS3lm`F}rBT&cbp-w!@D@&YyfY>7ePnH`a-sk7LsBGIrjs+I=W!
zhbrGu&9z(04i`9aC|=uWk=1dl?vBd?AN#%;Cmrh=z1z7u^b44@req&jm{qo^=kx0R
zz@o$HoUK0E?Z2x<8tng<3YluMWcQxAKPl?9=Jte@w<Gs*esnH$y2ay{{ov7=xQ)Dh
zg+<(Z9yW$=XE{)HzVXmXo;NYvC4yShA8p#QIN5ahq&tO$ewMc`TF<wBdD*Mm{*rmw
zbW`zju{)**JC(j!HtVN1XZar){&@!1XYLBw@p{4im)oZ49*QksyxFiwQLSb7gFm?)
znrUIrT6aHq=loIR!!j<rME#YC=R?F3Lc{h1yJnrfx^Jp^sLZ)j7vB92{;MHff7afI
zW4rP8AEkLI-b_IcL+&Nai1BpLnxp?iRQAWDhD`;Xe<$|6Rn_2j-?6gy<x=iG(LSSe
z?*+abQ(Bex&inM_FK_C@jMo~vPq#lXQ}jK3yX@$p+5$agncpGvoQ?kQ#hl<gzJJfv
zi66Rp?@p@KNSFI0#US#n^Y(`IVgX|71jB{En0LGAy|mmN!8;7t(nYL`e(nFUrch(u
ymy*hY{SD0#!u;<J+V04c`F}^RChYI=kIdJ7H<h>UTUP>1Rt%o5elF{r5}E*%##&bZ
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2c8eb3e942b1aa978f38ca30a405e35888013efb
GIT binary patch
literal 744
zc%17D@N?(olHy`uVBq!ia0vp^en1?;!3-p&Ek9lYQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jii`t%LR^7#=aB%CkavGR$WnolAirP+0R;nxfP{jE{`u?o
zpTGZJS*odvfq_Zi)5S3);_%xUw<k3#@U%GwEGnw{zx*zD?rOz{A!+4l$73$9f1=K5
z&-Iagp^3Duh49T6x8})qPfpbEJHu<SCuQ=>S$pNhb8C0;oIAgM@%-E#t=J{E%btII
z+8$!5>%cl+=Skt!kGFQrF50oPu-uUC@Z*s4C*MsvXgcqWb)x6vnDo1howuuY9}3!`
z%6C+A?bfox1x_4_*EU*Yb=<1E<MP1AzHi1!$GS%EcCHTn0w%2~*#{P8m2K+zyt+TI
z=x{n`tB-d3?`n|-`~RgvrkX6-y=U%Eih8ZNJz?eT$i18&oeQ0A@%UvwcyuOiBX3_}
z5%->ljp5r_4pg0QJhYPMO$>L5pw{$9o3<=YHeEjHPGO;+<*kd>^Q~WA_Ug93WL`Gi
zRQz1*j_JWprEiwa`svMC{zry?p278*yFzxnUU2{AwrRSDVhb2=HY`$9YuWwaPi}{1
zTG+GJ-4EV5e-!z!jLR-je`VtN5b=c2usy-9S*Ne=n`#~^bMDlIcfW)GYDm|gwfEuJ
zZoK_RX<mvqQ_#bZdkHgQJRP*==>HIv{V}OwQ$gq7iG6QXHMre(tn7Wcl)F!~&nVq{
zfiK6DR^`3(K0W!%oBA;0wTAA~?GMZpeNW#mJ9?<LKu=lbcgQ?vqd$BxCpeGq-*a{1
zhpyhclWH~6<vvL<h<xk3y<xprfY>_0a3L_}-7b1BEq6!o4g<Dy5$mE~`+uw{)L8eW
xq_SXtLvw^M|GR^>JMv`y-_ffH`+NQ)bLXW^<?WYcegcyfgQu&X%Q~loCIEkpS5yE1
deleted file mode 100644
index 70529bff364d52e73f0025fd3ef263fed6cfd3c1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a63d88c3c450959ac285bb5ac2ed9dda6a12ad27..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2403523718c1bec6a79c433da50070218f91ba75..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3d352b3042b1e2c915c92530d59294f47429f7b0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c2e49b3a7fb616bf5b84f1e99575e8d1658d2321
GIT binary patch
literal 691
zc$@*V0!;mhP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007dNkl<Zc-rmP
zze`nd7{~DkB_$<n5X4o2hN5Wb*T0|;2qL%y4$&6UQdGnB`ukU2f9q1VxD`PVQITT=
z5tM>rdLbeLn<6X3>eG98gv*z6`d(3}q2aZB&+{DK)8Tte(qHxO2h7aOBsq&5R$R`{
zEU^24>FMch6}W_DD8;hRRKTz&0cE&~Pf#&@_6o{&6)-h5Rgbq&f(<-(8&Jr1>vtS5
zIXPK{+fd*a9^xFzVXoZI9{P*|w@_770E4HIhXRjr6y{2B2o^Z%vkK&KIvOxBF_DJ~
zd_^nF)nORx5G+Nj@2WsP8ZbUS{sM9zaRP=4+{6}Cz|#2cN65X128@l3-Gy8;40Tw5
z5?Dkt<nBcSMn^|;kh=gw9!g;m7a=zi4Hy|2xeU213@cCyi^xLmax@^9%QZo67KUd~
z3X8Y{xu$5q@bK_S$j!qr3#G7#dB~lL1`G`i)j)0yhAfoABGw>R6A1tY2M0ex*g`qZ
zLn$nc@BV=BrRY!bz`(#u$Q{EOD21i*UAb392lV&%&q1yQ2k;Y0U}=0;Zm#HnzP`R|
zkn4b90ZL$Ld{^#z(E+`^y$z6i3PT1;V1Mugat%cX^z`)9K<+yZVjpr)z*1D<8{}$=
z3vk`t-HVWWfGQXo@eXp9pc3~Xx47dQQCC-2KU81^$6=_%4XncgNAM=t9o%t1XJ=<E
zR-po$XvcmSDq(IvGCrdMtEi0xB<twtsKzrW@BwY8bZvMK1?Ew`t6On4n=QpPY(jx`
zr@*G~l<xXk-rnB6?Jyoe5zH{_dwUTOYQz#0Sn_A)_9h^c$s{R33tqbxKeIse{r~@t
Ze*-iXDJC4w(s2L)002ovPDHLkV1f@5Ej$1K
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cf0db05ff9995333ffc366fd5f456697d9340c24
GIT binary patch
literal 347
zc$@)S0i^zkP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0003ZNkl<Zc-rmO
zJuib%7{>9_v8(7RhQ`2P6yM@G-E1~Cqr}MMrT7pQpTQvBY1Jm0vKb7N1e1izf4HY6
zPm|}|5)mDK%awEIzn&oJR}8|rwy$adWh|h954@piTN$C3KisNSaRcROV+;Yt5w_?M
z?xB9{P36bJTdlYQnP<#l7!}OhCbNrR(!(5A@d@D-69_#f@ebh&<NokvT!zddLXIWK
ztbolC-fYG_$c!N57=_HfZLV+!GNF$WWIFC}y%8TE6Z$AY<_T;G;rd0K!Y!2O4$~>&
zYsjfxJbWGnx5D9#vnap66kb1#@=FPyMENCz*En)Z3Lj^JSMl&FM{Y^sqfCA&;loUR
tY2io6>7{u1Ae%uKO4P;d;6wj^!{2<rsK#P?geU+2002ovPDHLkV1h+UoW}qF
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..83ba37c2461fce9e9b0bac4a63bbfc9336263f1e
GIT binary patch
literal 679
zc$@*J0$BZtP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0007RNkl<Zc-pPi
z-Ahw(7zgm*IVat84P1&e4U4ix_)>}&1!XsO5hZn%MBaAORsVx2m01K8Ip3x%m+2B;
zf|9(E2<s2%GKh#Q=;C+OZB5<N_hG;2cy=6T)Wrv$^StbQx0?wf`Zw>YoM_;I08_Q*
zw7cU6o3qD*@KLEQFhEgi&fg@*v`-9m3-<~OFmr4eNQo2>K!bo8HD+W)5JNr3J<wbQ
zFsB<sumQwWeZ*ye;^efiO%91oAY~K1vpjPbAYMNX1lQq)s$(t!Xt2i|F<!|5L2J?C
zTWisxKCaPw%`?#Q1~4b<>R<~t)w2PldJXvl;M-66&dGkU#qfM6v$Qvan)o?6S$ZBl
zPyPTCN2h?4G6(=Eaoc|Gw-4)!^06S6o)6Tg=gS(nW<0}AIcSan%vh)iGC<0Hr~zVX
z*1SUiPa;-&Q9cwIAeM^zPs1s$l?-++@vd`#r?qoH7L8DA>%DXcph3C$NMDi<1pSd5
z_qC^<?{2g9u=CdXEBt-=*ufJ(Hm%U$&_8Jl;7N>?T$c9)StX*S*HRPyj-38zNe6Dc
z+XF-nEC9Lm#u7k>3iH0cEPDmHf!+6f1A6x5!!@lyHeVnFhvBos{EQ0VO$>QE<!wRR
z^lINz&;0Fh0rfZge0|W{$+y`6gZmbNY({vd=3$5Vf(j5Y@8}<7k02|v&zQxmimmn;
zFLLI+`ZC{UUl6V~foxWw1)AZj!+cEzsF2-aUEUP5O}F+l8S!0Bj{2^k{*gNu3BJt+
z=nr<mFCdrF(4zwQSMTn6BD+Ky$fXV34Djv$_&YYh50wyfsZ!k-zX7A*-Ro;sLOuWh
N002ovPDHLkV1oZgJv0CS
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..23be9896d5a1aa56e2c5e5926bd03cfe87213e03
GIT binary patch
literal 276
zc$@(g0qg#WP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0002nNkl<Zc-rmO
zA!~wB6o>J<xGJuW1u?j=D1H=^f?+n}z_@)C%Ra-xx@Pgk*$f7!f?E>wzehMpc;9e6
z%-{{ba_)f#PP#$TMWk@9R;PP(iyns9;Rhr1>@A#d30E+Ia%8Bwg)Lgb94cZvcb?$^
zWY%~_*&<z=$-KLS?ZkTsTRbA1c)~A)18N@OSIE2|<mf}@%_IB)nfrq917tou!c)kE
z0ymJEdW07d;qR!h1?%{NBF)f<36G&OWierSNZ}Mt;S~PY@X{f?i3vBcf+DTZP9OT~
a4gUeCf9>IBk|(zS0000<MNUMnLSTZI|9Lk6
deleted file mode 100644
index 2422eaf03a4000aa25c07d40ddb34842047efe94..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f87166b0798f0c2d72e9379a3096b87b76f07043..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b7f0c05b1a0e9cfd2fa8f1677f58f0e29e423dc4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cb4fe8d9ec7b6e8e47f76db4dd3ea9a3c3e840ec
GIT binary patch
literal 569
zc%17D@N?(olHy`uVBq!ia0vp^CO~Y#!3-o@Q?wTWDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MaBU>A+A8$XvTk%P}SsD3P5cFB|(0{3<3%U4gm=T4gK@i
z?>~S4y|PqO7Xt%hgQtsQh{y4_({4{{QQ&desTKb4|NgQop~4DWVQ1f6es*%vGlQ}h
zd`91{e%iT?u|vOqLX*}sdBrX7KJI$!Q1@S6c5_X|!DsVr?$7fHTU>i<yXUIbEt*}I
zQnEdIO_Zig@Nm96S>jRQny0H8u9Y3zej$v}I8$Jj;S)B+zG_8wMKeZYW2qv;?pF_%
zyBOctuyJGehHUP|Yt5Z^uM}6D+CKN{>Wt!e#~Qw^o!j1>6i{oK$&{r#WwYh9LcgoK
zHdiDZ+V!qL-uG0uSl&K)m&%9N7qX^^xzA>2i4DA2U-Cuo)8gqYoA<it+^M@6aq06r
z_dUAGOpG%oEQsK`6uM4Drt|Ug1u7Yi;S#KGs%$gexSLpt!&h%mxO)BYG_G?m%c24d
zwN<`F2{D{Zn~`{V(e-NuLcyvl=6Q*6S}9)NZF|ndjiV%oWvlt4dB;@rG(3~6wqIXi
zX54<!k>k~!y;~N@xp2L5*s_4nh5J>#f5)ePGXFU;-9KJeyn5w=<=rdxU!o`M)c#if
am9c;)KyBiZXEMNeV(@hJb6Mw<&;$S>fBO9Z
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5147a920ca9e10f40793f25b88e949fa654c26e7
GIT binary patch
literal 569
zc%17D@N?(olHy`uVBq!ia0vp^CO~Y#!3-o@Q?wTWDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MaBU>A+A8W^GE<m$h$uuWT`+&kY6x^fP#TTKte%7|NQm)
z&)<KqEY;M-z`)qx>EamTas2JH+ml)pcwBaBg+KhizwAn=umV@u*>{(pom}+HpzH;o
z(YLdocCKUW(C?qnq%}=mam%}pyWTp~{g;>BTvKuI*?gP(^L)Y<*WTLhxvF)GX4j>Z
zY>!?Or706UobOJScvQIN>8gfnWyiK(2xBzP6qsfBgiW!pT9IARjM3Ows>rbW)q~|O
z#y2)>+}OP#n|twEbLZVF#TBQv&%L@jqd4BNhHq=<ws$85)LLdTW$8}YY&osa@9M72
z6$yuSy(^ISJ=HCiw@==s^5OM`tSMsdv)Nf<18>%se9`-~csk4Gy)HU;>TX6{`uxs)
zkFGKk<BSOlBDgMvu2Yfee7t;tN`_;&1nZkB+e|m^CYIvx)f*J9UOzmI>)gw-r~pH4
zm2Xi(3@6iOBwk*0{aS%gu<D9=USgb9ir07Bo-=XdD9K^jYW`^6F%>-x&m^nu*H@Ss
zw_kMRcy(v*mIZPyT(2CqEZ}qDepT<^@#&w;e~wJ|kJlBiUb$d-_lo_O=m|TuzqNm5
YJYX20CMq<?3m8ufp00i_>zopr08DiE6aWAK
deleted file mode 100644
index 99875d8dd1d65cc164510c1c8d3ff75432bc1385..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f85849d23bf0107b7577ad4504acd5260ef1ad5c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7cf33ec4c5acc81330208f5f5ac45fa5435c3d1a
GIT binary patch
literal 346
zc$@)R0j2(lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003YNkl<Zc-p1Y
zu}Z^G6o6rI6kNJ=3;GC7f|I3C+AcnXu6+Wh#1KLVgcuT%!P(7@(kBqi0~nvcC=S}m
z2K4w3XK1+54jn!?xhMQta(6^zE1ic$QCM(L;Ynv}V<6A-9#S+AeBwjrMt8l=K$c|_
zyg;zP7<<^&c>zI<i4jQC^c5?d;}Ey_TK}5vR;Z0Yk|ZVWaEc`aqI&@PPH6<<IG*DX
z7Z7CxI4dzX0#Ovjs4<2pBcShG8-XwkXAm4gR4c&qJ_Iu(5Cp*xf)gxtZUuNghG1v}
zeBbXwaEU9OTLIk(`t5-7Jg>q#MmWRs+HRz~>d!yXb=?8p@Piv1z|#3!cZ2SLavaCP
sJp_#sJ+n4nCS}|96c1|p-)-E=FZ@fcYF)+4`v3p{07*qoM6N<$f<M=eoB#j-
rename from mobile/android/base/resources/drawable-mdpi/lock_identified.png
rename to mobile/android/base/resources/drawable-mdpi/site_security_identified.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..83ba37c2461fce9e9b0bac4a63bbfc9336263f1e
GIT binary patch
literal 679
zc$@*J0$BZtP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0007RNkl<Zc-pPi
z-Ahw(7zgm*IVat84P1&e4U4ix_)>}&1!XsO5hZn%MBaAORsVx2m01K8Ip3x%m+2B;
zf|9(E2<s2%GKh#Q=;C+OZB5<N_hG;2cy=6T)Wrv$^StbQx0?wf`Zw>YoM_;I08_Q*
zw7cU6o3qD*@KLEQFhEgi&fg@*v`-9m3-<~OFmr4eNQo2>K!bo8HD+W)5JNr3J<wbQ
zFsB<sumQwWeZ*ye;^efiO%91oAY~K1vpjPbAYMNX1lQq)s$(t!Xt2i|F<!|5L2J?C
zTWisxKCaPw%`?#Q1~4b<>R<~t)w2PldJXvl;M-66&dGkU#qfM6v$Qvan)o?6S$ZBl
zPyPTCN2h?4G6(=Eaoc|Gw-4)!^06S6o)6Tg=gS(nW<0}AIcSan%vh)iGC<0Hr~zVX
z*1SUiPa;-&Q9cwIAeM^zPs1s$l?-++@vd`#r?qoH7L8DA>%DXcph3C$NMDi<1pSd5
z_qC^<?{2g9u=CdXEBt-=*ufJ(Hm%U$&_8Jl;7N>?T$c9)StX*S*HRPyj-38zNe6Dc
z+XF-nEC9Lm#u7k>3iH0cEPDmHf!+6f1A6x5!!@lyHeVnFhvBos{EQ0VO$>QE<!wRR
z^lINz&;0Fh0rfZge0|W{$+y`6gZmbNY({vd=3$5Vf(j5Y@8}<7k02|v&zQxmimmn;
zFLLI+`ZC{UUl6V~foxWw1)AZj!+cEzsF2-aUEUP5O}F+l8S!0Bj{2^k{*gNu3BJt+
z=nr<mFCdrF(4zwQSMTn6BD+Ky$fXV34Djv$_&YYh50wyfsZ!k-zX7A*-Ro;sLOuWh
N002ovPDHLkV1oZgJv0CS
rename from mobile/android/base/resources/drawable-mdpi/lock_verified.png
rename to mobile/android/base/resources/drawable-mdpi/site_security_verified.png
deleted file mode 100644
index 8b39ad36b754b74c04d28c4a87756013fab7385d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 9b030158ecb4047b598aaabaa10be4713df16b92..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a770a6d73a9ccc2b10bad78c24170c36f672c5c9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c460f767f3f3c2ba5169f104009fbf403c5b67e6
GIT binary patch
literal 959
zc%17D@N?(olHy`uVBq!ia0vp^89-dX!3-pix*tsiQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jii`t%LR^8g(Tx8jp{mKR6oA?UN`m}?83Ysz90C#w8v5t2
z-+%u8du6GnE(Qi>HcuDFkc@k8XWcG(t-#~D^JW5%*#G}qpD!(Q*5OQ?Tyn1G>kZE|
z(QOmVl)OsY3*QDPADUXm!?^N;?u1kKnQrDc-kR-RXPo%Z^zYBr3V$BYRt=VEYw}Xs
z{~*8d+6SqXQ=IfX*KQ9JS!JKM^n!bgy56kl={{?B1UEm9F!qUOnkuxFCq-X0)MRDk
zgjU9vvbPlW@>;sz+~SaVp^^1;^Rz@&jm-;o_N*?Q#uzEVQDm}WBFAHgre$C1n<UJq
zv^Vkab~!utNX|OebV6_U%8d%Xvdb$CI--Jt7CY`JWH6RnGO>nXwUwjTt+g@hi}XDj
zinNxB+%;j`cdo;AwO_#F2YYq2WK6{t?JN`QjOsk}OCXs;==74u)<>+>kCe38r{8UV
zv^KYn?@O769mlG@yo^S5zGrWAf1fl>QoM>yE@jb!SM^(L&(G1BZFzx3=v>_EZ`!5X
za(oNL@5EgFTDLdo+MMSW&1#bBbF_aKZITYtTq?7`_fprlw;66%cdnWC<l5e-nJrfm
z=DNyUxN#=gEk;V9*5Z`exrJ$Fi=2*oZ<{BwBJbVQ^A4My^f@dQQSf@TQu@BoicKdv
z&3(4BBsp#kn9FqZ663F($KnJtp5=*mh_bkIP7%@;C{Va^x2i_nVX?yLr@o6Pxc0tn
zaen`A-r3pLxmwn0&i?GjQgUL$r^;Yc)10#gsV<+4GcMQMGtm)Ot$Zc?qGtKr)^ww<
zoGmf)W~-|$Se}>rZ}F<luT{QOY-c%ioUwaB#xlFcj-7{j)-L+V_NnPqcXe{smB$xP
z?eH?{oMp0DKJKE>oUJPTRmW^*A9F}>jda;naAa~+$vMl@Zj;Wass%HJF3>QU{>l15
zmtS6aV^qJsYYqDy6E-U!pUb;V=BYCZzhG4nS@Bn7d;b01j()XFp7;Lr#0Ss$_;Odo
zg4g}sEBzPDR@mwA-NF0%*Ed!g+B+S}9gctSfA(*E^D?={yoO&ayZEAj#D9<Zr^_AG
z3^vw2NoPOnet`W;L!SJNZ(EEHZm7E=%Kw7Vb^%c6pPWhiy#RlkkL(}$c^EBDRbMu9
Q2j&(APgg&ebxsLQ0MszFy8r+H
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..371aa3c427b3f3d20dd5a6a3dd2a157bafbc934b
GIT binary patch
literal 959
zc%17D@N?(olHy`uVBq!ia0vp^89-dX!3-pix*tsiQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jii`t%LR^7#=aB%CkavGR$WnolAirP+0R;nxfP{jE{`u?o
zpTGZJS*odvfq|LL)5S3)<KEj@w~JmY@VM^0nZP6V|NqwKOUs;fI1?wAoa^~|!!u2E
z+XOQuudi)|Zv&JMO)cYLT=_wF!m0aAH}e~B&33OdPJC$k_vdPbKaXdt2FtWHc`5CG
zkl%RigVf3?PI{hew}*+Wvd>$3!97M@Z&vhlpS3%Jn;%CQ`@}O%723*^qAwb1vNCc)
zE8|PqTMB!5E!}T!amc*T$a=bYTB54P<^?-@R+mm=jFjLgGFdT^<FP~2vM=>b66RCd
zn|OG;oE>{4XB}%gp|^YGMg?El<&_2<Q9(hA9d{Hm7|Si0Si`W|%2Djr+L-l4`W_8M
zT1!RlnlSD=*WtR_FW~Wmy*gSlreceBmI-!7bsqX9kjx=;ddXw!Bi8CiO4{tx@3uc$
zn_I{CrA)()W7S?>Mx#34vp2fGPnsqvUd1MtvgpC9`YpES=jhC~yuc!KF7EX=?b2;I
zzJ=m<Vy=Fz+Z%Lk&U1@qHA(e3+P{l7Nr!1Jm093>sq5R@47aO0*GzkIZEw`fmMaN!
zU1cuZIFsxaBPCF4amwu6!Zfo*PRG5s%@bLX_ipNWhfPoV9F~eGc)eOFeP3wBrW2j!
zKHFK69JdC{WjcC^@z>5{ae^7o^29qtS=>3N2x$uxC|tQ)Rio~(SmE?j-^CMLd*8M=
zzyCMy?Ck4YEo(JrfA(W3IkDkWWw5Df&RK(0mruqSmuv2s=!mOUz7l>>vwUuAy3tq8
zmY8|7)zua(&&&O{c-7|DDqkwLvm83k*u5ZQnO$SY&ci%w7yV@W)O4!5Iyvjg<BO+u
zco}uhGFdDicTs50R+av$V>YvoIV8A7y6h@AGC8W`oaJe^NoQ2mf|)`WXqZg@Wc{Ga
zFR#2Ys$bu=hW(BSo0X5x<=rOp)ER|eu&Rix_$#tK|Nd@Azgi~Gdw+W3gXesFxhrD9
z>;CSQ{tIR+>~#3<;C=n;8!HX%oet#=$3OT#`?tP%nOtLD!!MRyd{IE+zsLO3<qm2F
z8*87Wv!8W8!2YEnPyWWYEyf2o)Ljwff5B+G04VfN&ZPZbfWOU0@sIp2rz}ndbGxJf
Pa|?r~tDnm{r-UW|q1UoX
deleted file mode 100644
index 3dc6843858ca586c781a022a1644b6f95abcc78c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index c393924f456f3c6a031bc70f9077e83d02927f34..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 308f6988b6cdb87e640f523ea58e6b94bd2dd938..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f824714949445e61456b8598d76d9e62c5a3d113..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cac4415140767c17f9132e79e68805a959f14591
GIT binary patch
literal 2063
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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..714a3eaf3e673681dc882e2a3661919f06271e97
GIT binary patch
literal 421
zc$@*H0b2fvP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70004ONkl<Zc-rmQ
zze>VU6u|LoLxMp@f#9M;5VSfpHPr+3yY>e4Fj1B@<l538M$j`<+8@)fNid}MQ1SF#
zBDo|Qzk4X~H+;5x&iT&Qh{(Sd1xA76oW171Y~li44A4gxC2YX_L_e^ZPoV;tpo|pE
zH|0PMWYK|4=>w};fo|La+K^vrBcUF6+O#EzqlFzTV+Ff-gE-D%pcBaAEc(vTYs|wq
z;<$0%_K?vFY}f*1L<b3&F%o!pW)7eeSZvrfWW*lK1pCfR3;qL(FE)-LWJDTfg0wR;
zL|h{<198Nr2#i4-S?_@-b(@1Y%oOGzj-3C%XS)q?Bw;2<LL6J(0$H|*OY|U~^ial<
zkH88<$yNBkC)<N48H5fzW|5}wfsa=7cnB;!SkW^Jfk!nfdS)Xq5Jlkw537ObnTf#r
zK=k+sybDB+pTNFi;J`;<RWYy;KJYeJLk)e1CqvY+9(}(>fl*)-_{Tm0MBQF^=N(q+
P00000NkvXXu0mjf<x;kD
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..83ba37c2461fce9e9b0bac4a63bbfc9336263f1e
GIT binary patch
literal 679
zc$@*J0$BZtP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0007RNkl<Zc-pPi
z-Ahw(7zgm*IVat84P1&e4U4ix_)>}&1!XsO5hZn%MBaAORsVx2m01K8Ip3x%m+2B;
zf|9(E2<s2%GKh#Q=;C+OZB5<N_hG;2cy=6T)Wrv$^StbQx0?wf`Zw>YoM_;I08_Q*
zw7cU6o3qD*@KLEQFhEgi&fg@*v`-9m3-<~OFmr4eNQo2>K!bo8HD+W)5JNr3J<wbQ
zFsB<sumQwWeZ*ye;^efiO%91oAY~K1vpjPbAYMNX1lQq)s$(t!Xt2i|F<!|5L2J?C
zTWisxKCaPw%`?#Q1~4b<>R<~t)w2PldJXvl;M-66&dGkU#qfM6v$Qvan)o?6S$ZBl
zPyPTCN2h?4G6(=Eaoc|Gw-4)!^06S6o)6Tg=gS(nW<0}AIcSan%vh)iGC<0Hr~zVX
z*1SUiPa;-&Q9cwIAeM^zPs1s$l?-++@vd`#r?qoH7L8DA>%DXcph3C$NMDi<1pSd5
z_qC^<?{2g9u=CdXEBt-=*ufJ(Hm%U$&_8Jl;7N>?T$c9)StX*S*HRPyj-38zNe6Dc
z+XF-nEC9Lm#u7k>3iH0cEPDmHf!+6f1A6x5!!@lyHeVnFhvBos{EQ0VO$>QE<!wRR
z^lINz&;0Fh0rfZge0|W{$+y`6gZmbNY({vd=3$5Vf(j5Y@8}<7k02|v&zQxmimmn;
zFLLI+`ZC{UUl6V~foxWw1)AZj!+cEzsF2-aUEUP5O}F+l8S!0Bj{2^k{*gNu3BJt+
z=nr<mFCdrF(4zwQSMTn6BD+Ky$fXV34Djv$_&YYh50wyfsZ!k-zX7A*-Ro;sLOuWh
N002ovPDHLkV1oZgJv0CS
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a8b952eb861fd99131f9d5e43e17c6550d7e2cd1
GIT binary patch
literal 360
zc$@)f0hj)XP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70003mNkl<Zc-rmQ
zu}Z^G6o>KD!9oQq3WYB1APBA<oSgIl9DD%5F20F_t6g0jN=5J`bP)%g3Kj7^l9J;$
zRD?f;M!2W#aE2db$j$x8xe!QZW@{}1BM@_4^sjy$;|^b#qL^I|aD;4*r3AJxf-Nva
z%R5lxx|qN!`o_LjpvG-s4Ev`s8p{YAz{ESwu!}vM;{zscJpy&Kg>3qWO=O~uC%HFA
z$20IoHk|y8ZLS7BWzDr`pq{-;WDE55IJgAPMpnvZ?FxZySyQ6!5!iu=T7|$GOmsa0
zdoYnzumKZ2kHAxyXjTYp!o*3kKpwV@d*rZ0atyJPB5(wA@{l4hcMP1S2sBR-7=aNO
zfe{#is}C&J{agI(82FYV@BlA~-(-nb9LDdr2#ml8T(KX=PcfbjN$xiQ0000<MNUMn
GLSTZPN0jXV
deleted file mode 100644
index 8b0c665ce4b4f025714a945444aab35ce495480b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 91f5157ccc2b7347e0ce369c7336e4aea5fc0233..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/base/resources/drawable/site_security_level.xml
+++ b/mobile/android/base/resources/drawable/site_security_level.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:maxLevel="0" android:drawable="@android:color/transparent"/>
-    <item android:maxLevel="1" android:drawable="@drawable/lock_identified"/>
-    <item android:maxLevel="2" android:drawable="@drawable/lock_verified"/>
-    <item android:maxLevel="3" android:drawable="@drawable/shield"/>
-    <item android:maxLevel="4" android:drawable="@drawable/warning"/>
+    <item android:maxLevel="1" android:drawable="@drawable/site_security_identified"/>
+    <item android:maxLevel="2" android:drawable="@drawable/site_security_verified"/>
+    <item android:maxLevel="3" android:drawable="@drawable/site_security_blocked_mixed_content"/>
+    <item android:maxLevel="4" android:drawable="@drawable/site_security_loaded_mixed_content"/>
 
 </level-list>
--- a/mobile/android/base/resources/layout/doorhanger.xml
+++ b/mobile/android/base/resources/layout/doorhanger.xml
@@ -1,35 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <LinearLayout android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:padding="@dimen/doorhanger_padding">
-
-        <ImageView android:id="@+id/doorhanger_icon"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:paddingRight="@dimen/doorhanger_padding"
-                   android:visibility="gone"/>
-
-        <TextView android:id="@+id/doorhanger_title"
-                  android:focusable="true"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:textColor="@color/doorhanger_text"
-                  android:textColorLink="@color/doorhanger_link"/>
-
-    </LinearLayout>
+    <TextView android:id="@+id/doorhanger_title"
+              android:focusable="true"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:textColor="@color/doorhanger_text"
+              android:textColorLink="@color/doorhanger_link"
+              android:padding="@dimen/doorhanger_padding"/>
 
     <LinearLayout android:id="@+id/doorhanger_inputs"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:orientation="vertical"
               android:gravity="right"
               android:visibility="gone"/>
 
@@ -38,16 +26,17 @@
               android:layout_height="wrap_content"
               android:checked="true"
               android:textColor="@color/doorhanger_text"
               android:visibility="gone"/>
 
     <View android:id="@+id/divider_choices"
           android:layout_width="fill_parent"
           android:layout_height="1dp"
+          android:background="#FFD1D5DA"
           android:visibility="gone"/>
 
     <LinearLayout android:id="@+id/doorhanger_choices"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:orientation="horizontal"
                   android:visibility="gone"/>
 
--- a/mobile/android/base/resources/layout/site_identity.xml
+++ b/mobile/android/base/resources/layout/site_identity.xml
@@ -1,59 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:orientation="horizontal"
-              android:padding="@dimen/doorhanger_padding">
-
-    <ImageView android:id="@+id/larry"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:src="@drawable/larry"
-               android:paddingRight="@dimen/doorhanger_padding"/>
+              android:orientation="horizontal">
 
     <LinearLayout android:layout_width="0dip"
                   android:layout_height="wrap_content"
                   android:layout_weight="1.0"
-                  android:orientation="vertical">
+                  android:orientation="vertical"
+                  android:padding="12dip">
 
         <TextView android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:textSize="14sp"
                   android:textColor="@color/doorhanger_text"
                   android:text="@string/identity_connected_to"/>
 
         <TextView android:id="@+id/host"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:textSize="20sp"
-                  android:textColor="@color/doorhanger_text"
-                  android:textStyle="bold"/>
+                  android:textSize="18sp"/>
 
         <TextView android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:textSize="14sp"
                   android:textColor="@color/doorhanger_text"
                   android:text="@string/identity_run_by"
                   android:paddingTop="12dip"/>
 
         <TextView android:id="@+id/owner"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:textColor="@color/doorhanger_text"
-                  android:textSize="16sp"
-                  android:textStyle="bold"/>
+                  android:textSize="18sp"/>
 
         <TextView android:id="@+id/verifier"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:textSize="14sp"
                   android:textColor="@color/doorhanger_text"
                   android:paddingTop="12dip"/>
 
     </LinearLayout>
 
+    <ImageView android:id="@+id/larry"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:padding="15dip"/>
+
 </LinearLayout>
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -58,24 +58,22 @@
 
   <!-- Link colors -->
   <color name="text_color_link">#22629E</color>
 
   <color name="splash_background">#000000</color>
   <color name="splash_msgfont">#ffffff</color>
   <color name="splash_urlfont">#000000</color>
   <color name="splash_content">#ffffff</color>
-
   <color name="doorhanger_text">#FF222222</color>
-  <color name="doorhanger_link">#FF2AA1FE</color>
-  <color name="doorhanger_divider_light">#FFD1D5DA</color>
-  <color name="doorhanger_divider_dark">#FFB3C2CE</color>
-  <color name="doorhanger_background_dark">#FFDDE4EA</color>
-
+  <color name="doorhanger_link">#ACC4D5</color>
   <color name="validation_message_text">#ffffff</color>
+  <color name="identity_verified">#FF3298FF</color>
+  <color name="identity_identified">#FF89C450</color>
+  <color name="identity_mixed_content">#FF000000</color>
   <color name="url_bar_text_highlight">#FFFF9500</color>
   <color name="url_bar_text_highlight_pb">#FFD06BFF</color>
   <color name="suggestion_primary">#dddddd</color>
   <color name="suggestion_pressed">#bbbbbb</color>
   <color name="abouthome_thumbnail_bg">#5FFF</color>
   <color name="abouthome_topsite_shadow">#1000</color>
   <color name="tab_row_pressed">#4D000000</color>
   <color name="abouthome_topsite_pin">#55000000</color>
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -35,17 +35,16 @@
     <dimen name="favicon_bg_radius">1dp</dimen>
 
     <!-- Max width of arrow popups on tablets -->
     <dimen name="arrow_popup_width">400dp</dimen>
 
     <dimen name="doorhanger_input_width">250dp</dimen>
     <dimen name="doorhanger_spinner_textsize">9sp</dimen>
     <dimen name="doorhanger_padding">15dp</dimen>
-    <dimen name="doorhanger_textsize_small">8sp</dimen>
 
     <dimen name="flow_layout_spacing">6dp</dimen>
     <dimen name="menu_item_action_icon">80dp</dimen>
     <dimen name="menu_item_icon">21dp</dimen>
     <dimen name="menu_item_state_icon">18dp</dimen>
     <dimen name="menu_item_row_height">44dp</dimen>
     <dimen name="menu_item_row_width">240dp</dimen>
     <dimen name="menu_popup_arrow_margin">5dip</dimen>