Add NetworkTechnology types to ONC

This also adds the network technology 1x badge to cr_network_icon

BUG=470282

Review URL: https://codereview.chromium.org/1033843003

Cr-Commit-Position: refs/heads/master@{#322409}

12 files changed, 69 insertions, 15 deletions

diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index 8c8fe99..a514527 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -167,7 +167,9 @@ const FieldTranslationEntry cellular_fields[] = {
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
     {::onc::vpn::kAutoConnect, shill::kAutoConnectProperty},
-    {::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty},
+    // This field is converted during translation, see onc_translator_*.
+    // { ::onc::cellular::kNetworkTechnology,
+    //   shill::kNetworkTechnologyProperty},
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty},
     {::onc::cellular::kSignalStrength, shill::kSignalStrengthProperty},
@@ -314,6 +316,20 @@ const StringTranslationEntry kActivationStateTable[] = {
      shill::kActivationStatePartiallyActivated},
     {NULL}};
 
+const StringTranslationEntry kNetworkTechnologyTable[] = {
+    {::onc::cellular::kTechnologyCdma1Xrtt, shill::kNetworkTechnology1Xrtt},
+    {::onc::cellular::kTechnologyGsm, shill::kNetworkTechnologyGsm},
+    {::onc::cellular::kTechnologyEdge, shill::kNetworkTechnologyEdge},
+    {::onc::cellular::kTechnologyEvdo, shill::kNetworkTechnologyEvdo},
+    {::onc::cellular::kTechnologyGprs, shill::kNetworkTechnologyGprs},
+    {::onc::cellular::kTechnologyHspa, shill::kNetworkTechnologyHspa},
+    {::onc::cellular::kTechnologyHspaPlus, shill::kNetworkTechnologyHspaPlus},
+    {::onc::cellular::kTechnologyLte, shill::kNetworkTechnologyLte},
+    {::onc::cellular::kTechnologyLteAdvanced,
+     shill::kNetworkTechnologyLteAdvanced},
+    {::onc::cellular::kTechnologyUmts, shill::kNetworkTechnologyUmts},
+    {NULL}};
+
 const StringTranslationEntry kRoamingStateTable[] = {
     {::onc::cellular::kRoamingHome, shill::kRoamingStateHome},
     {::onc::cellular::kRoamingRoaming, shill::kRoamingStateRoaming},
diff --git a/chromeos/network/onc/onc_translation_tables.h b/chromeos/network/onc/onc_translation_tables.h
index b737542..058c4f2 100644
--- a/chromeos/network/onc/onc_translation_tables.h
+++ b/chromeos/network/onc/onc_translation_tables.h
@@ -33,6 +33,7 @@ CHROMEOS_EXPORT extern const StringTranslationEntry kEAPOuterTable[];
 CHROMEOS_EXPORT extern const StringTranslationEntry kEAP_PEAP_InnerTable[];
 CHROMEOS_EXPORT extern const StringTranslationEntry kEAP_TTLS_InnerTable[];
 CHROMEOS_EXPORT extern const StringTranslationEntry kActivationStateTable[];
+CHROMEOS_EXPORT extern const StringTranslationEntry kNetworkTechnologyTable[];
 CHROMEOS_EXPORT extern const StringTranslationEntry kRoamingStateTable[];
 
 // A separate translation table for cellular properties that are stored in a
diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
index 7b549d0..a97d51e 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -354,6 +354,9 @@ void ShillToONCTranslator::TranslateCellularWithState() {
   TranslateWithTableAndSet(shill::kActivationStateProperty,
                            kActivationStateTable,
                            ::onc::cellular::kActivationState);
+  TranslateWithTableAndSet(shill::kNetworkTechnologyProperty,
+                           kNetworkTechnologyTable,
+                           ::onc::cellular::kNetworkTechnology);
   const base::DictionaryValue* dictionary = NULL;
   if (shill_dictionary_->GetDictionaryWithoutPathExpansion(
           shill::kServingOperatorProperty, &dictionary)) {
diff --git a/chromeos/test/data/network/shill_cellular_with_state.json b/chromeos/test/data/network/shill_cellular_with_state.json
index 82e3fcb..149eeac 100644
--- a/chromeos/test/data/network/shill_cellular_with_state.json
+++ b/chromeos/test/data/network/shill_cellular_with_state.json
@@ -4,6 +4,7 @@
   "Name": "Test Network",
   "Cellular.ActivationState": "activated",
   "Cellular.ActivationType": "OTASP",
+  "Cellular.NetworkTechnology": "LTE Advanced",
   "Cellular.RoamingState": "home",
   "Cellular.ServingOperator": {
     "code": "test-code",
diff --git a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
index 71847b2..da0b0d87 100644
--- a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
+++ b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
@@ -11,6 +11,7 @@
       "Country": "us",
       "Name": "cellular_provider"
     },
+    "NetworkTechnology": "LTEAdvanced",
     "RoamingState": "Home",
     "ServingOperator": {
       "Code": "test-code",
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html
index 7c6c553..a0b89ab 100644
--- a/components/onc/docs/onc_spec.html
+++ b/components/onc/docs/onc_spec.html
@@ -20,7 +20,7 @@
   <h1>Objective</h1>
   <p>
     We would like to create a simple, open, but complete format to describe
-    multiple network configurations for Wi-Fi, Ethernet, Cellular,
+    multiple network configurations for WiFi, Ethernet, Cellular,
     Bluetooth/WiFi-Direct, and VPN connections in a single file format, in order
     to simplify and automate network configuration for users.
   </p>
@@ -33,7 +33,7 @@
     is a problem shared across desktop, laptop, tablet, and phone users of all
     operating system types. It is exacerbated in business and schools which
     often have complex network configurations (VPNs and 802.1X networking) that
-    change often and have many connected devices. Configuration of Wi-Fi is
+    change often and have many connected devices. Configuration of WiFi is
     still done manually, often by administrators physically standing next to
     users working on devices. Certificate distribution is particularly painful
     which often results in admins instead using passphrases to protect networks
@@ -202,7 +202,7 @@
         (optional)
         <span class="type">array of NetworkConfiguration</span>
       </span>
-      Describes Wi-Fi, Ethernet, VPN, and wireless connections.
+      Describes WiFi, Ethernet, VPN, and wireless connections.
     </dd>
 
     <dt class="field">Certificates</dt>
@@ -374,7 +374,7 @@
         <span class="value">WiFi</span>, otherwise ignored)
         <span class="type">WiFi</span>
       </span>
-      Wi-Fi settings.
+      WiFi settings.
     </dd>
 
     <dt class="field">WiMAX</dt>
@@ -649,9 +649,9 @@
 </section>
 
 <section>
-  <h1>Wi-Fi networks</h1>
+  <h1>WiFi networks</h1>
   <p>
-    For Wi-Fi connections, <span class="field">Type</span> must be set to
+    For WiFi connections, <span class="field">Type</span> must be set to
     <span class="value">WiFi</span> and the
     field <span class="field">WiFi</span> must be set to an object of
     type <span class="type">WiFi</span> containing the following fields:
@@ -2304,11 +2304,16 @@
       network technology currently in use.
       <span class="rule"><span class="rule_id"></span>
         Allowed values are
-        <span class="value">1xRTT</span>, <span class="value">EVDO</span>,
-        <span class="value">GPRS</span>, <span class="value">EDGE</span>,
+        <span class="value">CDMA1XRTT</span>,
+        <span class="value">EDGE</span>,
+        <span class="value">EVDO</span>,
+        <span class="value">GPRS</span>,
+        <span class="value">GSM</span>,
+        <span class="value">HSPA</span>,
+        <span class="value">HSPAPlus</span>,
+        <span class="value">LTE</span>,
+        <span class="value">LTEAdvanced</span>
         <span class="value">UMTS</span>,
-        <span class="value">HSPA</span>, <span class="value">HSPA+</span>,
-        <span class="value">LTE</span>, <span class="value">LTE Advanced</span>
       </span>
     </dd>
 
@@ -2547,7 +2552,7 @@
 <section>
   <h1>Bluetooth / WiFi Direct Networks</h1>
   <p>
-    This format will eventually also cover configuration of Bluetooth and Wi-Fi
+    This format will eventually also cover configuration of Bluetooth and WiFi
     Direct network technologies, however they are currently not supported.
   </p>
 </section>
diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc
index 8945059..41510b5 100644
--- a/components/onc/onc_constants.cc
+++ b/components/onc/onc_constants.cc
@@ -124,6 +124,16 @@ const char kSIMLockStatus[] = "SIMLockStatus";
 const char kSIMPresent[] = "SIMPresent";
 const char kSupportedCarriers[] = "SupportedCarriers";
 const char kSupportNetworkScan[] = "SupportNetworkScan";
+const char kTechnologyCdma1Xrtt[] = "CDMA1XRTT";
+const char kTechnologyEdge[] = "EDGE";
+const char kTechnologyEvdo[] = "EVDO";
+const char kTechnologyGprs[] = "GPRS";
+const char kTechnologyGsm[] = "GSM";
+const char kTechnologyHspa[] = "HSPA";
+const char kTechnologyHspaPlus[] = "HSPAPlus";
+const char kTechnologyLte[] = "LTE";
+const char kTechnologyLteAdvanced[] = "LTEAdvanced";
+const char kTechnologyUmts[] = "UMTS";
 }  // namespace cellular
 
 namespace cellular_provider {
diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h
index e3b6594..779003d 100644
--- a/components/onc/onc_constants.h
+++ b/components/onc/onc_constants.h
@@ -142,6 +142,16 @@ ONC_EXPORT extern const char kSIMLockStatus[];
 ONC_EXPORT extern const char kSIMPresent[];
 ONC_EXPORT extern const char kSupportedCarriers[];
 ONC_EXPORT extern const char kSupportNetworkScan[];
+ONC_EXPORT extern const char kTechnologyCdma1Xrtt[];
+ONC_EXPORT extern const char kTechnologyEdge[];
+ONC_EXPORT extern const char kTechnologyEvdo[];
+ONC_EXPORT extern const char kTechnologyGprs[];
+ONC_EXPORT extern const char kTechnologyGsm[];
+ONC_EXPORT extern const char kTechnologyHspa[];
+ONC_EXPORT extern const char kTechnologyHspaPlus[];
+ONC_EXPORT extern const char kTechnologyLte[];
+ONC_EXPORT extern const char kTechnologyLteAdvanced[];
+ONC_EXPORT extern const char kTechnologyUmts[];
 }  // namespace cellular
 
 namespace cellular_provider {
diff --git a/ui/webui/resources/cr_elements/cr_network_icon/badge_1x.png b/ui/webui/resources/cr_elements/cr_network_icon/badge_1x.png
new file mode 100644
index 0000000..2d11aee
--- /dev/null
+++ b/ui/webui/resources/cr_elements/cr_network_icon/badge_1x.png
diff --git a/ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js b/ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js
index c70079e..322a7dc 100644
--- a/ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js
+++ b/ui/webui/resources/cr_elements/cr_network_icon/cr_network_icon.js
@@ -40,7 +40,7 @@ function getIconTypeFromNetworkType(networkType) {
   else if (networkType == CrOnc.Type.VPN)
     return 'vpn';
 
-  console.error('Unrecognized network type: ' + networkType);
+  console.error('Unrecognized network type for icon: ' + networkType);
   return 'ethernet';
 }
 
@@ -232,6 +232,9 @@ Polymer('cr-network-icon', {
       this.secure = false;
       var oncTechnology = networkState.getCellularTechnology();
       switch (oncTechnology) {
+        case CrOnc.NetworkTechnology.CDMA1XRTT:
+          this.technology = '1x';
+          break;
         case CrOnc.NetworkTechnology.EDGE:
           this.technology = 'edge';
           break;
diff --git a/ui/webui/resources/cr_elements/cr_onc/cr_onc_types.js b/ui/webui/resources/cr_elements/cr_onc/cr_onc_types.js
index 3497315..87bc6d3 100644
--- a/ui/webui/resources/cr_elements/cr_onc/cr_onc_types.js
+++ b/ui/webui/resources/cr_elements/cr_onc/cr_onc_types.js
@@ -29,14 +29,15 @@ CrOnc.ConnectionState = {
 
 /** @enum {string} */
 CrOnc.NetworkTechnology = {
+  CDMA1XRTT: 'CDMA1XRTT',
   EDGE: 'EDGE',
   EVDO: 'EVDO',
   GPRS: 'GPRS',
   GSM: 'GSM',
   HSPA: 'HSPA',
-  HSPA_PLUS: 'HSPA+',
+  HSPA_PLUS: 'HSPAPlus',
   LTE: 'LTE',
-  LTE_ADVANCED: 'LTE Advanced',
+  LTE_ADVANCED: 'LTEAdvanced',
   UMTS: 'UMTS',
   UNKNOWN: 'Unknown',
 };
diff --git a/ui/webui/resources/cr_elements_images.grdp b/ui/webui/resources/cr_elements_images.grdp
index 46a3689..571301a 100644
--- a/ui/webui/resources/cr_elements_images.grdp
+++ b/ui/webui/resources/cr_elements_images.grdp
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
+  <include name="IDR_WEBUI_CR_ELEMENTS_NETWORK_BADGE_CDMA1XRTT"
+           file="cr_elements/cr_network_icon/badge_1x.png" 
+           type="BINDATA" />
   <include name="IDR_WEBUI_CR_ELEMENTS_NETWORK_BADGE_3G"
            file="cr_elements/cr_network_icon/badge_3g.png" 
            type="BINDATA" />