[Cros Cellular] Add custom sublabel to quick settings cellular networks

- This CL adds a sub label to cellular networks which have not yet been
  activated to indicate the user can click and activate that network.
- Opens new cellular setup dialog when "click to activate" is clicked

Screenshot: https://screenshot.googleplex.com/3hmXeFo7gPQhcBZ.png

Bug: 1093185
Change-Id: I5f7df05123be56e97c74125313263ff50d0a0124
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2629989
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Azeem Arshad <azeemarshad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845388}

ash/ash_strings.grd

@@ -1526,6 +1526,9 @@ This file contains the strings for ash.
       <message name="IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTING" desc="The label used when a network connection is connecting. [CHAR_LIMIT=14]">
         Connecting...
       </message>
+      <message name="IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CLICK_TO_ACTIVATE" desc="The label used in quick settings to indicate an unactivated cellular network that can be clicked to launch activation through setup flow. [CHAR_LIMIT=14]">
+        Click to activate
+      </message>
       <message name="IDS_ASH_STATUS_TRAY_NETWORK_STATUS_SECURED" desc="a11y label used when a Wi-Fi network is secured. [CHAR_LIMIT=14]">
         Secured
       </message>

ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CLICK_TO_ACTIVATE.png.sha1

+7094d028d02bcb7f8b1827db6ebb162cb030f5dd
\ No newline at end of file

ash/public/cpp/system_tray_client.h

