Revert "cros: Update battery icons for DarkLightMode"

This reverts commit 76e0b95.

Reason for revert: Does not look good on phone hub. Needs investigation.

Original change's description:
> cros: Update battery icons for DarkLightMode
>
> The battery badge icon should have a masked outline. Also
> the battery badge should be the same color as the rest of
> the battery (unless there is a special condition like alert).
>
> Bug: 1319985
> Change-Id: Ib125c3e02120c07f725ec10bc1a7a7864a72dbd4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3639984
> Reviewed-by: Andre Le <leandre@chromium.org>
> Commit-Queue: Alex Newcomer <newcomer@chromium.org>
> Reviewed-by: James Cook <jamescook@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1002297}

Bug: 1319985
Change-Id: I3dc8d2534fe17b91129bca7201e66b60a2963909
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3642671
Reviewed-by: James Cook <jamescook@chromium.org>
Auto-Submit: Alex Newcomer <newcomer@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1002324}

ash/resources/vector_icons/BUILD.gn

@@ -224,7 +224,6 @@ aggregate_vector_icons("ash_vector_icons") {
     "persistent_desks_bar_visible.icon",
     "phone_hub_battery_saver.icon",
     "phone_hub_battery_saver_outline.icon",
-    "phone_hub_battery_saver_outline_mask.icon",
     "phone_hub_camera_roll_item_video.icon",
     "phone_hub_camera_roll_menu_download.icon",
     "phone_hub_default_favicon.icon",
@@ -420,16 +419,12 @@ aggregate_vector_icons("ash_vector_icons") {
     "unified_menu_accessibility.icon",
     "unified_menu_battery_alert.icon",
     "unified_menu_battery_alert_outline.icon",
-    "unified_menu_battery_alert_outline_mask.icon",
     "unified_menu_battery_bolt.icon",
     "unified_menu_battery_bolt_outline.icon",
-    "unified_menu_battery_bolt_outline_mask.icon",
     "unified_menu_battery_unreliable.icon",
     "unified_menu_battery_unreliable_outline.icon",
-    "unified_menu_battery_unreliable_outline_mask.icon",
     "unified_menu_battery_x.icon",
     "unified_menu_battery_x_outline.icon",
-    "unified_menu_battery_x_outline_mask.icon",
     "unified_menu_bluetooth.icon",
     "unified_menu_bluetooth_connected.icon",
     "unified_menu_bluetooth_connected_legacy.icon",

ash/system/palette/stylus_battery_delegate.cc

@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "ash/constants/ash_features.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
@@ -52,11 +51,7 @@ gfx::ImageSkia StylusBatteryDelegate::GetBatteryImage() const {
 
   if (IsBatteryCharging()) {
     info.icon_badge = &kUnifiedMenuBatteryBoltIcon;
-    if (features::IsDarkLightModeEnabled()) {
-      info.badge_outline = &kUnifiedMenuBatteryBoltOutlineMaskIcon;
-    } else {
-      info.badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon;
-    }
+    info.badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon;
   }
 
   const SkColor icon_fg_color = GetColorForBatteryLevel();

ash/system/phonehub/phone_status_view.cc

@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/network_icon_image_source.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/resources/vector_icons/vector_icons.h"
@@ -255,11 +254,7 @@ PowerStatus::BatteryImageInfo PhoneStatusView::CalculateBatteryInfo() {
 
   if (IsBatterySaverModeOn(phone_status)) {
     info.icon_badge = &kPhoneHubBatterySaverIcon;
-    if (features::IsDarkLightModeEnabled()) {
-      info.badge_outline = &kPhoneHubBatterySaverOutlineMaskIcon;
-    } else {
-      info.badge_outline = &kPhoneHubBatterySaverOutlineIcon;
-    }
+    info.badge_outline = &kPhoneHubBatterySaverOutlineIcon;
     return info;
   }
 
@@ -268,28 +263,16 @@ PowerStatus::BatteryImageInfo PhoneStatusView::CalculateBatteryInfo() {
       info.alert_if_low = true;
       if (info.charge_percent < PowerStatus::kCriticalBatteryChargePercentage) {
         info.icon_badge = &kUnifiedMenuBatteryAlertIcon;
-        if (features::IsDarkLightModeEnabled()) {
-          info.badge_outline = &kUnifiedMenuBatteryAlertOutlineMaskIcon;
-        } else {
-          info.badge_outline = &kUnifiedMenuBatteryAlertOutlineIcon;
-        }
+        info.badge_outline = &kUnifiedMenuBatteryAlertOutlineIcon;
       }
       break;
     case PhoneStatusModel::ChargingState::kChargingAc:
       info.icon_badge = &kUnifiedMenuBatteryBoltIcon;
-      if (features::IsDarkLightModeEnabled()) {
-        info.badge_outline = &kUnifiedMenuBatteryBoltOutlineMaskIcon;
-      } else {
-        info.badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon;
-      }
+      info.badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon;
       break;
     case PhoneStatusModel::ChargingState::kChargingUsb:
       info.icon_badge = &kUnifiedMenuBatteryUnreliableIcon;
-      if (features::IsDarkLightModeEnabled()) {
-        info.badge_outline = &kUnifiedMenuBatteryUnreliableOutlineMaskIcon;
-      } else {
-        info.badge_outline = &kUnifiedMenuBatteryUnreliableOutlineIcon;
-      }
+      info.badge_outline = &kUnifiedMenuBatteryUnreliableOutlineIcon;
       break;
   }
 

ash/system/power/battery_image_source.cc

@@ -4,7 +4,6 @@
 
 #include "ash/system/power/battery_image_source.h"
 
-#include "ash/constants/ash_features.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/style/ash_color_provider.h"
 #include "base/cxx17_backports.h"
@@ -100,27 +99,15 @@ void BatteryImageSource::Draw(gfx::Canvas* canvas) {
   canvas->Restore();
 
   if (info_.badge_outline) {
-    if (ash::features::IsDarkLightModeEnabled()) {
-      // The outline is always a vector icon with PATH_MODE_CLEAR. This means it
-      // masks out anything previously drawn to the canvas. Give it any opaque
-      // color so it will properly mask the rest of the battery icon.
-      PaintVectorIcon(canvas, *info_.badge_outline, size().height(),
-                      SK_ColorBLUE);
-    } else {
-      // The outline is a colored outline, so give it a color meant to be seen
-      // by the user.
-      const SkColor outline_color =
-          info_.charge_percent > 50 ? fg_color_ : bg_color_;
-      PaintVectorIcon(canvas, *info_.badge_outline, size().height(),
-                      outline_color);
-    }
+    const SkColor outline_color =
+        info_.charge_percent > 50 ? fg_color_ : bg_color_;
+    PaintVectorIcon(canvas, *info_.badge_outline, size().height(),
+                    outline_color);
   }
 
   // Paint the badge over top of the battery, if applicable.
   if (info_.icon_badge) {
-    const SkColor default_color =
-        ash::features::IsDarkLightModeEnabled() ? fg_color_ : badge_color_;
-    const SkColor badge_color = use_alert_color ? alert_color : default_color;
+    const SkColor badge_color = use_alert_color ? alert_color : badge_color_;
     PaintVectorIcon(canvas, *info_.icon_badge, size().height(), badge_color);
   }
 }