Commit 0062d385 authored by Tatsuhisa Yamaguchi's avatar Tatsuhisa Yamaguchi Committed by Commit Bot

Hide lock icon in OOBE status tray wifi icon.

We have hidden the lock icon badge in the status tray to avoid visual
clutter, but the logic was not applied on dark color icons in OOBE.


Test: manual test by connecting to an encrypted wifi access point at OOBE
Bug: 874012
Change-Id: I529591faeba8febfce918dd400cc3d230da58658
Reviewed-on: https://chromium-review.googlesource.com/1177081Reviewed-by: default avatarTetsui Ohkubo <tetsui@chromium.org>
Reviewed-by: default avatarYoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Tatsuhisa Yamaguchi <yamaguchi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584995}
parent 801eadbe
...@@ -510,7 +510,7 @@ void NetworkIconImpl::GetBadges(const NetworkState* network, Badges* badges) { ...@@ -510,7 +510,7 @@ void NetworkIconImpl::GetBadges(const NetworkState* network, Badges* badges) {
const SkColor icon_color = GetDefaultColorForIconType(icon_type_); const SkColor icon_color = GetDefaultColorForIconType(icon_type_);
if (type == shill::kTypeWifi) { if (type == shill::kTypeWifi) {
if (network->security_class() != shill::kSecurityNone && if (network->security_class() != shill::kSecurityNone &&
IconTypeIsDark(icon_type_)) { !IsTrayIcon(icon_type_)) {
badges->bottom_right = {&kNetworkBadgeSecureIcon, icon_color}; badges->bottom_right = {&kNetworkBadgeSecureIcon, icon_color};
} }
} else if (type == shill::kTypeWimax) { } else if (type == shill::kTypeWimax) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment