Bug 1103896 - Display the data connection and data roaming warnings u…

…sing dialog service
mozilla-b2g · Dec 22, 2014 · 2c45dbd · 2c45dbd
1 parent 155f9c1
commit 2c45dbd
Show file tree

Hide file tree

Showing 5 changed files with 155 additions and 252 deletions.
diff --git a/apps/settings/elements/carrier.html b/apps/settings/elements/carrier.html
@@ -19,15 +19,15 @@ <h2 data-l10n-id="dataConnectivity"> Data Connectivity </h2>
       <ul>
         <li id="menuItem-enableDataCall" aria-disabled="true">
           <label class="pack-switch">
-            <input type="checkbox" name="ril.data.enabled">
+            <input type="checkbox">
             <span data-l10n-id="dataConnection">Data Connection</span>
             <small id="dataConnection-desc"></small>
           </label>
         </li>
         <li id="dataConnection-expl" class="explanation" data-l10n-id="dataConnection-warning-message" hidden></li>
         <li id="menuItem-enableDataRoaming">
           <label class="pack-switch">
-            <input type="checkbox" class="uninit">
+            <input type="checkbox">
             <span data-l10n-id="dataRoaming">Data Roaming</span>
           </label>
         </li>

diff --git a/apps/settings/elements/carrier_dc_warning.html b/apps/settings/elements/carrier_dc_warning.html
diff --git a/apps/settings/elements/carrier_dr_warning.html b/apps/settings/elements/carrier_dr_warning.html
diff --git a/apps/settings/index.html b/apps/settings/index.html
@@ -138,8 +138,6 @@
     <link rel="import" href="/elements/apn_list.html">
     <link rel="import" href="/elements/apn_editor.html">
     <link rel="import" href="/elements/carrier_operator_settings.html">
-    <link rel="import" href="/elements/carrier_dc_warning.html">
-    <link rel="import" href="/elements/carrier_dr_warning.html">
     <link rel="import" href="/elements/carrier_detail.html">
     <link rel="import" href="/elements/carrier.html">
     <link rel="import" href="/elements/bluetooth.html">
@@ -277,10 +275,6 @@
     <section is="apn-list" role="region" id="apn-list"></section>
     <!-- Connectivity :: Cellular & Data :: APN Editor -->
     <section is="apn-editor" role="region" id="apn-editor"></section>
-    <!-- Connectivity :: Cellular & Data :: Data Connection Warnings -->
-    <section is="carrier-dc-warning" role="region" id="carrier-dc-warning"></section>
-    <!-- Connectivity :: Cellular & Data :: Data Roaming Warnings -->
-    <section is="carrier-dr-warning" role="region" id="carrier-dr-warning"></section>
     <!-- Connectivity :: Cellular & Data :: Detail -->
     <section is="carrier-detail" role="region" id="carrier-detail"></section>
     <!-- Connectivity :: Cellular & Data -->