Backout 111b3d84c479 (bug 885962) for Android bustage on a CLOSED TREE
--HG-- rename : mobile/android/base/resources/drawable-mdpi/lock_identified.png => mobile/android/base/resources/drawable-mdpi/site_security_identified.png rename : mobile/android/base/resources/drawable-mdpi/lock_verified.png => mobile/android/base/resources/drawable-mdpi/site_security_verified.png extra : amend_source : aff11fe057de12ee7ec2fff8814a78b415d6554a
@ -12,7 +12,6 @@ import org.json.JSONException;
|
|||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.res.Resources;
|
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.text.SpannableString;
|
import android.text.SpannableString;
|
||||||
@ -26,7 +25,6 @@ import android.view.View;
|
|||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.CheckBox;
|
import android.widget.CheckBox;
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.Spinner;
|
import android.widget.Spinner;
|
||||||
import android.widget.SpinnerAdapter;
|
import android.widget.SpinnerAdapter;
|
||||||
@ -35,7 +33,7 @@ import android.widget.TextView;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
class DoorHanger extends LinearLayout {
|
public class DoorHanger extends LinearLayout {
|
||||||
private static final String LOGTAG = "GeckoDoorHanger";
|
private static final String LOGTAG = "GeckoDoorHanger";
|
||||||
|
|
||||||
private static int sInputPadding = -1;
|
private static int sInputPadding = -1;
|
||||||
@ -48,7 +46,6 @@ class DoorHanger extends LinearLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private final TextView mTextView;
|
private final TextView mTextView;
|
||||||
private final ImageView mIcon;
|
|
||||||
private final LinearLayout mChoicesLayout;
|
private final LinearLayout mChoicesLayout;
|
||||||
|
|
||||||
// Divider between doorhangers.
|
// Divider between doorhangers.
|
||||||
@ -60,8 +57,6 @@ class DoorHanger extends LinearLayout {
|
|||||||
// Value used to identify the notification.
|
// Value used to identify the notification.
|
||||||
private final String mValue;
|
private final String mValue;
|
||||||
|
|
||||||
private Resources mResources;
|
|
||||||
|
|
||||||
private List<PromptInput> mInputs;
|
private List<PromptInput> mInputs;
|
||||||
private CheckBox mCheckBox;
|
private CheckBox mCheckBox;
|
||||||
|
|
||||||
@ -69,67 +64,36 @@ class DoorHanger extends LinearLayout {
|
|||||||
private boolean mPersistWhileVisible = false;
|
private boolean mPersistWhileVisible = false;
|
||||||
private long mTimeout = 0;
|
private long mTimeout = 0;
|
||||||
|
|
||||||
// Color used for dividers above and between buttons.
|
public interface OnButtonClickListener {
|
||||||
private int mDividerColor;
|
|
||||||
|
|
||||||
static enum Theme {
|
|
||||||
LIGHT,
|
|
||||||
DARK
|
|
||||||
}
|
|
||||||
|
|
||||||
interface OnButtonClickListener {
|
|
||||||
public void onButtonClick(DoorHanger dh, String tag);
|
public void onButtonClick(DoorHanger dh, String tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
DoorHanger(Context context, Theme theme) {
|
DoorHanger(Context context) {
|
||||||
this(context, 0, null, theme);
|
this(context, 0, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
DoorHanger(Context context, int tabId, String value) {
|
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);
|
super(context);
|
||||||
|
|
||||||
mTabId = tabId;
|
mTabId = tabId;
|
||||||
mValue = value;
|
mValue = value;
|
||||||
mResources = getResources();
|
|
||||||
|
|
||||||
if (sInputPadding == -1) {
|
if (sInputPadding == -1) {
|
||||||
sInputPadding = mResources.getDimensionPixelSize(R.dimen.doorhanger_padding);
|
sInputPadding = getResources().getDimensionPixelSize(R.dimen.doorhanger_padding);
|
||||||
}
|
}
|
||||||
if (sSpinnerTextColor == -1) {
|
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) {
|
if (sSpinnerTextSize == -1) {
|
||||||
sSpinnerTextSize = mResources.getDimensionPixelSize(R.dimen.doorhanger_spinner_textsize);
|
sSpinnerTextSize = getResources().getDimensionPixelSize(R.dimen.doorhanger_spinner_textsize);
|
||||||
}
|
}
|
||||||
|
|
||||||
setOrientation(VERTICAL);
|
setOrientation(VERTICAL);
|
||||||
|
|
||||||
LayoutInflater.from(context).inflate(R.layout.doorhanger, this);
|
LayoutInflater.from(context).inflate(R.layout.doorhanger, this);
|
||||||
mTextView = (TextView) findViewById(R.id.doorhanger_title);
|
mTextView = (TextView) findViewById(R.id.doorhanger_title);
|
||||||
mIcon = (ImageView) findViewById(R.id.doorhanger_icon);
|
|
||||||
mChoicesLayout = (LinearLayout) findViewById(R.id.doorhanger_choices);
|
mChoicesLayout = (LinearLayout) findViewById(R.id.doorhanger_choices);
|
||||||
mDivider = findViewById(R.id.divider_doorhanger);
|
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() {
|
int getTabId() {
|
||||||
@ -160,11 +124,6 @@ class DoorHanger extends LinearLayout {
|
|||||||
mTextView.setText(message);
|
mTextView.setText(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setIcon(int resId) {
|
|
||||||
mIcon.setImageResource(resId);
|
|
||||||
mIcon.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
void addLink(String label, String url, String delimiter) {
|
void addLink(String label, String url, String delimiter) {
|
||||||
String title = mTextView.getText().toString();
|
String title = mTextView.getText().toString();
|
||||||
SpannableString titleWithLink = new SpannableString(title + delimiter + label);
|
SpannableString titleWithLink = new SpannableString(title + delimiter + label);
|
||||||
@ -199,15 +158,12 @@ class DoorHanger extends LinearLayout {
|
|||||||
if (mChoicesLayout.getChildCount() == 0) {
|
if (mChoicesLayout.getChildCount() == 0) {
|
||||||
// If this is the first button we're adding, make the choices layout visible.
|
// If this is the first button we're adding, make the choices layout visible.
|
||||||
mChoicesLayout.setVisibility(View.VISIBLE);
|
mChoicesLayout.setVisibility(View.VISIBLE);
|
||||||
// Make the divider above the buttons visible.
|
findViewById(R.id.divider_choices).setVisibility(View.VISIBLE);
|
||||||
View divider = findViewById(R.id.divider_choices);
|
|
||||||
divider.setVisibility(View.VISIBLE);
|
|
||||||
divider.setBackgroundColor(mDividerColor);
|
|
||||||
} else {
|
} else {
|
||||||
// Add a vertical divider between additional buttons.
|
// Add a divider for additional buttons.
|
||||||
Divider divider = new Divider(getContext(), null);
|
Divider divider = new Divider(getContext(), null);
|
||||||
divider.setOrientation(Divider.Orientation.VERTICAL);
|
divider.setOrientation(Divider.Orientation.VERTICAL);
|
||||||
divider.setBackgroundColor(mDividerColor);
|
divider.setBackgroundColor(0xFFD1D5DA);
|
||||||
mChoicesLayout.addView(divider);
|
mChoicesLayout.addView(divider);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -683,9 +683,8 @@ RES_DRAWABLE_MDPI = \
|
|||||||
res/drawable-mdpi/find_close.png \
|
res/drawable-mdpi/find_close.png \
|
||||||
res/drawable-mdpi/find_next.png \
|
res/drawable-mdpi/find_next.png \
|
||||||
res/drawable-mdpi/find_prev.png \
|
res/drawable-mdpi/find_prev.png \
|
||||||
res/drawable-mdpi/larry.png \
|
res/drawable-mdpi/larry_blue.png \
|
||||||
res/drawable-mdpi/lock_identified.png \
|
res/drawable-mdpi/larry_green.png \
|
||||||
res/drawable-mdpi/lock_verified.png \
|
|
||||||
res/drawable-mdpi/menu.png \
|
res/drawable-mdpi/menu.png \
|
||||||
res/drawable-mdpi/menu_pb.png \
|
res/drawable-mdpi/menu_pb.png \
|
||||||
res/drawable-mdpi/menu_panel_bg.9.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_check.png \
|
||||||
res/drawable-mdpi/menu_item_more.png \
|
res/drawable-mdpi/menu_item_more.png \
|
||||||
res/drawable-mdpi/menu_item_uncheck.png \
|
res/drawable-mdpi/menu_item_uncheck.png \
|
||||||
res/drawable-mdpi/shield.png \
|
res/drawable-mdpi/site_security_blocked_mixed_content.png \
|
||||||
res/drawable-mdpi/shield_doorhanger.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_normal.png \
|
||||||
res/drawable-mdpi/tabs_private.png \
|
res/drawable-mdpi/tabs_private.png \
|
||||||
res/drawable-mdpi/tabs_synced.png \
|
res/drawable-mdpi/tabs_synced.png \
|
||||||
@ -716,8 +717,6 @@ RES_DRAWABLE_MDPI = \
|
|||||||
res/drawable-mdpi/shadow.png \
|
res/drawable-mdpi/shadow.png \
|
||||||
res/drawable-mdpi/start.png \
|
res/drawable-mdpi/start.png \
|
||||||
res/drawable-mdpi/marketplace.png \
|
res/drawable-mdpi/marketplace.png \
|
||||||
res/drawable-mdpi/warning.png \
|
|
||||||
res/drawable-mdpi/warning_doorhanger.png \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
RES_DRAWABLE_LDPI = \
|
RES_DRAWABLE_LDPI = \
|
||||||
@ -791,9 +790,8 @@ RES_DRAWABLE_HDPI = \
|
|||||||
res/drawable-hdpi/find_close.png \
|
res/drawable-hdpi/find_close.png \
|
||||||
res/drawable-hdpi/find_next.png \
|
res/drawable-hdpi/find_next.png \
|
||||||
res/drawable-hdpi/find_prev.png \
|
res/drawable-hdpi/find_prev.png \
|
||||||
res/drawable-hdpi/larry.png \
|
res/drawable-hdpi/larry_blue.png \
|
||||||
res/drawable-hdpi/lock_identified.png \
|
res/drawable-hdpi/larry_green.png \
|
||||||
res/drawable-hdpi/lock_verified.png \
|
|
||||||
res/drawable-hdpi/menu.png \
|
res/drawable-hdpi/menu.png \
|
||||||
res/drawable-hdpi/menu_pb.png \
|
res/drawable-hdpi/menu_pb.png \
|
||||||
res/drawable-hdpi/menu_panel_bg.9.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_check.png \
|
||||||
res/drawable-hdpi/menu_item_more.png \
|
res/drawable-hdpi/menu_item_more.png \
|
||||||
res/drawable-hdpi/menu_item_uncheck.png \
|
res/drawable-hdpi/menu_item_uncheck.png \
|
||||||
res/drawable-hdpi/shield.png \
|
res/drawable-hdpi/site_security_blocked_mixed_content.png \
|
||||||
res/drawable-hdpi/shield_doorhanger.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_normal.png \
|
||||||
res/drawable-hdpi/tabs_private.png \
|
res/drawable-hdpi/tabs_private.png \
|
||||||
res/drawable-hdpi/tabs_synced.png \
|
res/drawable-hdpi/tabs_synced.png \
|
||||||
@ -818,8 +818,6 @@ RES_DRAWABLE_HDPI = \
|
|||||||
res/drawable-hdpi/handle_end.png \
|
res/drawable-hdpi/handle_end.png \
|
||||||
res/drawable-hdpi/handle_middle.png \
|
res/drawable-hdpi/handle_middle.png \
|
||||||
res/drawable-hdpi/handle_start.png \
|
res/drawable-hdpi/handle_start.png \
|
||||||
res/drawable-hdpi/warning.png \
|
|
||||||
res/drawable-hdpi/warning_doorhanger.png \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
RES_DRAWABLE_XHDPI = \
|
RES_DRAWABLE_XHDPI = \
|
||||||
@ -887,9 +885,8 @@ RES_DRAWABLE_XHDPI = \
|
|||||||
res/drawable-xhdpi/reader.png \
|
res/drawable-xhdpi/reader.png \
|
||||||
res/drawable-xhdpi/reader_active.png \
|
res/drawable-xhdpi/reader_active.png \
|
||||||
res/drawable-xhdpi/reading_list.png \
|
res/drawable-xhdpi/reading_list.png \
|
||||||
res/drawable-xhdpi/larry.png \
|
res/drawable-xhdpi/larry_blue.png \
|
||||||
res/drawable-xhdpi/lock_identified.png \
|
res/drawable-xhdpi/larry_green.png \
|
||||||
res/drawable-xhdpi/lock_verified.png \
|
|
||||||
res/drawable-xhdpi/menu.png \
|
res/drawable-xhdpi/menu.png \
|
||||||
res/drawable-xhdpi/menu_pb.png \
|
res/drawable-xhdpi/menu_pb.png \
|
||||||
res/drawable-xhdpi/menu_panel_bg.9.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_check.png \
|
||||||
res/drawable-xhdpi/menu_item_more.png \
|
res/drawable-xhdpi/menu_item_more.png \
|
||||||
res/drawable-xhdpi/menu_item_uncheck.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_divider.9.png \
|
||||||
res/drawable-xhdpi/tab_indicator_selected.9.png \
|
res/drawable-xhdpi/tab_indicator_selected.9.png \
|
||||||
res/drawable-xhdpi/tab_indicator_selected_focused.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_normal.png \
|
||||||
res/drawable-xhdpi/tabs_private.png \
|
res/drawable-xhdpi/tabs_private.png \
|
||||||
res/drawable-xhdpi/tabs_synced.png \
|
res/drawable-xhdpi/tabs_synced.png \
|
||||||
@ -913,8 +912,6 @@ RES_DRAWABLE_XHDPI = \
|
|||||||
res/drawable-xhdpi/handle_end.png \
|
res/drawable-xhdpi/handle_end.png \
|
||||||
res/drawable-xhdpi/handle_middle.png \
|
res/drawable-xhdpi/handle_middle.png \
|
||||||
res/drawable-xhdpi/handle_start.png \
|
res/drawable-xhdpi/handle_start.png \
|
||||||
res/drawable-xhdpi/warning.png \
|
|
||||||
res/drawable-xhdpi/warning_doorhanger.png \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
RES_DRAWABLE_MDPI_V11 = \
|
RES_DRAWABLE_MDPI_V11 = \
|
||||||
|
@ -46,7 +46,10 @@ public class SiteIdentityPopup extends ArrowPopup
|
|||||||
|
|
||||||
private TextView mHost;
|
private TextView mHost;
|
||||||
private TextView mOwner;
|
private TextView mOwner;
|
||||||
|
private TextView mSupplemental;
|
||||||
private TextView mVerifier;
|
private TextView mVerifier;
|
||||||
|
private TextView mEncrypted;
|
||||||
|
private ImageView mLarry;
|
||||||
|
|
||||||
private DoorHanger mMixedContentNotification;
|
private DoorHanger mMixedContentNotification;
|
||||||
|
|
||||||
@ -87,6 +90,7 @@ public class SiteIdentityPopup extends ArrowPopup
|
|||||||
mHost = (TextView) layout.findViewById(R.id.host);
|
mHost = (TextView) layout.findViewById(R.id.host);
|
||||||
mOwner = (TextView) layout.findViewById(R.id.owner);
|
mOwner = (TextView) layout.findViewById(R.id.owner);
|
||||||
mVerifier = (TextView) layout.findViewById(R.id.verifier);
|
mVerifier = (TextView) layout.findViewById(R.id.verifier);
|
||||||
|
mLarry = (ImageView) layout.findViewById(R.id.larry);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setIdentity(JSONObject identityData) {
|
private void setIdentity(JSONObject identityData) {
|
||||||
@ -135,7 +139,7 @@ public class SiteIdentityPopup extends ArrowPopup
|
|||||||
private void addMixedContentNotification(boolean blocked) {
|
private void addMixedContentNotification(boolean blocked) {
|
||||||
// Remove any exixting mixed content notification.
|
// Remove any exixting mixed content notification.
|
||||||
removeMixedContentNotification();
|
removeMixedContentNotification();
|
||||||
mMixedContentNotification = new DoorHanger(mActivity, DoorHanger.Theme.DARK);
|
mMixedContentNotification = new DoorHanger(mActivity);
|
||||||
|
|
||||||
String message;
|
String message;
|
||||||
if (blocked) {
|
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");
|
mMixedContentNotification.addLink(mActivity.getString(R.string.learn_more), MIXED_CONTENT_SUPPORT_URL, "\n\n");
|
||||||
|
|
||||||
if (blocked) {
|
if (blocked) {
|
||||||
mMixedContentNotification.setIcon(R.drawable.shield_doorhanger);
|
|
||||||
mMixedContentNotification.addButton(mActivity.getString(R.string.disable_protection), "disable", this);
|
mMixedContentNotification.addButton(mActivity.getString(R.string.disable_protection), "disable", this);
|
||||||
mMixedContentNotification.addButton(mActivity.getString(R.string.keep_blocking), "keepBlocking", this);
|
mMixedContentNotification.addButton(mActivity.getString(R.string.keep_blocking), "keepBlocking", this);
|
||||||
} else {
|
} else {
|
||||||
mMixedContentNotification.setIcon(R.drawable.warning_doorhanger);
|
|
||||||
mMixedContentNotification.addButton(mActivity.getString(R.string.enable_protection), "enable", this);
|
mMixedContentNotification.addButton(mActivity.getString(R.string.enable_protection), "enable", this);
|
||||||
}
|
}
|
||||||
|
mMixedContentNotification.setBackgroundColor(0xFFDDE4EA);
|
||||||
|
|
||||||
mContent.addView(mMixedContentNotification);
|
mContent.addView(mMixedContentNotification);
|
||||||
}
|
}
|
||||||
@ -188,7 +191,23 @@ public class SiteIdentityPopup extends ArrowPopup
|
|||||||
|
|
||||||
setIdentity(identityData);
|
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));
|
addMixedContentNotification(MIXED_CONTENT_BLOCKED.equals(mode));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Before Width: | Height: | Size: 1.3 KiB |
BIN
mobile/android/base/resources/drawable-hdpi/larry_blue.png
Normal file
After Width: | Height: | Size: 744 B |
BIN
mobile/android/base/resources/drawable-hdpi/larry_green.png
Normal file
After Width: | Height: | Size: 744 B |
Before Width: | Height: | Size: 338 B |
Before Width: | Height: | Size: 271 B |
Before Width: | Height: | Size: 493 B |
Before Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 691 B |
After Width: | Height: | Size: 347 B |
After Width: | Height: | Size: 679 B |
After Width: | Height: | Size: 276 B |
Before Width: | Height: | Size: 408 B |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 646 B |
BIN
mobile/android/base/resources/drawable-mdpi/larry_blue.png
Normal file
After Width: | Height: | Size: 569 B |
BIN
mobile/android/base/resources/drawable-mdpi/larry_green.png
Normal file
After Width: | Height: | Size: 569 B |
Before Width: | Height: | Size: 339 B |
Before Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 346 B |
Before Width: | Height: | Size: 259 B After Width: | Height: | Size: 259 B |
After Width: | Height: | Size: 679 B |
Before Width: | Height: | Size: 222 B After Width: | Height: | Size: 222 B |
Before Width: | Height: | Size: 260 B |
Before Width: | Height: | Size: 834 B |
Before Width: | Height: | Size: 1.8 KiB |
BIN
mobile/android/base/resources/drawable-xhdpi/larry_blue.png
Normal file
After Width: | Height: | Size: 959 B |
BIN
mobile/android/base/resources/drawable-xhdpi/larry_green.png
Normal file
After Width: | Height: | Size: 959 B |
Before Width: | Height: | Size: 417 B |
Before Width: | Height: | Size: 354 B |
Before Width: | Height: | Size: 680 B |
Before Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 421 B |
After Width: | Height: | Size: 679 B |
After Width: | Height: | Size: 360 B |
Before Width: | Height: | Size: 482 B |
Before Width: | Height: | Size: 1.6 KiB |
@ -6,9 +6,9 @@
|
|||||||
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
|
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<item android:maxLevel="0" android:drawable="@android:color/transparent"/>
|
<item android:maxLevel="0" android:drawable="@android:color/transparent"/>
|
||||||
<item android:maxLevel="1" android:drawable="@drawable/lock_identified"/>
|
<item android:maxLevel="1" android:drawable="@drawable/site_security_identified"/>
|
||||||
<item android:maxLevel="2" android:drawable="@drawable/lock_verified"/>
|
<item android:maxLevel="2" android:drawable="@drawable/site_security_verified"/>
|
||||||
<item android:maxLevel="3" android:drawable="@drawable/shield"/>
|
<item android:maxLevel="3" android:drawable="@drawable/site_security_blocked_mixed_content"/>
|
||||||
<item android:maxLevel="4" android:drawable="@drawable/warning"/>
|
<item android:maxLevel="4" android:drawable="@drawable/site_security_loaded_mixed_content"/>
|
||||||
|
|
||||||
</level-list>
|
</level-list>
|
||||||
|
@ -5,26 +5,14 @@
|
|||||||
|
|
||||||
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<LinearLayout android:layout_width="wrap_content"
|
<TextView android:id="@+id/doorhanger_title"
|
||||||
android:layout_height="wrap_content"
|
android:focusable="true"
|
||||||
android:orientation="horizontal"
|
android:layout_width="fill_parent"
|
||||||
android:padding="@dimen/doorhanger_padding">
|
android:layout_height="wrap_content"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||||
<ImageView android:id="@+id/doorhanger_icon"
|
android:textColor="@color/doorhanger_text"
|
||||||
android:layout_width="wrap_content"
|
android:textColorLink="@color/doorhanger_link"
|
||||||
android:layout_height="wrap_content"
|
android:padding="@dimen/doorhanger_padding"/>
|
||||||
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>
|
|
||||||
|
|
||||||
<LinearLayout android:id="@+id/doorhanger_inputs"
|
<LinearLayout android:id="@+id/doorhanger_inputs"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
@ -43,6 +31,7 @@
|
|||||||
<View android:id="@+id/divider_choices"
|
<View android:id="@+id/divider_choices"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="1dp"
|
||||||
|
android:background="#FFD1D5DA"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
|
|
||||||
<LinearLayout android:id="@+id/doorhanger_choices"
|
<LinearLayout android:id="@+id/doorhanger_choices"
|
||||||
|
@ -6,19 +6,13 @@
|
|||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal"
|
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"/>
|
|
||||||
|
|
||||||
<LinearLayout android:layout_width="0dip"
|
<LinearLayout android:layout_width="0dip"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1.0"
|
android:layout_weight="1.0"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical"
|
||||||
|
android:padding="12dip">
|
||||||
|
|
||||||
<TextView android:layout_width="wrap_content"
|
<TextView android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@ -29,9 +23,7 @@
|
|||||||
<TextView android:id="@+id/host"
|
<TextView android:id="@+id/host"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="20sp"
|
android:textSize="18sp"/>
|
||||||
android:textColor="@color/doorhanger_text"
|
|
||||||
android:textStyle="bold"/>
|
|
||||||
|
|
||||||
<TextView android:layout_width="wrap_content"
|
<TextView android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@ -43,9 +35,7 @@
|
|||||||
<TextView android:id="@+id/owner"
|
<TextView android:id="@+id/owner"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/doorhanger_text"
|
android:textSize="18sp"/>
|
||||||
android:textSize="16sp"
|
|
||||||
android:textStyle="bold"/>
|
|
||||||
|
|
||||||
<TextView android:id="@+id/verifier"
|
<TextView android:id="@+id/verifier"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
@ -56,4 +46,9 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<ImageView android:id="@+id/larry"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="15dip"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -63,14 +63,12 @@
|
|||||||
<color name="splash_msgfont">#ffffff</color>
|
<color name="splash_msgfont">#ffffff</color>
|
||||||
<color name="splash_urlfont">#000000</color>
|
<color name="splash_urlfont">#000000</color>
|
||||||
<color name="splash_content">#ffffff</color>
|
<color name="splash_content">#ffffff</color>
|
||||||
|
|
||||||
<color name="doorhanger_text">#FF222222</color>
|
<color name="doorhanger_text">#FF222222</color>
|
||||||
<color name="doorhanger_link">#FF2AA1FE</color>
|
<color name="doorhanger_link">#ACC4D5</color>
|
||||||
<color name="doorhanger_divider_light">#FFD1D5DA</color>
|
|
||||||
<color name="doorhanger_divider_dark">#FFB3C2CE</color>
|
|
||||||
<color name="doorhanger_background_dark">#FFDDE4EA</color>
|
|
||||||
|
|
||||||
<color name="validation_message_text">#ffffff</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">#FFFF9500</color>
|
||||||
<color name="url_bar_text_highlight_pb">#FFD06BFF</color>
|
<color name="url_bar_text_highlight_pb">#FFD06BFF</color>
|
||||||
<color name="suggestion_primary">#dddddd</color>
|
<color name="suggestion_primary">#dddddd</color>
|
||||||
|
@ -40,7 +40,6 @@
|
|||||||
<dimen name="doorhanger_input_width">250dp</dimen>
|
<dimen name="doorhanger_input_width">250dp</dimen>
|
||||||
<dimen name="doorhanger_spinner_textsize">9sp</dimen>
|
<dimen name="doorhanger_spinner_textsize">9sp</dimen>
|
||||||
<dimen name="doorhanger_padding">15dp</dimen>
|
<dimen name="doorhanger_padding">15dp</dimen>
|
||||||
<dimen name="doorhanger_textsize_small">8sp</dimen>
|
|
||||||
|
|
||||||
<dimen name="flow_layout_spacing">6dp</dimen>
|
<dimen name="flow_layout_spacing">6dp</dimen>
|
||||||
<dimen name="menu_item_action_icon">80dp</dimen>
|
<dimen name="menu_item_action_icon">80dp</dimen>
|
||||||
|