Bug 1185805 - APN Settings: parse fota apn type from apn database. r=…

…evelyn
mozilla-b2g · Sep 1, 2015 · 84e4fe9 · 84e4fe9
1 parent 8ae6fcb
commit 84e4fe9
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/apps/settings/elements/apn_settings.html b/apps/settings/elements/apn_settings.html
@@ -32,6 +32,11 @@ <h1 data-l10n-id="apnSettings-header"></h1>
             <span data-l10n-id="imsSettings">IMS Settings</span>
           </a>
         </li>
+        <li>
+          <a class="menu-item" data-apn-type="fota" href="#">
+            <span data-l10n-id="fotaSettings">FOTA Settings</span>
+          </a>
+        </li>
         <li>
           <button class="icon reset-apn danger" data-l10n-id="reset-apn">Reset to Default</button>
         </li>

diff --git a/apps/settings/js/modules/apn/apn_const.js b/apps/settings/js/modules/apn/apn_const.js
@@ -4,7 +4,7 @@
 define(function(require) {
   'use strict';
 
-  var APN_TYPES = ['default', 'mms', 'supl', 'dun', 'ims'];
+  var APN_TYPES = ['default', 'mms', 'supl', 'dun', 'ims', 'fota'];
 
   var CP_APN_KEY = 'ril.data.cp.apns';
   var DEFAULT_APN_KEY = 'ril.data.default.apns';

diff --git a/apps/settings/js/panels/apn_list/panel.js b/apps/settings/js/panels/apn_list/panel.js
@@ -16,7 +16,8 @@ define(function(require) {
     'mms': 'messageSettings-header',
     'ims': 'imsSettings-header2',
     'supl': 'suplSettings-header',
-    'dun': 'dunSettings-header'
+    'dun': 'dunSettings-header',
+    'fota': 'fotaSettings-header'
   };
 
   var _getDialogService = function() {

diff --git a/apps/settings/locales/settings.en-US.properties b/apps/settings/locales/settings.en-US.properties
@@ -408,6 +408,13 @@ imsSettings = IMS Settings
 # If you need to adapt your localization to the reduced space available
 # in headers, you can use a shorter string here.
 imsSettings-header2 = {{imsSettings}}
+fotaSettings = FOTA Settings
+# LOCALIZATION NOTE (fotaSettings-header): if you leave the original
+# en-US value "{{fotaSettings}}" in the following string, the localization
+# will be automatically picked from the existing string with ID "fotaSettings".
+# If you need to adapt your localization to the reduced space available
+# in headers, you can use a shorter string here.
+fotaSettings-header = {{fotaSettings}}
 apn-editor-header = APN Editor
 mmsport  = MMS port
 mmsproxy = MMS proxy

diff --git a/apps/system/js/operator_variant_handler.js b/apps/system/js/operator_variant_handler.js
@@ -12,7 +12,7 @@
   // as during normal run time.
   var OPERATOR_VARIANT_FILE = '/shared/resources/apn.json';
 
-  var APN_TYPES = ['default', 'mms', 'supl', 'dun', 'ims'];
+  var APN_TYPES = ['default', 'mms', 'supl', 'dun', 'ims', 'fota'];
   var AUTH_TYPES = ['none', 'pap', 'chap', 'papOrChap'];
   var DEFAULT_MMS_SIZE_LIMITATION = 300 * 1024;
 
@@ -309,6 +309,15 @@
           'ril.ims.httpProxyPort': 'port',
           'ril.ims.authtype': 'authtype'
         },
+        'fota': {
+          'ril.fota.carrier': 'carrier',
+          'ril.fota.apn': 'apn',
+          'ril.fota.user': 'user',
+          'ril.fota.passwd': 'password',
+          'ril.fota.httpProxyHost': 'proxy',
+          'ril.fota.httpProxyPort': 'port',
+          'ril.fota.authtype': 'authtype'
+        },
         'operatorvariant': {
           'ril.iccInfo.mbdn': 'voicemail',
           'ril.sms.strict7BitEncoding.enabled':

diff --git a/shared/resources/apn/index.html b/shared/resources/apn/index.html
@@ -44,8 +44,8 @@
   <body>
     <textarea readonly></textarea>
     <form>
-      <label> MCC: <input name="mcc" value="208"/> </label>
-      <label> MNC: <input name="mnc" value="15" /> </label>
+      <label> MCC: <input name="mcc" value="214"/> </label>
+      <label> MNC: <input name="mnc" value="07" /> </label>
       <textarea readonly id="selection"></textarea>
       <textarea readonly id="preferences"></textarea>
     </form>

diff --git a/shared/resources/apn/query.js b/shared/resources/apn/query.js
@@ -262,6 +262,15 @@ document.addEventListener('DOMContentLoaded', function onload() {
       'ril.ims.httpProxyPort': 'port',
       'ril.ims.authtype': 'authtype'
     },
+    'fota': {
+      'ril.fota.carrier': 'carrier',
+      'ril.fota.apn': 'apn',
+      'ril.fota.user': 'user',
+      'ril.fota.passwd': 'password',
+      'ril.fota.httpProxyHost': 'proxy',
+      'ril.fota.httpProxyPort': 'port',
+      'ril.fota.authtype': 'authtype'
+    },
     'operatorvariant': {
       'ril.iccInfo.mbdn': 'voicemail',
       'ril.sms.strict7BitEncoding.enabled': 'enableStrict7BitEncodingForSms',