From 96d0ccd052ef8ef8832207045b4d79e941a95667 Mon Sep 17 00:00:00 2001 From: Pankaj Garg Date: Thu, 30 Jul 2015 16:49:47 -0700 Subject: Show SSL state on favicon and site settings Change-Id: I2f74f8caa8b8e4aaee7d78895287bdd7d69f758f --- res/drawable-hdpi/ic_deco_secure_partial.png | Bin 904 -> 0 bytes .../ic_dialog_browser_certificate_partially_secure.png | Bin 2237 -> 0 bytes .../ic_dialog_browser_certificate_secure.png | Bin 2232 -> 0 bytes res/drawable-hdpi/ic_dialog_browser_security_bad.png | Bin 1418 -> 0 bytes res/drawable-hdpi/ic_dialog_browser_security_good.png | Bin 1146 -> 0 bytes res/drawable-mdpi/ic_deco_secure_partial.png | Bin 725 -> 0 bytes .../ic_dialog_browser_certificate_partially_secure.png | Bin 1235 -> 0 bytes .../ic_dialog_browser_certificate_secure.png | Bin 1216 -> 0 bytes res/drawable-mdpi/ic_dialog_browser_security_bad.png | Bin 678 -> 0 bytes res/drawable-mdpi/ic_dialog_browser_security_good.png | Bin 679 -> 0 bytes res/drawable-xhdpi/ic_deco_secure_partial.png | Bin 1214 -> 0 bytes .../ic_dialog_browser_certificate_partially_secure.png | Bin 5622 -> 0 bytes .../ic_dialog_browser_certificate_secure.png | Bin 5733 -> 0 bytes res/drawable-xhdpi/ic_dialog_browser_security_bad.png | Bin 2711 -> 0 bytes res/drawable-xhdpi/ic_dialog_browser_security_good.png | Bin 2266 -> 0 bytes res/drawable-xxhdpi/ic_cert_avoid.png | Bin 0 -> 1912 bytes res/drawable-xxhdpi/ic_cert_trusted.png | Bin 0 -> 2834 bytes res/drawable-xxhdpi/ic_cert_untrusted.png | Bin 0 -> 2374 bytes res/layout/ssl_success.xml | 2 +- res/layout/ssl_warning.xml | 1 - res/values/strings.xml | 3 ++- 21 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 res/drawable-hdpi/ic_deco_secure_partial.png delete mode 100644 res/drawable-hdpi/ic_dialog_browser_certificate_partially_secure.png delete mode 100644 res/drawable-hdpi/ic_dialog_browser_certificate_secure.png delete mode 100644 res/drawable-hdpi/ic_dialog_browser_security_bad.png delete mode 100644 res/drawable-hdpi/ic_dialog_browser_security_good.png delete mode 100644 res/drawable-mdpi/ic_deco_secure_partial.png delete mode 100644 res/drawable-mdpi/ic_dialog_browser_certificate_partially_secure.png delete mode 100644 res/drawable-mdpi/ic_dialog_browser_certificate_secure.png delete mode 100644 res/drawable-mdpi/ic_dialog_browser_security_bad.png delete mode 100644 res/drawable-mdpi/ic_dialog_browser_security_good.png delete mode 100644 res/drawable-xhdpi/ic_deco_secure_partial.png delete mode 100644 res/drawable-xhdpi/ic_dialog_browser_certificate_partially_secure.png delete mode 100644 res/drawable-xhdpi/ic_dialog_browser_certificate_secure.png delete mode 100644 res/drawable-xhdpi/ic_dialog_browser_security_bad.png delete mode 100644 res/drawable-xhdpi/ic_dialog_browser_security_good.png create mode 100644 res/drawable-xxhdpi/ic_cert_avoid.png create mode 100644 res/drawable-xxhdpi/ic_cert_trusted.png create mode 100644 res/drawable-xxhdpi/ic_cert_untrusted.png (limited to 'res') 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 24ba10e5..00000000 Binary files a/res/drawable-hdpi/ic_deco_secure_partial.png and /dev/null 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 3aa358bf..00000000 Binary files a/res/drawable-hdpi/ic_dialog_browser_certificate_partially_secure.png and /dev/null 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 f0563955..00000000 Binary files a/res/drawable-hdpi/ic_dialog_browser_certificate_secure.png and /dev/null 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 f5d8e52f..00000000 Binary files a/res/drawable-hdpi/ic_dialog_browser_security_bad.png and /dev/null 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 a990705a..00000000 Binary files a/res/drawable-hdpi/ic_dialog_browser_security_good.png and /dev/null 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 14ef32d0..00000000 Binary files a/res/drawable-mdpi/ic_deco_secure_partial.png and /dev/null 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 b91fb837..00000000 Binary files a/res/drawable-mdpi/ic_dialog_browser_certificate_partially_secure.png and /dev/null 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 86c70045..00000000 Binary files a/res/drawable-mdpi/ic_dialog_browser_certificate_secure.png and /dev/null 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 7439b51c..00000000 Binary files a/res/drawable-mdpi/ic_dialog_browser_security_bad.png and /dev/null 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 83f18967..00000000 Binary files a/res/drawable-mdpi/ic_dialog_browser_security_good.png and /dev/null 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 86c59935..00000000 Binary files a/res/drawable-xhdpi/ic_deco_secure_partial.png and /dev/null 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 37c0b91c..00000000 Binary files a/res/drawable-xhdpi/ic_dialog_browser_certificate_partially_secure.png and /dev/null 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 036eba67..00000000 Binary files a/res/drawable-xhdpi/ic_dialog_browser_certificate_secure.png and /dev/null 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 1e3068bf..00000000 Binary files a/res/drawable-xhdpi/ic_dialog_browser_security_bad.png and /dev/null 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 e8badf65..00000000 Binary files a/res/drawable-xhdpi/ic_dialog_browser_security_good.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_cert_avoid.png b/res/drawable-xxhdpi/ic_cert_avoid.png new file mode 100644 index 00000000..812a6272 Binary files /dev/null and b/res/drawable-xxhdpi/ic_cert_avoid.png differ diff --git a/res/drawable-xxhdpi/ic_cert_trusted.png b/res/drawable-xxhdpi/ic_cert_trusted.png new file mode 100644 index 00000000..55e37f3e Binary files /dev/null and b/res/drawable-xxhdpi/ic_cert_trusted.png differ diff --git a/res/drawable-xxhdpi/ic_cert_untrusted.png b/res/drawable-xxhdpi/ic_cert_untrusted.png new file mode 100644 index 00000000..0bddf180 Binary files /dev/null and b/res/drawable-xxhdpi/ic_cert_untrusted.png differ diff --git a/res/layout/ssl_success.xml b/res/layout/ssl_success.xml index fb148529..6fbedc46 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 9471943c..5a9b1417 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 e2205d18..5ab4736b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -423,7 +423,8 @@ "Blocked %1$s and %2$s. " "Blocked %1$s, %2$s and $3$s. " - Site has a valid SSL certificate. + Valid SSL certificate. Communication is encrypted and identity is verified. Site has an invalid SSL certificate. Site SSL certificate has warnings. -- cgit v1.2.3