Show SSL state on favicon and site settings
Change-Id: I2f74f8caa8b8e4aaee7d78895287bdd7d69f758f
diff --git a/res/drawable-hdpi/ic_deco_secure_partial.png b/res/drawable-hdpi/ic_deco_secure_partial.png
deleted file mode 100644
index 24ba10e..0000000
--- a/res/drawable-hdpi/ic_deco_secure_partial.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialog_browser_certificate_partially_secure.png b/res/drawable-hdpi/ic_dialog_browser_certificate_partially_secure.png
deleted file mode 100644
index 3aa358b..0000000
--- a/res/drawable-hdpi/ic_dialog_browser_certificate_partially_secure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialog_browser_certificate_secure.png b/res/drawable-hdpi/ic_dialog_browser_certificate_secure.png
deleted file mode 100644
index f056395..0000000
--- a/res/drawable-hdpi/ic_dialog_browser_certificate_secure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialog_browser_security_bad.png b/res/drawable-hdpi/ic_dialog_browser_security_bad.png
deleted file mode 100644
index f5d8e52..0000000
--- a/res/drawable-hdpi/ic_dialog_browser_security_bad.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialog_browser_security_good.png b/res/drawable-hdpi/ic_dialog_browser_security_good.png
deleted file mode 100644
index a990705..0000000
--- a/res/drawable-hdpi/ic_dialog_browser_security_good.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_deco_secure_partial.png b/res/drawable-mdpi/ic_deco_secure_partial.png
deleted file mode 100644
index 14ef32d..0000000
--- a/res/drawable-mdpi/ic_deco_secure_partial.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialog_browser_certificate_partially_secure.png b/res/drawable-mdpi/ic_dialog_browser_certificate_partially_secure.png
deleted file mode 100644
index b91fb83..0000000
--- a/res/drawable-mdpi/ic_dialog_browser_certificate_partially_secure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialog_browser_certificate_secure.png b/res/drawable-mdpi/ic_dialog_browser_certificate_secure.png
deleted file mode 100644
index 86c7004..0000000
--- a/res/drawable-mdpi/ic_dialog_browser_certificate_secure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialog_browser_security_bad.png b/res/drawable-mdpi/ic_dialog_browser_security_bad.png
deleted file mode 100644
index 7439b51..0000000
--- a/res/drawable-mdpi/ic_dialog_browser_security_bad.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialog_browser_security_good.png b/res/drawable-mdpi/ic_dialog_browser_security_good.png
deleted file mode 100644
index 83f1896..0000000
--- a/res/drawable-mdpi/ic_dialog_browser_security_good.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_deco_secure_partial.png b/res/drawable-xhdpi/ic_deco_secure_partial.png
deleted file mode 100644
index 86c5993..0000000
--- a/res/drawable-xhdpi/ic_deco_secure_partial.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialog_browser_certificate_partially_secure.png b/res/drawable-xhdpi/ic_dialog_browser_certificate_partially_secure.png
deleted file mode 100644
index 37c0b91..0000000
--- a/res/drawable-xhdpi/ic_dialog_browser_certificate_partially_secure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialog_browser_certificate_secure.png b/res/drawable-xhdpi/ic_dialog_browser_certificate_secure.png
deleted file mode 100644
index 036eba6..0000000
--- a/res/drawable-xhdpi/ic_dialog_browser_certificate_secure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialog_browser_security_bad.png b/res/drawable-xhdpi/ic_dialog_browser_security_bad.png
deleted file mode 100644
index 1e3068b..0000000
--- a/res/drawable-xhdpi/ic_dialog_browser_security_bad.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialog_browser_security_good.png b/res/drawable-xhdpi/ic_dialog_browser_security_good.png
deleted file mode 100644
index e8badf6..0000000
--- a/res/drawable-xhdpi/ic_dialog_browser_security_good.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_cert_avoid.png b/res/drawable-xxhdpi/ic_cert_avoid.png
new file mode 100644
index 0000000..812a627
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_cert_avoid.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_cert_trusted.png b/res/drawable-xxhdpi/ic_cert_trusted.png
new file mode 100644
index 0000000..55e37f3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_cert_trusted.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_cert_untrusted.png b/res/drawable-xxhdpi/ic_cert_untrusted.png
new file mode 100644
index 0000000..0bddf18
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_cert_untrusted.png
Binary files differ
diff --git a/res/layout/ssl_success.xml b/res/layout/ssl_success.xml
index fb14852..6fbedc4 100644
--- a/res/layout/ssl_success.xml
+++ b/res/layout/ssl_success.xml
@@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="center"
- android:src="@drawable/ic_dialog_browser_security_good"
+ android:src="@drawable/ic_sp_level_good"
android:layout_marginStart="20dip"
android:layout_marginBottom="12dip" />
diff --git a/res/layout/ssl_warning.xml b/res/layout/ssl_warning.xml
index 9471943..5a9b141 100644
--- a/res/layout/ssl_warning.xml
+++ b/res/layout/ssl_warning.xml
@@ -19,7 +19,6 @@
android:id="@+id/warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:drawableStart="@drawable/ic_dialog_browser_security_bad"
android:drawablePadding="6dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_marginStart="12dip"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e2205d1..5ab4736 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -423,7 +423,8 @@
<item>"Blocked %1$s and %2$s. "</item>
<item>"Blocked %1$s, %2$s and $3$s. "</item>
</string-array>
- <string name="pref_valid_cert">Site has a valid SSL certificate.</string>
+ <string name="pref_valid_cert"
+ >Valid SSL certificate. Communication is encrypted and identity is verified.</string>
<string name="pref_invalid_cert">Site has an invalid SSL certificate.</string>
<string name="pref_warning_cert">Site SSL certificate has warnings.</string>
<!-- Label for option that when clicked opens the AutoFill settings screen. Also used as the title of that AutoFill Settings screen. [CHAR-LIMIT=32] -->
