packages/apps/Settings
| Révision | 48f670ce512821a87fbf2df81710cf609012e834 (tree) |
|---|---|
| l'heure | 2013-09-25 12:05:57 |
| Auteur | Daniel Leung <daniel.leung@inte...> |
| Commiter | Chih-Wei Huang |
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>
res/values/strings.xml (diff) res/xml/device_info_settings.xml (diff)
src/com/android/settings/DeviceInfoSettings.java (diff)| @@ -1916,6 +1916,8 @@ | ||
| 1916 | 1916 | <!-- About phone screen, status item label --> |
| 1917 | 1917 | <string name="firmware_version">Android version</string> |
| 1918 | 1918 | <!-- About phone screen, status item label--> |
| 1919 | + <string name="device_manufacturer">Manufacturer</string> | |
| 1920 | + <!-- About phone screen, status item label--> | |
| 1919 | 1921 | <string name="model_number">Model number</string> |
| 1920 | 1922 | <!-- About phone screen, fcc equipment id label--> |
| 1921 | 1923 | <string name="fcc_equipment_id">Equipment ID</string> |
| @@ -95,6 +95,12 @@ | ||
| 95 | 95 | <intent android:action="android.settings.SHOW_REGULATORY_INFO" /> |
| 96 | 96 | </PreferenceScreen> |
| 97 | 97 | |
| 98 | + <!-- Device manufacturer --> | |
| 99 | + <Preference android:key="device_manufacturer" | |
| 100 | + style="?android:preferenceInformationStyle" | |
| 101 | + android:title="@string/device_manufacturer" | |
| 102 | + android:summary="@string/device_info_default"/> | |
| 103 | + | |
| 98 | 104 | <!-- Device hardware model --> |
| 99 | 105 | <Preference android:key="device_model" |
| 100 | 106 | style="?android:preferenceInformationStyle" |
| @@ -63,6 +63,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { | ||
| 63 | 63 | private static final String KEY_UPDATE_SETTING = "additional_system_update_settings"; |
| 64 | 64 | private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id"; |
| 65 | 65 | private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid"; |
| 66 | + private static final String KEY_DEVICE_MANUFACTURER = "device_manufacturer"; | |
| 66 | 67 | |
| 67 | 68 | static final int TAPS_TO_BE_A_DEVELOPER = 7; |
| 68 | 69 |
| @@ -85,6 +86,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { | ||
| 85 | 86 | setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY); |
| 86 | 87 | findPreference(KEY_BUILD_NUMBER).setEnabled(true); |
| 87 | 88 | findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion()); |
| 89 | + setStringSummary(KEY_DEVICE_MANUFACTURER, Build.MANUFACTURER); | |
| 88 | 90 | |
| 89 | 91 | if (!SELinux.isSELinuxEnabled()) { |
| 90 | 92 | String status = getResources().getString(R.string.selinux_status_disabled); |
Fork