Added Manufacturer to device info

Added an item to display manufacturer in device info page.

For: AIA-438
Change-Id: Iae28759653089cf6fc757c1f76b7ee39638144b0
Signed-off-by: Daniel Leung <daniel.leung@intel.com>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e18d72b..a816888 100644 (file)
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -896,6 +896,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android 版本"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android 安全性修補程式等級"</string>
+    <string name="device_manufacturer">"製造商"</string>
     <string name="model_number" msgid="3765737700545384794">"型號"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"設備 ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"基頻版本"</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a5d5d8..6698d58 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2138,6 +2138,8 @@
     <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
     <string name="security_patch">Android security patch level</string>
     <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+    <string name="device_manufacturer">Manufacturer</string>
+    <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
     <string name="model_number">Model number</string>
     <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
     <string name="fcc_equipment_id">Equipment ID</string>

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 63fd94a..30feaf6 100644 (file)
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -88,6 +88,12 @@
                 android:title="@string/device_name"
                 android:summary="@string/device_info_default"/>
 
+        <!-- Device manufacturer -->
+        <Preference android:key="device_manufacturer"
+                style="?android:preferenceInformationStyle"
+                android:title="@string/device_manufacturer"
+                android:summary="@string/device_info_default"/>
+
         <!-- Device hardware model -->
         <Preference android:key="device_model"
                 style="?android:preferenceInformationStyle"

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 6a7d970..463227e 100644 (file)
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -89,6 +89,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
     private static final String KEY_MOD_BUILD_DATE = "build_date";
     private static final String KEY_MOD_API_LEVEL = "mod_api_level";
     private static final String KEY_CM_UPDATES = "cm_updates";
+    private static final String KEY_DEVICE_MANUFACTURER = "device_manufacturer";
 
     static final int TAPS_TO_BE_A_DEVELOPER = 7;
 
@@ -142,6 +143,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
         setExplicitValueSummary(KEY_MOD_API_LEVEL, constructApiLevelString());
         findPreference(KEY_MOD_API_LEVEL).setEnabled(true);
         findPreference(KEY_MOD_BUILD_DATE).setEnabled(true);
+        setStringSummary(KEY_DEVICE_MANUFACTURER, Build.MANUFACTURER);
 
         if (!SELinux.isSELinuxEnabled()) {
             String status = getResources().getString(R.string.selinux_status_disabled);