Commit b2a5ccb5 authored by Andre Le's avatar Andre Le Committed by Commit Bot

[CrOS PhoneHub] Update icons in PhoneHub tray bubble.

Update PhoneHub icon in the tray and icons in quick actions.

Screenshot:
https://screenshot.googleplex.com/3LdU4GYbkHyUWrx
https://screenshot.googleplex.com/5NMfjT4ZjQuzcDx

BUG=1106937,1126208

Change-Id: Ib4a5e1bdcb38c513f637f2c992c47e7ac7ccd4a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495640Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarTim Song <tengs@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Andre Le <leandre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820815}
parent a2821b54
......@@ -141,8 +141,15 @@ aggregate_vector_icons2("ash_vector_icons") {
"palette_tray_icon_laser_pointer.icon",
"palette_tray_icon_magnify.icon",
"palette_tray_icon_metalayer.icon",
"phone_hub_enable_hotspot_off.icon",
"phone_hub_enable_hotspot_on.icon",
"phone_hub_locate_phone_off.icon",
"phone_hub_locate_phone_on.icon",
"phone_hub_mobile_no_connection.icon",
"phone_hub_mobile_no_sim.icon",
"phone_hub_phone.icon",
"phone_hub_silence_phone_off.icon",
"phone_hub_silence_phone_on.icon",
"pin_request_lock.icon",
"pinned.icon",
"privacy_screen.icon",
......
CANVAS_DIMENSIONS, 20,
MOVE_TO, 2, 2.09f,
LINE_TO, 17.56f, 17.64f,
R_LINE_TO, -1.41f, 1.41f,
R_LINE_TO, -9.09f, -9.09f,
CUBIC_TO, 7.02f, 10.14f, 7, 10.32f, 7, 10.5f,
R_CUBIC_TO, 0, 0.91f, 0.4f, 1.72f, 1.04f, 2.27f,
R_LINE_TO, -1.49f, 1.34f,
CUBIC_TO, 5.59f, 13.2f, 5, 11.92f, 5, 10.5f,
R_CUBIC_TO, 0, -0.76f, 0.17f, -1.47f, 0.47f, -2.12f,
LINE_TO, 4.36f, 7.27f,
CUBIC_TO, 3.81f, 8.22f, 3.5f, 9.33f, 3.5f, 10.5f,
R_CUBIC_TO, 0, 1.81f, 0.74f, 3.44f, 1.93f, 4.62f,
R_LINE_TO, -1.49f, 1.34f,
CUBIC_TO, 2.43f, 14.92f, 1.5f, 12.82f, 1.5f, 10.5f,
R_CUBIC_TO, 0, -1.73f, 0.52f, -3.34f, 1.4f, -4.68f,
LINE_TO, 0.59f, 3.5f,
LINE_TO, 2, 2.09f,
CLOSE,
MOVE_TO, 10, 2,
R_CUBIC_TO, 4.69f, 0, 8.5f, 3.81f, 8.5f, 8.5f,
R_CUBIC_TO, 0, 1.45f, -0.36f, 2.81f, -1, 4,
R_LINE_TO, -1.5f, -1.5f,
CUBIC_TO, 16.32f, 12.23f, 16.5f, 11.39f, 16.5f, 10.5f,
CUBIC_TO, 16.5f, 6.91f, 13.59f, 4, 10, 4,
R_CUBIC_TO, -0.89f, 0, -1.73f, 0.18f, -2.5f, 0.5f,
LINE_TO, 6, 3,
CUBIC_TO, 7.19f, 2.36f, 8.55f, 2, 10, 2,
CLOSE,
R_MOVE_TO, 0, 3.5f,
R_CUBIC_TO, 2.76f, 0, 5, 2.24f, 5, 5,
R_CUBIC_TO, 0, 0.46f, -0.06f, 0.9f, -0.18f, 1.32f,
R_LINE_TO, -1.87f, -1.87f,
R_CUBIC_TO, -0.23f, -1.22f, -1.18f, -2.17f, -2.4f, -2.4f,
LINE_TO, 8.68f, 5.68f,
CUBIC_TO, 9.1f, 5.56f, 9.54f, 5.5f, 10, 5.5f,
CLOSE
CANVAS_DIMENSIONS, 20,
MOVE_TO, 10, 2,
R_CUBIC_TO, 4.69f, 0, 8.5f, 3.81f, 8.5f, 8.5f,
R_CUBIC_TO, 0, 2.32f, -0.93f, 4.42f, -2.44f, 5.96f,
R_LINE_TO, -1.49f, -1.34f,
CUBIC_TO, 15.76f, 13.94f, 16.5f, 12.31f, 16.5f, 10.5f,
CUBIC_TO, 16.5f, 6.91f, 13.59f, 4, 10, 4,
R_CUBIC_TO, -3.59f, 0, -6.5f, 2.91f, -6.5f, 6.5f,
R_CUBIC_TO, 0, 1.81f, 0.74f, 3.44f, 1.93f, 4.62f,
R_LINE_TO, -1.49f, 1.34f,
CUBIC_TO, 2.43f, 14.92f, 1.5f, 12.82f, 1.5f, 10.5f,
CUBIC_TO, 1.5f, 5.81f, 5.31f, 2, 10, 2,
CLOSE,
R_MOVE_TO, 0, 3.5f,
R_CUBIC_TO, 2.76f, 0, 5, 2.24f, 5, 5,
R_CUBIC_TO, 0, 1.42f, -0.59f, 2.7f, -1.54f, 3.61f,
R_LINE_TO, -1.49f, -1.34f,
CUBIC_TO, 12.6f, 12.22f, 13, 11.41f, 13, 10.5f,
R_CUBIC_TO, 0, -1.66f, -1.34f, -3, -3, -3,
R_CUBIC_TO, -1.66f, 0, -3, 1.34f, -3, 3,
R_CUBIC_TO, 0, 0.91f, 0.4f, 1.72f, 1.04f, 2.27f,
R_LINE_TO, -1.49f, 1.34f,
CUBIC_TO, 5.59f, 13.2f, 5, 11.92f, 5, 10.5f,
R_CUBIC_TO, 0, -2.76f, 2.24f, -5, 5, -5,
CLOSE,
MOVE_TO, 10, 9,
R_CUBIC_TO, 0.83f, 0, 1.5f, 0.67f, 1.5f, 1.5f,
R_CUBIC_TO, 0, 0.83f, -0.67f, 1.5f, -1.5f, 1.5f,
R_CUBIC_TO, -0.83f, 0, -1.5f, -0.67f, -1.5f, -1.5f,
R_CUBIC_TO, 0, -0.83f, 0.67f, -1.5f, 1.5f, -1.5f,
CLOSE
CANVAS_DIMENSIONS, 20,
MOVE_TO, 2, 2.09f,
LINE_TO, 17.56f, 17.64f,
R_LINE_TO, -1.41f, 1.41f,
R_LINE_TO, -1.29f, -1.29f,
R_CUBIC_TO, -0.28f, 0.68f, -0.93f, 1.18f, -1.7f, 1.23f,
LINE_TO, 13, 19,
H_LINE_TO, 5,
R_CUBIC_TO, -1.05f, 0, -1.92f, -0.82f, -1.99f, -1.85f,
LINE_TO, 3, 17,
LINE_TO, 3, 5.91f,
R_LINE_TO, -2.41f, -2.41f,
LINE_TO, 2, 2.09f,
CLOSE,
MOVE_TO, 13, 16,
H_LINE_TO, 5,
R_V_LINE_TO, 1,
R_H_LINE_TO, 8,
R_V_LINE_TO, -1,
CLOSE,
R_MOVE_TO, -1.91f, -2,
LINE_TO, 5, 7.91f,
LINE_TO, 5, 14,
R_H_LINE_TO, 6.09f,
CLOSE,
R_MOVE_TO, 5.1f, -8.5f,
R_CUBIC_TO, 2.22f, 2.22f, 2.38f, 5.74f, 0.47f, 8.15f,
R_LINE_TO, -1.17f, -1.16f,
R_CUBIC_TO, 1.23f, -1.7f, 1.14f, -4.08f, -0.3f, -5.66f,
R_LINE_TO, -0.16f, -0.17f,
LINE_TO, 16.18f, 5.5f,
CLOSE,
R_MOVE_TO, -2.03f, 2.02f,
R_CUBIC_TO, 1.11f, 1.11f, 1.25f, 2.81f, 0.44f, 4.08f,
R_LINE_TO, -1.21f, -1.22f,
R_CUBIC_TO, 0.19f, -0.53f, 0.1f, -1.14f, -0.28f, -1.59f,
LINE_TO, 13, 8.67f,
R_LINE_TO, 1.15f, -1.15f,
CLOSE,
MOVE_TO, 5, 1,
R_LINE_TO, 8, 0.01f,
R_CUBIC_TO, 1.05f, 0, 1.92f, 0.81f, 1.99f, 1.84f,
LINE_TO, 15, 3,
R_V_LINE_TO, 3.5f,
R_H_LINE_TO, -2,
V_LINE_TO, 6,
H_LINE_TO, 9,
LINE_TO, 7, 4,
R_H_LINE_TO, 6,
V_LINE_TO, 3,
H_LINE_TO, 6,
LINE_TO, 4.18f, 1.18f,
R_CUBIC_TO, 0.21f, -0.09f, 0.43f, -0.15f, 0.67f, -0.17f,
LINE_TO, 5, 1,
CLOSE
CANVAS_DIMENSIONS, 20,
MOVE_TO, 5, 1,
R_LINE_TO, 8, 0.01f,
R_CUBIC_TO, 1.05f, 0, 1.92f, 0.81f, 1.99f, 1.84f,
LINE_TO, 15, 3,
R_V_LINE_TO, 3.5f,
R_H_LINE_TO, -2,
V_LINE_TO, 6,
H_LINE_TO, 5,
R_V_LINE_TO, 8,
R_H_LINE_TO, 8,
R_V_LINE_TO, -0.5f,
R_H_LINE_TO, 2,
V_LINE_TO, 17,
R_CUBIC_TO, 0, 1.05f, -0.82f, 1.92f, -1.85f, 1.99f,
LINE_TO, 13, 19,
H_LINE_TO, 5,
R_CUBIC_TO, -1.05f, 0, -1.92f, -0.82f, -1.99f, -1.85f,
LINE_TO, 3, 17,
V_LINE_TO, 3,
R_CUBIC_TO, 0, -1.05f, 0.82f, -1.92f, 1.85f, -1.99f,
LINE_TO, 5, 1,
CLOSE,
R_MOVE_TO, 8, 15,
H_LINE_TO, 5,
R_V_LINE_TO, 1,
R_H_LINE_TO, 8,
R_V_LINE_TO, -1,
CLOSE,
R_MOVE_TO, 3.18f, -10.5f,
R_CUBIC_TO, 2.39f, 2.39f, 2.39f, 6.28f, 0, 8.67f,
R_LINE_TO, -1.15f, -1.15f,
CUBIC_TO, 16.78f, 11.26f, 16.78f, 8.4f, 15.03f, 6.65f,
CLOSE,
R_MOVE_TO, -2.03f, 2.02f,
R_CUBIC_TO, 1.28f, 1.28f, 1.28f, 3.35f, 0, 4.63f,
LINE_TO, 13, 10.99f,
R_CUBIC_TO, 0.64f, -0.64f, 0.64f, -1.68f, 0, -2.32f,
CLOSE,
MOVE_TO, 13, 3,
H_LINE_TO, 5,
R_V_LINE_TO, 1,
R_H_LINE_TO, 8,
V_LINE_TO, 3,
CLOSE
CANVAS_DIMENSIONS, 20,
MOVE_TO, 14, 1.01f,
LINE_TO, 6, 1,
R_CUBIC_TO, -1.1f, 0, -2, 0.9f, -2, 2,
R_V_LINE_TO, 14,
R_CUBIC_TO, 0, 1.1f, 0.9f, 2, 2, 2,
R_H_LINE_TO, 8,
R_CUBIC_TO, 1.1f, 0, 2, -0.9f, 2, -2,
V_LINE_TO, 3,
R_CUBIC_TO, 0, -1.1f, -0.9f, -1.99f, -2, -1.99f,
CLOSE,
MOVE_TO, 14, 17,
H_LINE_TO, 6,
R_V_LINE_TO, -1,
R_H_LINE_TO, 8,
R_V_LINE_TO, 1,
CLOSE,
R_MOVE_TO, 0, -3,
H_LINE_TO, 6,
V_LINE_TO, 6,
R_H_LINE_TO, 8,
R_V_LINE_TO, 8,
CLOSE,
MOVE_TO, 6, 4,
V_LINE_TO, 3,
R_H_LINE_TO, 8,
R_V_LINE_TO, 1,
H_LINE_TO, 6,
CLOSE
CANVAS_DIMENSIONS, 20,
MOVE_TO, 2, 2.09f,
LINE_TO, 17.56f, 17.64f,
R_LINE_TO, -1.41f, 1.41f,
LINE_TO, 13.09f, 16,
H_LINE_TO, 2,
R_V_LINE_TO, -2,
R_H_LINE_TO, 2,
V_LINE_TO, 9.5f,
R_CUBIC_TO, 0, -0.8f, 0.11f, -1.56f, 0.32f, -2.26f,
LINE_TO, 0.59f, 3.5f,
LINE_TO, 2, 2.09f,
CLOSE,
MOVE_TO, 12, 17,
R_CUBIC_TO, 0, 1.1f, -0.9f, 2, -2, 2,
R_CUBIC_TO, -1.05f, 0, -1.92f, -0.82f, -1.99f, -1.85f,
LINE_TO, 8, 17,
R_H_LINE_TO, 4,
CLOSE,
R_MOVE_TO, 6, -3,
R_V_LINE_TO, 1,
R_LINE_TO, -1, -1,
R_H_LINE_TO, 1,
CLOSE,
R_MOVE_TO, -9.88f, -2.97f,
LINE_TO, 6.03f, 8.94f,
CUBIC_TO, 6.01f, 9.12f, 6, 9.31f, 6, 9.5f,
V_LINE_TO, 14,
R_H_LINE_TO, 5.09f,
R_LINE_TO, -1, -1,
H_LINE_TO, 7.75f,
R_V_LINE_TO, -1.54f,
LINE_TO, 8.12f, 11.03f,
CLOSE,
MOVE_TO, 10, 1,
R_CUBIC_TO, 0.83f, 0, 1.5f, 0.67f, 1.5f, 1.5f,
R_V_LINE_TO, 0.68f,
R_CUBIC_TO, 2.87f, 0.68f, 4.5f, 3.25f, 4.5f, 6.32f,
V_LINE_TO, 13,
R_LINE_TO, -2, -2,
V_LINE_TO, 9.5f,
CUBIC_TO, 14, 7.02f, 12.49f, 5, 10, 5,
R_CUBIC_TO, -0.61f, 0, -1.17f, 0.12f, -1.65f, 0.34f,
R_LINE_TO, -1.49f, -1.49f,
CUBIC_TO, 7.34f, 3.55f, 7.89f, 3.32f, 8.5f, 3.18f,
V_LINE_TO, 2.5f,
R_CUBIC_TO, 0, -0.83f, 0.67f, -1.5f, 1.5f, -1.5f,
CLOSE,
R_MOVE_TO, 2.75f, 6,
R_V_LINE_TO, 1.54f,
LINE_TO, 12.19f, 9.19f,
LINE_TO, 10, 7,
R_H_LINE_TO, 2.75f,
CLOSE
CANVAS_DIMENSIONS, 20,
MOVE_TO, 7.75f, 7,
R_H_LINE_TO, 5,
R_V_LINE_TO, 1.54f,
R_LINE_TO, -2.5f, 2.91f,
R_H_LINE_TO, 2.5f,
V_LINE_TO, 13,
R_H_LINE_TO, -5,
R_V_LINE_TO, -1.54f,
R_LINE_TO, 2.5f, -2.91f,
R_H_LINE_TO, -2.5f,
V_LINE_TO, 7,
CLOSE,
MOVE_TO, 18, 14,
R_V_LINE_TO, 2,
H_LINE_TO, 2,
R_V_LINE_TO, -2,
R_H_LINE_TO, 2,
V_LINE_TO, 9.5f,
R_CUBIC_TO, 0, -3.08f, 1.64f, -5.64f, 4.5f, -6.32f,
V_LINE_TO, 2.5f,
R_CUBIC_TO, 0, -0.83f, 0.67f, -1.5f, 1.5f, -1.5f,
R_CUBIC_TO, 0.83f, 0, 1.5f, 0.67f, 1.5f, 1.5f,
R_V_LINE_TO, 0.68f,
R_CUBIC_TO, 2.87f, 0.68f, 4.5f, 3.25f, 4.5f, 6.32f,
V_LINE_TO, 14,
R_H_LINE_TO, 2,
CLOSE,
R_MOVE_TO, -4, -4.5f,
CUBIC_TO, 14, 7.02f, 12.49f, 5, 10, 5,
CUBIC_TO_SHORTHAND, 6, 7.02f, 6, 9.5f,
V_LINE_TO, 14,
R_H_LINE_TO, 8,
V_LINE_TO, 9.5f,
CLOSE,
MOVE_TO, 10, 19,
R_CUBIC_TO, 1.1f, 0, 2, -0.9f, 2, -2,
H_LINE_TO, 8,
R_CUBIC_TO, 0, 1.1f, 0.9f, 2, 2, 2,
CLOSE
......@@ -27,7 +27,8 @@ EnableHotspotQuickActionController::~EnableHotspotQuickActionController() {
QuickActionItem* EnableHotspotQuickActionController::CreateItem() {
DCHECK(!item_);
item_ = new QuickActionItem(this, IDS_ASH_PHONE_HUB_ENABLE_HOTSPOT_TITLE,
kSystemMenuPhoneIcon);
kPhoneHubEnableHotspotOnIcon,
kPhoneHubEnableHotspotOffIcon);
// When the UI has just opened, scan to see if there is a connection
// available.
if (tether_controller_->GetStatus() == Status::kConnectionUnavailable)
......
......@@ -43,7 +43,8 @@ LocatePhoneQuickActionController::~LocatePhoneQuickActionController() {
QuickActionItem* LocatePhoneQuickActionController::CreateItem() {
DCHECK(!item_);
item_ = new QuickActionItem(this, IDS_ASH_PHONE_HUB_LOCATE_PHONE_TITLE,
kSystemMenuPhoneIcon);
kPhoneHubLocatePhoneOnIcon,
kPhoneHubLocatePhoneOffIcon);
OnPhoneRingingStateChanged();
return item_;
}
......
......@@ -49,12 +49,11 @@ PhoneHubTray::PhoneHubTray(Shelf* shelf)
: TrayBackgroundView(shelf), ui_controller_(new PhoneHubUiController()) {
observed_phone_hub_ui_controller_.Add(ui_controller_.get());
// TODO(tengs): Update icon to spec.
auto icon = std::make_unique<views::ImageView>();
icon->SetTooltipText(
l10n_util::GetStringUTF16(IDS_ASH_PHONE_HUB_TRAY_ACCESSIBLE_NAME));
icon->SetImage(CreateVectorIcon(
kSystemMenuPhoneIcon,
kPhoneHubPhoneIcon,
AshColorProvider::Get()->GetContentLayerColor(
AshColorProvider::ContentLayerType::kIconColorPrimary)));
......
......@@ -47,7 +47,8 @@ bool SilencePhoneQuickActionController::IsItemEnabled() {
QuickActionItem* SilencePhoneQuickActionController::CreateItem() {
DCHECK(!item_);
item_ = new QuickActionItem(this, IDS_ASH_PHONE_HUB_SILENCE_PHONE_TITLE,
kSystemMenuPhoneIcon);
kPhoneHubSilencePhoneOnIcon,
kPhoneHubSilencePhoneOffIcon);
OnDndStateChanged();
return item_;
}
......
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