Merge "Show device name in About Phone summary."

This commit is contained in:
TreeHugger Robot
2018-11-15 02:13:35 +00:00
committed by Android (Google) Code Review
2 changed files with 14 additions and 3 deletions

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