Merge "Show device name in About Phone summary."
diff --git a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
index ba28f3a..d2ffd0d 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
@@ -19,7 +19,7 @@
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
-import com.android.settings.deviceinfo.DeviceModelPreferenceController;
+import com.android.settings.deviceinfo.DeviceNamePreferenceController;
public class TopLevelAboutDevicePreferenceController extends BasePreferenceController {
@@ -34,6 +34,8 @@
@Override
public CharSequence getSummary() {
- return DeviceModelPreferenceController.getDeviceModel();
+ final DeviceNamePreferenceController deviceNamePreferenceController =
+ new DeviceNamePreferenceController(mContext);
+ return deviceNamePreferenceController.getSummary();
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
index ae3007c..25fbeee 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
@@ -23,6 +23,7 @@
import android.content.Context;
import android.os.Build;
+import android.provider.Settings.Global;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -49,7 +50,15 @@
}
@Test
- public void getSummary_shouldReturnDeviceModel() {
+ public void getSummary_deviceNameNotSet_shouldReturnDeviceModel() {
assertThat(mController.getSummary().toString()).isEqualTo(Build.MODEL);
}
+
+ @Test
+ public void getSummary_deviceNameSet_shouldReturnDeviceName() {
+ Global.putString(mContext.getContentResolver(), Global.DEVICE_NAME, "Test");
+ assertThat(mController.getSummary().toString()).isEqualTo("Test");
+ }
+
+
}