Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d05932 authored by Doris Ling's avatar Doris Ling
Browse files

Show device name in About Phone summary. 

- change from using device model to device name for the top level about
phone preference summary.

Change-Id: I6c1891f3867f55cf1501baf76ea147e2df49111e
Fixes: 119157622
Test: make RunSettingsRoboTests
parent 8208d284

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

    }

}

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

+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");

    }





}