Add a battery icon to the right of Tether networks in system tray.

ash/system/network/network_list.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/network/network_list.h"
 
 #include <memory>
 
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/network_icon.h"
 #include "ash/system/network/network_icon_animation.h"
 #include "ash/system/network/network_info.h"
 #include "ash/system/network/network_state_list_detailed_view.h"
 #include "ash/system/networking_config_delegate.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
+#include "base/i18n/number_formatting.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/proxy/ui_proxy_config_service.h"
 #include "components/device_event_log/device_event_log.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/toggle_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
@@ skipping 522 matching lines @@
 
 void NetworkListView::UpdateViewForNetwork(HoverHighlightView* view,
                                            const NetworkInfo& info) {
   view->Reset();
   view->AddIconAndLabel(info.image, info.label);
   if (info.connected)
     SetupConnectedScrollListItem(view);
   else if (info.connecting)
     SetupConnectingScrollListItem(view);
   view->SetTooltipText(info.tooltip);
-  views::View* controlled_icon = CreateControlledByExtensionView(info);
-  if (controlled_icon)
-    view->AddRightView(controlled_icon);
+
+  // Add an additional icon to the right of the label for networks
+  // that require it (e.g. Tether, controlled by extension).
+  views::View* power_icon = CreatePowerStatusView(info);
+  if (power_icon) {
+    view->AddRightView(power_icon);
+  } else {
+    views::View* controlled_icon = CreateControlledByExtensionView(info);
+    if (controlled_icon)
+      view->AddRightView(controlled_icon);
+  }
+}
+
+views::View* NetworkListView::CreatePowerStatusView(const NetworkInfo& info) {
+  // Mobile can be Cellular or Tether.
+  if (info.type != NetworkInfo::Type::MOBILE)
+    return nullptr;
+
+  const chromeos::NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
+          info.guid);
+
+  // Only return a battery icon for Tether network type.
+  if (!NetworkTypePattern::Tether().MatchesType(network->type()))
+    return nullptr;
+
+  views::ImageView* icon = TrayPopupUtils::CreateMoreImageView();
+  gfx::Size canvas_size = gfx::Size(kMenuIconSize, kMenuIconSize);

[Evan Stade, 2017/06/14 18:04:38]

Hi all,

I am making some changes to the battery icon so I noticed this CL. There are a
couple things I see to keep in mind for the future. The first is that this is
using an icon at a size that it's not designed for. It's subtle but you can tell
the icon should only be displayed at 16dip because that's what the 1x.icon file
specifies. (I'm working on adding a DCHECK for this but can't do so until errant
callsites are cleaned up.) Displaying at any other size won't have guaranteed
sharp lines: in this case, if you zoom in you can see that it's a bit blurrier
than we'd like. The second observation is that this copies a lot of code from
PowerStatus, which should instead be shared. The final observation is that
assuming a 1x scale and using CreateFrom1xBitmap is not appropriate as the icon
for non-1x scales is slightly different.

I will fold these suggestions into my change but I wanted to share them here for
future reference. Thanks and sorry for the late notice.

[Kyle Horimoto, 2017/06/15 20:14:23]

Thanks for the heads-up, Evan! Just wanted to clarify - you'll be fixing this
issue in a follow-up CL (so we don't have to submit a change ourselves), right?

Please CC us on your change so we can see the correct way to use these icons -
thank you! :)

+  gfx::Canvas canvas(canvas_size, 1.0f, false /* opaque */);
+
+  // Paint the battery's base (background) color.
+  PaintVectorIcon(&canvas, kSystemTrayBatteryIcon, kMenuIconSize,
+                  kMenuIconColorDisabled);
+  // Paint the charged portion of the battery.
+  const int charge_height = network->battery_percentage() * kMenuIconSize / 100;
+  gfx::Rect clip_rect(0, kMenuIconSize - charge_height, kMenuIconSize,
+                      charge_height);
+  canvas.Save();
+  canvas.ClipRect(clip_rect);
+  PaintVectorIcon(&canvas, kSystemTrayBatteryIcon, kMenuIconSize,
+                  kMenuIconColor);
+  canvas.Restore();
+
+  // Show the battery icon with correct charge height.
+  icon->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(canvas.GetBitmap()));
+  // Show the numeric battery percentage on hover.
+  icon->SetTooltipText(base::FormatPercent(network->battery_percentage()));
+
+  return icon;
 }
 
 views::View* NetworkListView::CreateControlledByExtensionView(
     const NetworkInfo& info) {
   NetworkingConfigDelegate* networking_config_delegate =
       Shell::Get()->system_tray_delegate()->GetNetworkingConfigDelegate();
   if (!networking_config_delegate)
     return nullptr;
   std::unique_ptr<const NetworkingConfigDelegate::ExtensionInfo>
       extension_info =
@@ skipping 145 matching lines @@
       TriView::Container::CENTER, views::CreateEmptyBorder(gfx::Insets(
                                       0, 0, 0, kTrayPopupLabelRightPadding)));
 
   // Nothing to the right of the text.
   connection_warning->SetContainerVisible(TriView::Container::END, false);
   return connection_warning;
 }
 
 }  // namespace tray
 }  // namespace ash