Merge pull request #30731 from AdFad666/settings

Bug 1178081 - Show actual device information in settings
mozilla-b2g · Jul 6, 2015 · 97dbfac · 97dbfac
2 parents e6506d6 + 5f9efce
commit 97dbfac
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/apps/settings/elements/about.html b/apps/settings/elements/about.html
@@ -13,7 +13,7 @@ <h1 data-l10n-id="deviceInfo-header"></h1>
         </li>
         <li>
           <span id="model-name" data-l10n-id="model-name"></span>
-          <small data-name="deviceinfo.hardware"></small>
+          <small data-name="deviceinfo.product_model"></small>
         </li>
         <li>
           <span id="os-version" data-l10n-id="software"></span>

diff --git a/apps/settings/elements/about_more_info.html b/apps/settings/elements/about_more_info.html
@@ -16,9 +16,17 @@ <h1 data-l10n-id="more-info-header"></h1>
           <small data-name="deviceinfo.firmware_revision"></small>
         </li>
         <li>
-          <span data-l10n-id="hardware_revision"></span>
+          <span data-l10n-id="hardware_manufacturer"></span>
+          <small data-name="deviceinfo.product_manufacturer"></small>
+        </li>
+        <li>
+          <span data-l10n-id="hardware_platform"></span>
           <small data-name="deviceinfo.hardware"></small>
         </li>
+        <li>
+          <span data-l10n-id="hardware_revision"></span>
+          <small data-name="deviceinfo.product_device"></small>
+        </li>
         <li>
           <span data-l10n-id="macAddress"></span>
           <small data-name="deviceinfo.mac"></small>

diff --git a/apps/settings/locales/settings.en-US.properties b/apps/settings/locales/settings.en-US.properties
@@ -1106,6 +1106,8 @@ gitInfo=Git Commit Info
 model-name=Model
 os-version=OS Version
 firmware_revision=Firmware Revision
+hardware_manufacturer=Hardware Manufacturer
+hardware_platform=Hardware Platform
 hardware_revision=Hardware Revision
 platform_version=Platform Version
 build-id=Build Identifier

diff --git a/build/config/common-settings.json b/build/config/common-settings.json
@@ -72,6 +72,8 @@
    "deviceinfo.previous_os": "",
    "deviceinfo.platform_build_id": "",
    "deviceinfo.platform_version": "",
+   "deviceinfo.product_device": "",
+   "deviceinfo.product_manufacturer": "",
    "deviceinfo.product_model": "",
    "deviceinfo.software": "",
    "device.storage.writable.name": "sdcard",