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

Commit e9a33d48 authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I032839c91c8951bec8014554b7cb7de5d73d0132
parents 3de3fa1f e86dd271

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -3054,8 +3054,6 @@ 
    <string name="security_patch">Android security update</string>

    <!-- About phone screen, status item label  [CHAR LIMIT=40] -->

    <string name="model_info">Model</string>

    <!-- About phone screen, status item summary  [CHAR LIMIT=40] -->

    <string name="model_summary">Model&#58; %1$s</string>

    <!-- About phone screen, dialog title for showing hardware information such as model, serial number, etc.[CHAR LIMIT=60] -->

    <string name="hardware_info">Model &amp; hardware</string>

    <!-- Label for device's hardware revision value [CHAR LIMIT=40] -->

res/xml/my_device_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
    <Preference

        android:key="device_model"

        android:order="31"

        android:title="@string/hardware_info"

        android:title="@string/model_info"

        android:summary="@string/summary_placeholder"

        android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment"

        settings:enableCopying="true"

src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class HardwareInfoPreferenceController extends BasePreferenceController { 


    @Override

    public CharSequence getSummary() {

        return mContext.getResources().getString(R.string.model_summary, getDeviceModel());

        return getDeviceModel();

    }



    public static String getDeviceModel() {

tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java

+1 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceManager;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.deviceinfo.HardwareInfoPreferenceController;
@@ -79,8 +78,6 @@ public class HardwareInfoPreferenceControllerTest { 
    }



    private boolean containBuildModel(CharSequence result) {

        final String oracle = mContext.getResources().getString(R.string.model_summary,

                Build.MODEL);

        return result.toString().contains(oracle);

        return result.toString().contains(Build.MODEL);

    }

}