Network Config WebUI: Support cellular initializing and scanning

Bug: 816864
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ia0c8b5c098bfb649175f1f87e5895f85dad98cb0
Reviewed-on: https://chromium-review.googlesource.com/947043
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541457}

chrome/browser/resources/chromeos/login/oobe_welcome.js

@@ -126,6 +126,8 @@ Polymer({
           loadTimeData.getString('networkListItemConnectingTo'),
       networkListItemInitializing:
           loadTimeData.getString('networkListItemInitializing'),
+      networkListItemScanning:
+          loadTimeData.getString('networkListItemScanning'),
       networkListItemNotConnected:
           loadTimeData.getString('networkListItemNotConnected'),
       networkListItemNoNetwork:

chrome/browser/resources/chromeos/network_ui/network_ui.js

@@ -25,6 +25,7 @@ var NetworkUI = (function() {
         loadTimeData.getString('networkListItemConnectingTo'),
     networkListItemInitializing:
         loadTimeData.getString('networkListItemInitializing'),
+    networkListItemScanning: loadTimeData.getString('networkListItemScanning'),
     networkListItemNotConnected:
         loadTimeData.getString('networkListItemNotConnected'),
     networkListItemNoNetwork:

chrome/browser/resources/settings/internet_page/network_summary_item.js

@@ -68,10 +68,9 @@ Polymer({
    * @private
    */
   getNetworkStateText_: function(activeNetworkState, deviceState) {
-    const state = activeNetworkState.ConnectionState;
-    const name = CrOnc.getNetworkName(activeNetworkState);
-    if (state)
-      return this.getConnectionStateText_(state, name);
+    const stateText = this.getConnectionStateText_(activeNetworkState);
+    if (stateText)
+      return stateText;
     // No network state, use device state.
     if (deviceState) {
       // Type specific scanning or initialization states.
@@ -98,12 +97,15 @@ Polymer({
   },
 
   /**
-   * @param {CrOnc.ConnectionState} state
-   * @param {string} name
+   * @param {!CrOnc.NetworkStateProperties} networkState
    * @return {string}
    * @private
    */
-  getConnectionStateText_: function(state, name) {
+  getConnectionStateText_: function(networkState) {
+    const state = networkState.ConnectionState;
+    if (!state)
+      return '';
+    const name = CrOnc.getNetworkName(networkState);
     switch (state) {
       case CrOnc.ConnectionState.CONNECTED:
         return name;
@@ -112,6 +114,10 @@ Polymer({
           return CrOncStrings.networkListItemConnectingTo.replace('$1', name);
         return CrOncStrings.networkListItemConnecting;
       case CrOnc.ConnectionState.NOT_CONNECTED:
+        if (networkState.Type == CrOnc.Type.CELLULAR && networkState.Cellular &&
+            networkState.Cellular.Scanning) {
+          return this.i18n('internetMobileSearching');
+        }
         return CrOncStrings.networkListItemNotConnected;
     }
     assertNotReached();

chrome/browser/resources/settings/settings_ui/settings_ui.js

@@ -120,6 +120,8 @@ Polymer({
           loadTimeData.getString('networkListItemConnectingTo'),
       networkListItemInitializing:
           loadTimeData.getString('networkListItemInitializing'),
+      networkListItemScanning:
+          loadTimeData.getString('networkListItemScanning'),
       networkListItemNotConnected:
           loadTimeData.getString('networkListItemNotConnected'),
       networkListItemNoNetwork:

chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.cc

@@ -32,6 +32,7 @@ struct {
     {"networkListItemConnecting", IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING},
     {"networkListItemConnectingTo", IDS_NETWORK_LIST_CONNECTING_TO},
     {"networkListItemInitializing", IDS_NETWORK_LIST_INITIALIZING},
+    {"networkListItemScanning", IDS_SETTINGS_INTERNET_MOBILE_SEARCH},
     {"networkListItemNotConnected", IDS_NETWORK_LIST_NOT_CONNECTED},
     {"networkListItemNoNetwork", IDS_NETWORK_LIST_NO_NETWORK},
     {"vpnNameTemplate", IDS_NETWORK_LIST_THIRD_PARTY_VPN_NAME_TEMPLATE},

chrome/test/data/extensions/api_test/networking_private/alias/test.js

@@ -44,7 +44,12 @@ chrome.test.runTests([
                 ModelID:"test_model_id",
                 NetworkTechnology: 'GSM',
                 RoamingState: 'Home',
-                SIMLockStatus: {LockEnabled: true, LockType: '', RetriesLeft: 3}
+                SIMLockStatus: {
+                  LockEnabled: true,
+                  LockType: '',
+                  RetriesLeft: 3,
+                },
+                Scanning: false,
               },
               ConnectionState: 'NotConnected',
               GUID: 'stub_cellular1_guid',

chrome/test/data/extensions/api_test/networking_private/chromeos/test.js

@@ -592,7 +592,8 @@ var availableTests = [
             ModelID:"test_model_id",
             NetworkTechnology: 'GSM',
             RoamingState: 'Home',
-            SIMLockStatus: {LockEnabled: true, LockType: '', RetriesLeft: 3}
+            SIMLockStatus: {LockEnabled: true, LockType: '', RetriesLeft: 3},
+            Scanning: false,
           },
           ConnectionState: ConnectionStateType.NOT_CONNECTED,
           GUID: kCellularGuid,
@@ -624,6 +625,7 @@ var availableTests = [
             MIN: "test_min",
             ModelID:"test_model_id",
             SIMLockStatus: {LockEnabled: true, LockType: '', RetriesLeft: 3},
+            Scanning: false,
             SignalStrength: 0,
           },
           Connectable: false,

chromeos/network/network_util.cc

@@ -165,18 +165,19 @@ std::unique_ptr<base::DictionaryValue> TranslateNetworkStateToONC(
 
   // Get any Device properties required to translate state.
   if (NetworkTypePattern::Cellular().MatchesType(network->type())) {
-    // We need to set Device[Cellular.ProviderRequiresRoaming] so that
-    // Cellular[RoamingState] can be set correctly for badging network icons.
     const DeviceState* device =
         NetworkHandler::Get()->network_state_handler()->GetDeviceState(
             network->device_path());
     if (device) {
-      std::unique_ptr<base::DictionaryValue> device_dict(
-          new base::DictionaryValue);
-      device_dict->SetKey(shill::kProviderRequiresRoamingProperty,
-                          base::Value(device->provider_requires_roaming()));
-      shill_dictionary->SetWithoutPathExpansion(shill::kDeviceProperty,
-                                                std::move(device_dict));
+      base::DictionaryValue device_dict;
+      // We need to set Device.Cellular.ProviderRequiresRoaming so that
+      // Cellular.RoamingState can be set correctly for badging network icons.
+      device_dict.SetKey(shill::kProviderRequiresRoamingProperty,
+                         base::Value(device->provider_requires_roaming()));
+      // Scanning is also used in the UI when displaying a list of networks.
+      device_dict.SetKey(shill::kScanningProperty,
+                         base::Value(device->scanning()));
+      shill_dictionary->SetKey(shill::kDeviceProperty, std::move(device_dict));
     }
   }
 

chromeos/network/onc/onc_translator_shill_to_onc.cc

@@ -436,6 +436,7 @@ void ShillToONCTranslator::TranslateCellularWithState() {
 
   const base::DictionaryValue* device_dictionary = NULL;
   bool requires_roaming = false;
+  bool scanning = false;
   shill_dictionary_->GetDictionaryWithoutPathExpansion(shill::kDeviceProperty,
                                                        &device_dictionary);
   if (device_dictionary) {
@@ -448,9 +449,11 @@ void ShillToONCTranslator::TranslateCellularWithState() {
         nested_translator.CreateTranslatedONCObject();
     onc_object_->MergeDictionary(nested_object.get());
 
-    /// Get the requires_roaming from the Device dictionary.
+    /// Get requires_roaming and scanning from the Device dictionary.
     device_dictionary->GetBooleanWithoutPathExpansion(
         shill::kProviderRequiresRoamingProperty, &requires_roaming);
+    device_dictionary->GetBooleanWithoutPathExpansion(shill::kScanningProperty,
+                                                      &scanning);
   }
   if (requires_roaming) {
     onc_object_->SetKey(::onc::cellular::kRoamingState,
@@ -459,6 +462,7 @@ void ShillToONCTranslator::TranslateCellularWithState() {
     TranslateWithTableAndSet(shill::kRoamingStateProperty, kRoamingStateTable,
                              ::onc::cellular::kRoamingState);
   }
+  onc_object_->SetKey(::onc::cellular::kScanning, base::Value(scanning));
 }
 
 void ShillToONCTranslator::TranslateCellularDevice() {

chromeos/test/data/network/translation_of_shill_cellular_with_state.onc

@@ -53,7 +53,8 @@
     "SIMLockStatus": {
       "LockType": "sim-pin",
       "LockEnabled": true
-    }
+    },
+    "Scanning": false
   },
   "Source":"Device"
 }

extensions/browser/api/networking_private/networking_private_chromeos_unittest.cc

@@ -1093,6 +1093,7 @@ TEST_F(NetworkingPrivateApiTest, GetCellularProperties) {
                    .Set("ModelID", "test_model_id")
                    .Set("NetworkTechnology", "GSM")
                    .Set("RoamingState", "Home")
+                   .SetBoolean("Scanning", false)
                    .Build())
           .Set("ConnectionState", "Connected")
           .Set("GUID", "cellular_guid")
@@ -1146,6 +1147,7 @@ TEST_F(NetworkingPrivateApiTest, GetCellularPropertiesFromWebUi) {
                    .Set("MIN", "test_min")
                    .Set("NetworkTechnology", "GSM")
                    .Set("RoamingState", "Home")
+                   .SetBoolean("Scanning", false)
                    .Set("APNList", ListBuilder()
                                        .Append(expected_apn->CreateDeepCopy())
                                        .Build())

extensions/common/api/networking_private.idl

@@ -580,6 +580,7 @@ namespace networkingPrivate {
     ActivationStateType? ActivationState;
     DOMString? NetworkTechnology;
     DOMString? RoamingState;
+    boolean? Scanning;
     boolean? SIMPresent;
     long? SignalStrength;
   };

third_party/closure_compiler/externs/networking_private.js

@@ -748,6 +748,7 @@ chrome.networkingPrivate.ManagedCellularProperties;
  *   ActivationState: (!chrome.networkingPrivate.ActivationStateType|undefined),
  *   NetworkTechnology: (string|undefined),
  *   RoamingState: (string|undefined),
+ *   Scanning: (boolean|undefined),
  *   SIMPresent: (boolean|undefined),
  *   SignalStrength: (number|undefined)
  * }}

ui/webui/resources/cr_elements/chromeos/network/cr_network_list_item.js

@@ -103,9 +103,7 @@ Polymer({
    * @private
    */
   isStateTextVisible_: function() {
-    return !!this.networkState &&
-        (this.networkState.ConnectionState !=
-         CrOnc.ConnectionState.NOT_CONNECTED);
+    return !!this.networkState && !!this.getNetworkStateText_();
   },
 
   /**
@@ -114,16 +112,20 @@ Polymer({
    * @private
    */
   getNetworkStateText_: function() {
-    if (!this.isStateTextVisible_())
+    if (!this.networkState)
       return '';
-    var state = this.networkState.ConnectionState;
-    // For Cellular, an empty ConnectionState indicates that the device is
-    // still initializing.
-    if (!state && this.networkState.Type == CrOnc.Type.CELLULAR)
-      return CrOncStrings.networkListItemInitializing;
-    if (state == CrOnc.ConnectionState.CONNECTED)
+    var connectionState = this.networkState.ConnectionState;
+    if (this.networkState.Type == CrOnc.Type.CELLULAR) {
+      // For Cellular, an empty ConnectionState indicates that the device is
+      // still initializing.
+      if (!connectionState)
+        return CrOncStrings.networkListItemInitializing;
+      if (this.networkState.Cellular && this.networkState.Cellular.Scanning)
+        return CrOncStrings.networkListItemScanning;
+    }
+    if (connectionState == CrOnc.ConnectionState.CONNECTED)
       return CrOncStrings.networkListItemConnected;
-    if (state == CrOnc.ConnectionState.CONNECTING)
+    if (connectionState == CrOnc.ConnectionState.CONNECTING)
       return CrOncStrings.networkListItemConnecting;
     return '';
   },

ui/webui/resources/cr_elements/chromeos/network/cr_network_select.js

@@ -149,6 +149,8 @@ Polymer({
     this.cellularDeviceState_ = deviceStates.find(function(device) {
       return device.Type == CrOnc.Type.CELLULAR;
     });
+    if (this.cellularDeviceState_)
+      this.ensureCellularNetwork_(networkStates);
     this.networkStateList_ = networkStates;
     var defaultNetwork;
     if (networkStates.length > 0) {
@@ -176,6 +178,30 @@ Polymer({
     this.fire('default-network-changed', defaultNetwork);
   },
 
+  /**
+   * Modifies |networkStates| to include a cellular network if none exists.
+   * @param {!Array<!CrOnc.NetworkStateProperties>} networkStates
+   * @private
+   */
+  ensureCellularNetwork_: function(networkStates) {
+    if (networkStates.find(function(network) {
+          return network.Type == CrOnc.Type.CELLULAR;
+        })) {
+      return;
+    }
+    // Add a Cellular network after the Ethernet network if it exists.
+    var idx = networkStates.length > 0 &&
+            networkStates[0].Type == CrOnc.Type.ETHERNET ?
+        1 :
+        0;
+    var cellular = {
+      GUID: '',
+      Type: CrOnc.Type.CELLULAR,
+      Cellular: {Scanning: this.cellularDeviceState_.Scanning}
+    };
+    networkStates.splice(idx, 0, cellular);
+  },
+
   /**
    * Event triggered when a cr-network-list-item is selected.
    * @param {!{target: HTMLElement, detail: !CrOnc.NetworkStateProperties}} e

ui/webui/resources/cr_elements/chromeos/network/cr_onc_types.js

@@ -30,6 +30,7 @@
  *   networkListItemConnecting: string,
  *   networkListItemConnectingTo: string,
  *   networkListItemInitializing: string,
+ *   networkListItemScanning: string,
  *   networkListItemNotConnected: string,
  *   networkListItemNoNetwork: string,
  *   vpnNameTemplate: string,