PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show device name in About Phone summary."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-11-15 02:13:35 +00:00
committed by Android (Google) Code Review
parent 12b3c70d7b 97d0593298
commit ac6377199e
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
View File

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

11
tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
View File

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