Merge "Show device name in About Phone summary." (ac637719) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package com.android.settings.deviceinfo.aboutphone;
		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 @@ public class TopLevelAboutDevicePreferenceController extends BasePreferenceContr

		@Override
		public CharSequence getSummary() {
		return DeviceModelPreferenceController.getDeviceModel();
		final DeviceNamePreferenceController deviceNamePreferenceController =
		new DeviceNamePreferenceController(mContext);
		return deviceNamePreferenceController.getSummary();
		}
		}

+10 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat;

		import android.content.Context;
		import android.os.Build;
		import android.provider.Settings.Global;

		import com.android.settings.testutils.SettingsRobolectricTestRunner;

		@@ -49,7 +50,15 @@ public class TopLevelAboutDevicePreferenceControllerTest {
		}

		@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");
		}


		}