diff --git a/mobile/android/base/DoorHanger.java b/mobile/android/base/DoorHanger.java index 4c2fa43b1559..677e4c0ee22a 100644 --- a/mobile/android/base/DoorHanger.java +++ b/mobile/android/base/DoorHanger.java @@ -12,7 +12,6 @@ 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; @@ -26,7 +25,6 @@ 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; @@ -35,7 +33,7 @@ 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; @@ -48,7 +46,6 @@ class DoorHanger extends LinearLayout { } private final TextView mTextView; - private final ImageView mIcon; private final LinearLayout mChoicesLayout; // Divider between doorhangers. @@ -60,8 +57,6 @@ class DoorHanger extends LinearLayout { // Value used to identify the notification. private final String mValue; - private Resources mResources; - private List mInputs; private CheckBox mCheckBox; @@ -69,67 +64,36 @@ class DoorHanger extends LinearLayout { 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() { @@ -160,11 +124,6 @@ class DoorHanger extends LinearLayout { 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); @@ -199,15 +158,12 @@ class DoorHanger extends LinearLayout { 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); } diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 6ecca6cd4c47..9722d0a42dda 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -683,9 +683,8 @@ RES_DRAWABLE_MDPI = \ 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 \ @@ -695,8 +694,10 @@ RES_DRAWABLE_MDPI = \ 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 \ @@ -716,8 +717,6 @@ RES_DRAWABLE_MDPI = \ 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 = \ @@ -791,9 +790,8 @@ RES_DRAWABLE_HDPI = \ 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 \ @@ -803,8 +801,10 @@ RES_DRAWABLE_HDPI = \ 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 \ @@ -818,8 +818,6 @@ RES_DRAWABLE_HDPI = \ 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 = \ @@ -887,9 +885,8 @@ RES_DRAWABLE_XHDPI = \ 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 \ @@ -899,11 +896,13 @@ RES_DRAWABLE_XHDPI = \ 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 \ @@ -913,8 +912,6 @@ RES_DRAWABLE_XHDPI = \ 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 = \ diff --git a/mobile/android/base/SiteIdentityPopup.java b/mobile/android/base/SiteIdentityPopup.java index 8611f0c13c98..7739580ff8cc 100644 --- a/mobile/android/base/SiteIdentityPopup.java +++ b/mobile/android/base/SiteIdentityPopup.java @@ -46,7 +46,10 @@ public class SiteIdentityPopup extends ArrowPopup private TextView mHost; private TextView mOwner; + private TextView mSupplemental; private TextView mVerifier; + private TextView mEncrypted; + private ImageView mLarry; private DoorHanger mMixedContentNotification; @@ -87,6 +90,7 @@ public class SiteIdentityPopup extends ArrowPopup 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) { @@ -135,7 +139,7 @@ public class SiteIdentityPopup extends ArrowPopup 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) { @@ -148,13 +152,12 @@ public class SiteIdentityPopup extends ArrowPopup 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); } @@ -188,7 +191,23 @@ public class SiteIdentityPopup extends ArrowPopup 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)); } } diff --git a/mobile/android/base/resources/drawable-hdpi/larry.png b/mobile/android/base/resources/drawable-hdpi/larry.png deleted file mode 100644 index 1696d9afea67..000000000000 Binary files a/mobile/android/base/resources/drawable-hdpi/larry.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-hdpi/larry_blue.png b/mobile/android/base/resources/drawable-hdpi/larry_blue.png new file mode 100644 index 000000000000..f76760a3a4cf Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/larry_blue.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/larry_green.png b/mobile/android/base/resources/drawable-hdpi/larry_green.png new file mode 100644 index 000000000000..2c8eb3e942b1 Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/larry_green.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/lock_identified.png b/mobile/android/base/resources/drawable-hdpi/lock_identified.png deleted file mode 100644 index 70529bff364d..000000000000 Binary files a/mobile/android/base/resources/drawable-hdpi/lock_identified.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-hdpi/lock_verified.png b/mobile/android/base/resources/drawable-hdpi/lock_verified.png deleted file mode 100644 index a63d88c3c450..000000000000 Binary files a/mobile/android/base/resources/drawable-hdpi/lock_verified.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-hdpi/shield.png b/mobile/android/base/resources/drawable-hdpi/shield.png deleted file mode 100644 index 2403523718c1..000000000000 Binary files a/mobile/android/base/resources/drawable-hdpi/shield.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-hdpi/shield_doorhanger.png b/mobile/android/base/resources/drawable-hdpi/shield_doorhanger.png deleted file mode 100644 index 3d352b3042b1..000000000000 Binary files a/mobile/android/base/resources/drawable-hdpi/shield_doorhanger.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-hdpi/site_security_blocked_mixed_content.png b/mobile/android/base/resources/drawable-hdpi/site_security_blocked_mixed_content.png new file mode 100644 index 000000000000..c2e49b3a7fb6 Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/site_security_blocked_mixed_content.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/site_security_identified.png b/mobile/android/base/resources/drawable-hdpi/site_security_identified.png new file mode 100644 index 000000000000..cf0db05ff999 Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/site_security_loaded_mixed_content.png b/mobile/android/base/resources/drawable-hdpi/site_security_loaded_mixed_content.png new file mode 100644 index 000000000000..83ba37c2461f Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/site_security_loaded_mixed_content.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/site_security_verified.png b/mobile/android/base/resources/drawable-hdpi/site_security_verified.png new file mode 100644 index 000000000000..23be9896d5a1 Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/warning.png b/mobile/android/base/resources/drawable-hdpi/warning.png deleted file mode 100644 index 2422eaf03a40..000000000000 Binary files a/mobile/android/base/resources/drawable-hdpi/warning.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-hdpi/warning_doorhanger.png b/mobile/android/base/resources/drawable-hdpi/warning_doorhanger.png deleted file mode 100644 index f87166b0798f..000000000000 Binary files a/mobile/android/base/resources/drawable-hdpi/warning_doorhanger.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-mdpi/larry.png b/mobile/android/base/resources/drawable-mdpi/larry.png deleted file mode 100644 index b7f0c05b1a0e..000000000000 Binary files a/mobile/android/base/resources/drawable-mdpi/larry.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-mdpi/larry_blue.png b/mobile/android/base/resources/drawable-mdpi/larry_blue.png new file mode 100644 index 000000000000..cb4fe8d9ec7b Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi/larry_blue.png differ diff --git a/mobile/android/base/resources/drawable-mdpi/larry_green.png b/mobile/android/base/resources/drawable-mdpi/larry_green.png new file mode 100644 index 000000000000..5147a920ca9e Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi/larry_green.png differ diff --git a/mobile/android/base/resources/drawable-mdpi/shield.png b/mobile/android/base/resources/drawable-mdpi/shield.png deleted file mode 100644 index 99875d8dd1d6..000000000000 Binary files a/mobile/android/base/resources/drawable-mdpi/shield.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-mdpi/shield_doorhanger.png b/mobile/android/base/resources/drawable-mdpi/shield_doorhanger.png deleted file mode 100644 index f85849d23bf0..000000000000 Binary files a/mobile/android/base/resources/drawable-mdpi/shield_doorhanger.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-mdpi/site_security_blocked_mixed_content.png b/mobile/android/base/resources/drawable-mdpi/site_security_blocked_mixed_content.png new file mode 100644 index 000000000000..7cf33ec4c5ac Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi/site_security_blocked_mixed_content.png differ diff --git a/mobile/android/base/resources/drawable-mdpi/lock_identified.png b/mobile/android/base/resources/drawable-mdpi/site_security_identified.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi/lock_identified.png rename to mobile/android/base/resources/drawable-mdpi/site_security_identified.png diff --git a/mobile/android/base/resources/drawable-mdpi/site_security_loaded_mixed_content.png b/mobile/android/base/resources/drawable-mdpi/site_security_loaded_mixed_content.png new file mode 100644 index 000000000000..83ba37c2461f Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi/site_security_loaded_mixed_content.png differ diff --git a/mobile/android/base/resources/drawable-mdpi/lock_verified.png b/mobile/android/base/resources/drawable-mdpi/site_security_verified.png similarity index 100% rename from mobile/android/base/resources/drawable-mdpi/lock_verified.png rename to mobile/android/base/resources/drawable-mdpi/site_security_verified.png diff --git a/mobile/android/base/resources/drawable-mdpi/warning.png b/mobile/android/base/resources/drawable-mdpi/warning.png deleted file mode 100644 index 8b39ad36b754..000000000000 Binary files a/mobile/android/base/resources/drawable-mdpi/warning.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-mdpi/warning_doorhanger.png b/mobile/android/base/resources/drawable-mdpi/warning_doorhanger.png deleted file mode 100644 index 9b030158ecb4..000000000000 Binary files a/mobile/android/base/resources/drawable-mdpi/warning_doorhanger.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xhdpi/larry.png b/mobile/android/base/resources/drawable-xhdpi/larry.png deleted file mode 100644 index a770a6d73a9c..000000000000 Binary files a/mobile/android/base/resources/drawable-xhdpi/larry.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xhdpi/larry_blue.png b/mobile/android/base/resources/drawable-xhdpi/larry_blue.png new file mode 100644 index 000000000000..c460f767f3f3 Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/larry_blue.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/larry_green.png b/mobile/android/base/resources/drawable-xhdpi/larry_green.png new file mode 100644 index 000000000000..371aa3c427b3 Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/larry_green.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/lock_identified.png b/mobile/android/base/resources/drawable-xhdpi/lock_identified.png deleted file mode 100644 index 3dc6843858ca..000000000000 Binary files a/mobile/android/base/resources/drawable-xhdpi/lock_identified.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xhdpi/lock_verified.png b/mobile/android/base/resources/drawable-xhdpi/lock_verified.png deleted file mode 100644 index c393924f456f..000000000000 Binary files a/mobile/android/base/resources/drawable-xhdpi/lock_verified.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xhdpi/shield.png b/mobile/android/base/resources/drawable-xhdpi/shield.png deleted file mode 100644 index 308f6988b6cd..000000000000 Binary files a/mobile/android/base/resources/drawable-xhdpi/shield.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xhdpi/shield_doorhanger.png b/mobile/android/base/resources/drawable-xhdpi/shield_doorhanger.png deleted file mode 100644 index f82471494944..000000000000 Binary files a/mobile/android/base/resources/drawable-xhdpi/shield_doorhanger.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xhdpi/site_security_blocked_mixed_content.png b/mobile/android/base/resources/drawable-xhdpi/site_security_blocked_mixed_content.png new file mode 100644 index 000000000000..cac441514076 Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/site_security_blocked_mixed_content.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/site_security_identified.png b/mobile/android/base/resources/drawable-xhdpi/site_security_identified.png new file mode 100644 index 000000000000..714a3eaf3e67 Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/site_security_loaded_mixed_content.png b/mobile/android/base/resources/drawable-xhdpi/site_security_loaded_mixed_content.png new file mode 100644 index 000000000000..83ba37c2461f Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/site_security_loaded_mixed_content.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/site_security_verified.png b/mobile/android/base/resources/drawable-xhdpi/site_security_verified.png new file mode 100644 index 000000000000..a8b952eb861f Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/warning.png b/mobile/android/base/resources/drawable-xhdpi/warning.png deleted file mode 100644 index 8b0c665ce4b4..000000000000 Binary files a/mobile/android/base/resources/drawable-xhdpi/warning.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable-xhdpi/warning_doorhanger.png b/mobile/android/base/resources/drawable-xhdpi/warning_doorhanger.png deleted file mode 100644 index 91f5157ccc2b..000000000000 Binary files a/mobile/android/base/resources/drawable-xhdpi/warning_doorhanger.png and /dev/null differ diff --git a/mobile/android/base/resources/drawable/site_security_level.xml b/mobile/android/base/resources/drawable/site_security_level.xml index 2b84bb649e0e..7c865ed3196b 100644 --- a/mobile/android/base/resources/drawable/site_security_level.xml +++ b/mobile/android/base/resources/drawable/site_security_level.xml @@ -6,9 +6,9 @@ - - - - + + + + diff --git a/mobile/android/base/resources/layout/doorhanger.xml b/mobile/android/base/resources/layout/doorhanger.xml index e50aed2b86af..8b078a1b2f3f 100644 --- a/mobile/android/base/resources/layout/doorhanger.xml +++ b/mobile/android/base/resources/layout/doorhanger.xml @@ -5,26 +5,14 @@ - - - - - - - + - - + android:orientation="horizontal"> + android:orientation="vertical" + android:padding="12dip"> + android:textSize="18sp"/> + android:textSize="18sp"/> + + diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml index bfd0bc5ae5b6..6fff98de52ee 100644 --- a/mobile/android/base/resources/values/colors.xml +++ b/mobile/android/base/resources/values/colors.xml @@ -63,14 +63,12 @@ #ffffff #000000 #ffffff - #FF222222 - #FF2AA1FE - #FFD1D5DA - #FFB3C2CE - #FFDDE4EA - + #ACC4D5 #ffffff + #FF3298FF + #FF89C450 + #FF000000 #FFFF9500 #FFD06BFF #dddddd diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml index 689a3cd48b15..1c67ec743c1e 100644 --- a/mobile/android/base/resources/values/dimens.xml +++ b/mobile/android/base/resources/values/dimens.xml @@ -40,7 +40,6 @@ 250dp 9sp 15dp - 8sp 6dp 80dp