OSDN > Desarrollador > zulieza_adz > Chamber > packages-apps-Settings > Commit

packages-apps-Settings
Fork

Commit

Revisión	278f9d59de6a937e4028cd71bee02c86cf00bd28 (tree)
Tiempo	2015-12-18 18:35:54
Autor	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>

--- a/res/values/strings.xml

+++ b/res/values/strings.xml

		@@ -2149,6 +2149,8 @@
2149	2149	<!-- About phone screen, status item label [CHAR LIMIT=60] -->
2150	2150	<string name="security_patch">Android security patch level</string>
2151	2151	<!-- About phone screen, status item label [CHAR LIMIT=40] -->
	2152	+ <string name="device_manufacturer">Manufacturer</string>
	2153	+ <!-- About phone screen, status item label [CHAR LIMIT=40] -->
2152	2154	<string name="model_number">Model number</string>
2153	2155	<!-- About phone screen, fcc equipment id label [CHAR LIMIT=40] -->
2154	2156	<string name="fcc_equipment_id">Equipment ID</string>

--- a/res/xml/device_info_settings.xml

+++ b/res/xml/device_info_settings.xml

		@@ -98,6 +98,12 @@
98	98	android:title="@string/device_feedback">
99	99	</PreferenceScreen>
100	100
	101	+ <!-- Device manufacturer -->
	102	+ <Preference android:key="device_manufacturer"
	103	+ style="?android:preferenceInformationStyle"
	104	+ android:title="@string/device_manufacturer"
	105	+ android:summary="@string/device_info_default"/>
	106	+
101	107	<!-- Device hardware model -->
102	108	<Preference android:key="device_model"
103	109	style="?android:preferenceInformationStyle"

--- 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
80	80	private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";
81	81	private static final String KEY_DEVICE_FEEDBACK = "device_feedback";
82	82	private static final String KEY_SAFETY_LEGAL = "safetylegal";
	83	+ private static final String KEY_DEVICE_MANUFACTURER = "device_manufacturer";
83	84
84	85	static final int TAPS_TO_BE_A_DEVELOPER = 7;
85	86

		@@ -109,6 +110,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
109	110	setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
110	111	findPreference(KEY_BUILD_NUMBER).setEnabled(true);
111	112	findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
	113	+ setStringSummary(KEY_DEVICE_MANUFACTURER, Build.MANUFACTURER);
112	114
113	115	if (!SELinux.isSELinuxEnabled()) {
114	116	String status = getResources().getString(R.string.selinux_status_disabled);