From: Daniel Leung <daniel.leung@intel.com>
Date: Wed, 2 May 2012 23:37:00 +0000 (-0700)
Subject: Added Manufacturer to device info
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=278f9d59de6a937e4028cd71bee02c86cf00bd28;p=android-x86%2Fpackages-apps-Settings.git

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/strings.xml b/res/values/strings.xml
index c17d2cbe11..4684428509 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2149,6 +2149,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 6785a5045a..cc9335a230 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -98,6 +98,12 @@
                 android:title="@string/device_feedback">
         </PreferenceScreen>
 
+        <!-- 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 88c77abd51..b7ed72bfaf 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -80,6 +80,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
     private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";
     private static final String KEY_DEVICE_FEEDBACK = "device_feedback";
     private static final String KEY_SAFETY_LEGAL = "safetylegal";
+    private static final String KEY_DEVICE_MANUFACTURER = "device_manufacturer";
 
     static final int TAPS_TO_BE_A_DEVELOPER = 7;
 
@@ -109,6 +110,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
         setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
         findPreference(KEY_BUILD_NUMBER).setEnabled(true);
         findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
+        setStringSummary(KEY_DEVICE_MANUFACTURER, Build.MANUFACTURER);
 
         if (!SELinux.isSELinuxEnabled()) {
             String status = getResources().getString(R.string.selinux_status_disabled);