@@ -93,6 +93,9 @@ class ASH_PUBLIC_EXPORT SystemTrayClient {
   // (see onc_spec.md). TODO(stevenjb): Use NetworkType from onc.mojo (TBD).
   virtual void ShowNetworkCreate(const std::string& type) = 0;
 
+  // Opens the physical SIM cellular setup flow in OS Settings.
+  virtual void ShowSettingsCellularSetupPsimFlow() = 0;
+
   // Shows the "add network" UI to create a third-party extension-backed VPN
   // connection (e.g. Cisco AnyConnect).
   virtual void ShowThirdPartyVpnCreate(const std::string& extension_id) = 0;

ash/public/cpp/test/test_system_tray_client.cc

@@ -63,6 +63,8 @@ void TestSystemTrayClient::ShowNetworkConfigure(const std::string& network_id) {
 
 void TestSystemTrayClient::ShowNetworkCreate(const std::string& type) {}
 
+void TestSystemTrayClient::ShowSettingsCellularSetupPsimFlow() {}
+
 void TestSystemTrayClient::ShowThirdPartyVpnCreate(
     const std::string& extension_id) {}
 

ash/public/cpp/test/test_system_tray_client.h

@@ -43,6 +43,7 @@ class ASH_PUBLIC_EXPORT TestSystemTrayClient : public SystemTrayClient {
   void ShowEnterpriseInfo() override;
   void ShowNetworkConfigure(const std::string& network_id) override;
   void ShowNetworkCreate(const std::string& type) override;
+  void ShowSettingsCellularSetupPsimFlow() override;
   void ShowThirdPartyVpnCreate(const std::string& extension_id) override;
   void ShowArcVpnCreate(const std::string& app_id) override;
   void ShowNetworkSettings(const std::string& network_id) override;

ash/system/network/network_icon.cc

@@ -20,6 +20,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/numerics/ranges.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chromeos/constants/chromeos_features.h"
 #include "chromeos/services/network_config/public/cpp/cros_network_config_util.h"
 #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
 #include "components/onc/onc_constants.h"
@@ -559,6 +560,11 @@ base::string16 GetLabelForNetworkList(const NetworkStateProperties* network) {
     }
     if (activation_state == ActivationStateType::kNotActivated ||
         activation_state == ActivationStateType::kPartiallyActivated) {
+      if (base::FeatureList::IsEnabled(
+              chromeos::features::kUpdatedCellularActivationUi)) {
+        return base::UTF8ToUTF16(network->name);
+      }
+
       return l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_LIST_ACTIVATE,
           base::UTF8ToUTF16(network->name));

ash/system/network/network_info.cc

@@ -15,7 +15,9 @@ NetworkInfo::NetworkInfo(const std::string& guid)
       connection_state(
           chromeos::network_config::mojom::ConnectionStateType::kNotConnected),
       type(chromeos::network_config::mojom::NetworkType::kWiFi),
-      source(chromeos::network_config::mojom::OncSource::kNone) {}
+      source(chromeos::network_config::mojom::OncSource::kNone),
+      activation_state(
+          chromeos::network_config::mojom::ActivationStateType::kUnknown) {}
 
 NetworkInfo::~NetworkInfo() = default;
 
@@ -24,6 +26,7 @@ bool NetworkInfo::operator==(const NetworkInfo& other) const {
          tooltip == other.tooltip && image.BackedBySameObjectAs(other.image) &&
          type == other.type && disable == other.disable &&
          connection_state == other.connection_state && source == other.source &&
+         activation_state == other.activation_state &&
          battery_percentage == other.battery_percentage;
 }
 

ash/system/network/network_info.h

@@ -39,6 +39,9 @@ struct NetworkInfo {
   chromeos::network_config::mojom::ConnectionStateType connection_state;
   chromeos::network_config::mojom::NetworkType type;
   chromeos::network_config::mojom::OncSource source;
+  // Used by cellular networks, for other network types, activation_status is
+  // set to a default value of kUnknown.
+  chromeos::network_config::mojom::ActivationStateType activation_state;
   int battery_percentage = 0;
   int signal_strength = 0;
 };

ash/system/network/network_list_view.cc

@@ -27,6 +27,7 @@
 #include "ash/system/tray/tri_view.h"
 #include "base/i18n/number_formatting.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chromeos/constants/chromeos_features.h"
 #include "chromeos/services/network_config/public/cpp/cros_network_config_util.h"
 #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
 #include "components/device_event_log/device_event_log.h"
@@ -79,6 +80,13 @@ bool IsManagedByPolicy(const NetworkInfo& info) {
          info.source == OncSource::kUserPolicy;
 }
 
+bool ShouldShowActivateCellularNetwork(const NetworkInfo& info) {
+  return NetworkTypeMatchesType(info.type, NetworkType::kCellular) &&
+         info.activation_state == ActivationStateType::kNotActivated &&
+         base::FeatureList::IsEnabled(
+             chromeos::features::kUpdatedCellularActivationUi);
+}
+
 }  // namespace
 
 // NetworkListView:
@@ -142,6 +150,7 @@ void NetworkListView::OnGetNetworkStateList(
       case NetworkType::kCellular:
         activation_state =
             network->type_state->get_cellular()->activation_state;
+        info->activation_state = activation_state;
         // If cellular is not enabled, skip cellular networks with no service.
         if (model()->GetDeviceState(NetworkType::kCellular) !=
                 DeviceStateType::kEnabled &&
@@ -372,10 +381,15 @@ void NetworkListView::UpdateViewForNetwork(HoverHighlightView* view,
     network_image = info.image;
   }
   view->AddIconAndLabel(network_image, info.label);
-  if (StateIsConnected(info.connection_state))
+  if (ShouldShowActivateCellularNetwork(info)) {
+    SetupUnactivatedCellularNetworkListItem(
+        view, l10n_util::GetStringUTF16(
+                  IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CLICK_TO_ACTIVATE));
+  } else if (StateIsConnected(info.connection_state)) {
     SetupConnectedScrollListItem(view);
-  else if (info.connection_state == ConnectionStateType::kConnecting)
+  } else if (info.connection_state == ConnectionStateType::kConnecting) {
     SetupConnectingScrollListItem(view);
+  }
   view->SetTooltipText(info.tooltip);
 
   // Add an additional icon to the right of the label for networks
@@ -398,6 +412,17 @@ void NetworkListView::UpdateViewForNetwork(HoverHighlightView* view,
   needs_relayout_ = true;
 }
 
+void NetworkListView::SetupUnactivatedCellularNetworkListItem(
+    HoverHighlightView* view,
+    const base::string16& sub_text) {
+  DCHECK(view->is_populated());
+
+  view->SetSubText(sub_text);
+  view->sub_text_label()->SetEnabledColor(
+      AshColorProvider::Get()->GetContentLayerColor(
+          AshColorProvider::ContentLayerType::kTextColorWarning));
+}
+
 base::string16 NetworkListView::GenerateAccessibilityLabel(
     const NetworkInfo& info) {
   if (CanNetworkConnect(info.connection_state, info.type, info.connectable)) {
@@ -461,6 +486,12 @@ base::string16 NetworkListView::GenerateAccessibilityDescription(
           base::FormatPercent(info.signal_strength));
     }
     case NetworkType::kCellular:
+      if (info.activation_state == ActivationStateType::kNotActivated &&
+          base::FeatureList::IsEnabled(
+              chromeos::features::kUpdatedCellularActivationUi)) {
+        return l10n_util::GetStringUTF16(
+            IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CLICK_TO_ACTIVATE);
+      }
       if (!connection_status.empty()) {
         if (IsManagedByPolicy(info)) {
           return l10n_util::GetStringFUTF16(

ash/system/network/network_list_view.h

@@ -83,6 +83,12 @@ class NetworkListView : public NetworkStateListDetailedView,
   // not managed by policy.
   views::View* CreatePolicyView(const NetworkInfo& info);
 
+  // Adds a custom sub label using |sub_text| to the |view| with warning color
+  // and updates accessibility label. Used when cellular network is not
+  // activiated.
+  void SetupUnactivatedCellularNetworkListItem(HoverHighlightView* view,
+                                               const base::string16& sub_text);
+
   // Adds or updates child views representing the network connections when
   // |is_wifi| is matching the attribute of a network connection starting at
   // |child_index|. Returns a set of guids for the added network

chrome/browser/ui/ash/system_tray_client.cc

@@ -114,6 +114,19 @@ bool IsArcVpn(const std::string& network_id) {
          network_state->GetVpnProviderType() == shill::kProviderArcVpn;
 }
 
+bool ShouldOpenCellularSetupPsimFlowOnClick(const std::string& network_id) {
+  // |kActivationStateNotActivated| is only set in physical SIM networks,
+  // checking a networks activation state is |kActivationStateNotActivated|
+  // ensures the current network is a phyical SIM network.
+
+  const chromeos::NetworkState* network_state = GetNetworkState(network_id);
+  return network_state && network_state->type() == shill::kTypeCellular &&
+         network_state->activation_state() ==
+             shill::kActivationStateNotActivated &&
+         base::FeatureList::IsEnabled(
+             chromeos::features::kUpdatedCellularActivationUi);
+}
+
 }  // namespace
 
 SystemTrayClient::SystemTrayClient()
@@ -371,11 +384,6 @@ void SystemTrayClient::ShowNetworkConfigure(const std::string& network_id) {
 
 void SystemTrayClient::ShowNetworkCreate(const std::string& type) {
   if (type == ::onc::network_type::kCellular) {
-    if (base::FeatureList::IsEnabled(
-            chromeos::features::kUpdatedCellularActivationUi)) {
-      ShowSettingsCellularSetupFlow();
-      return;
-    }
     const chromeos::NetworkState* cellular =
         chromeos::NetworkHandler::Get()
             ->network_state_handler()
@@ -388,10 +396,11 @@ void SystemTrayClient::ShowNetworkCreate(const std::string& type) {
   chromeos::InternetConfigDialog::ShowDialogForNetworkType(type);
 }
 
-void SystemTrayClient::ShowSettingsCellularSetupFlow() {
+void SystemTrayClient::ShowSettingsCellularSetupPsimFlow() {
   // TODO(crbug.com/1093185) Add metrics action recorder
   std::string page = chromeos::settings::mojom::kCellularNetworksSubpagePath;
   page += "&showCellularSetup=true";
+  page += "&showPsimFlow=true";
   ShowSettingsSubPageForActiveUser(page);
 }
 
@@ -445,6 +454,15 @@ void SystemTrayClient::ShowNetworkSettingsHelper(const std::string& network_id,
     return;
   }
 
+  if (ShouldOpenCellularSetupPsimFlowOnClick(network_id)) {
+    // Special case: Clicking on "click to activate" on a psim network item
+    // should open cellular setup dialogs' psim flow if the device has
+    // |kUpdatedCellularActivationUi| feature enabled and is a non-activated
+    // cellular network
+    ShowSettingsCellularSetupPsimFlow();
+    return;
+  }
+
   std::string page = chromeos::settings::mojom::kNetworkSectionPath;
   const chromeos::NetworkState* network_state = GetNetworkState(network_id);
   if (!network_id.empty() && network_state) {

chrome/browser/ui/ash/system_tray_client.h

@@ -75,6 +75,7 @@ class SystemTrayClient : public ash::SystemTrayClient,
   void ShowEnterpriseInfo() override;
   void ShowNetworkConfigure(const std::string& network_id) override;
   void ShowNetworkCreate(const std::string& type) override;
+  void ShowSettingsCellularSetupPsimFlow() override;
   void ShowThirdPartyVpnCreate(const std::string& extension_id) override;
   void ShowArcVpnCreate(const std::string& app_id) override;
   void ShowNetworkSettings(const std::string& network_id) override;
@@ -83,8 +84,6 @@ class SystemTrayClient : public ash::SystemTrayClient,
   void SetLocaleAndExit(const std::string& locale_iso_code) override;
 
  private:
-  // Opens cellular setup dialog in os settings
-  void ShowSettingsCellularSetupFlow();
 
   // Helper function shared by ShowNetworkSettings() and ShowNetworkConfigure().
   void ShowNetworkSettingsHelper(const std::string& network_id,

chrome/browser/ui/webui/chromeos/cellular_setup/cellular_setup_dialog_launcher.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/webui/chromeos/cellular_setup/cellular_setup_dialog_launcher.h"
 
 #include "base/feature_list.h"
-#include "chrome/browser/ui/webui/chromeos/cellular_setup/cellular_setup_dialog.h"
+#include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_dialog.h"
 #include "chromeos/constants/chromeos_features.h"
 
@@ -16,7 +16,7 @@ namespace cellular_setup {
 void OpenCellularSetupDialog(const std::string& cellular_network_guid) {
   if (base::FeatureList::IsEnabled(
           chromeos::features::kUpdatedCellularActivationUi)) {
-    CellularSetupDialog::ShowDialog(cellular_network_guid);
+    SystemTrayClient::Get()->ShowSettingsCellularSetupPsimFlow();
   } else {
     MobileSetupDialog::ShowByNetworkId(cellular_network_guid);
   }