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

Commit 2cc3ae24 authored by Roman Birg's avatar Roman Birg Committed by Gerrit Code Review
Browse files

Settings: update About screen device model fields 



- Changed "Model name" to "Device model", this queries ro.product.model
- Added an optional "Device name" field which queries ro.product.name
- The new "Device name" field is disabled by default

Change-Id: If837674091b4612124e1eff00e884823be767f47
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 206af7ae

res/values/cm_strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -289,8 +289,10 @@ 
    <string name="mod_version">CyanogenMod version</string>

    <string name="mod_version_default">Unknown</string>



    <!-- About phone screen, model name -->

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

    <!-- About phone screen, Device model -->

    <string name="device_model">Device model</string>

    <!-- About phone screen, Device nodel -->

    <string name="device_name">Device name</string>



    <!-- About phone screen, build date -->

    <string name="build_date">Build date</string>

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -84,4 +84,7 @@ 
    <!-- This is use to determine whether to hide the performance settings-->

    <bool name="config_hidePerformanceSettings" translatable="false">false</bool>



    <!-- Display ro.product.name above Device model -->

    <bool name="config_displayDeviceName">false</bool>



</resources>

res/xml/device_info_settings.xml

+7 −2
Original line number Diff line number Diff line
@@ -120,10 +120,15 @@ 
                android:title="@string/device_feedback">

        </PreferenceScreen>



       <Preference android:key="device_name"

                style="?android:preferenceInformationStyle"

                android:title="@string/device_name"

                android:summary="@string/device_info_default"/>



        <!-- Device hardware model -->

        <Preference android:key="device_model"

                style="?android:preferenceInformationStyle"

                android:title="@string/model_name"

                android:title="@string/device_model"

                android:summary="@string/device_info_default"/>



        <!-- Mod version -->

src/com/android/settings/DeviceInfoSettings.java

+5 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
    private static final String KEY_KERNEL_VERSION = "kernel_version";

    private static final String KEY_BUILD_NUMBER = "build_number";

    private static final String KEY_DEVICE_MODEL = "device_model";

    private static final String KEY_DEVICE_NAME = "device_name";

    private static final String KEY_SELINUX_STATUS = "selinux_status";

    private static final String KEY_BASEBAND_VERSION = "baseband_version";

    private static final String KEY_FIRMWARE_VERSION = "firmware_version";
@@ -106,7 +107,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
        setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);

        findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);

        setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");

        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL + getMsvSuffix());

        setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);

        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);

        setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
@@ -124,6 +124,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
            setStringSummary(KEY_SELINUX_STATUS, status);

        }



        setStringSummary(KEY_DEVICE_NAME, Build.PRODUCT);

        removePreferenceIfBoolFalse(KEY_DEVICE_NAME, getResources().getBoolean(

                R.bool.config_displayDeviceName));



        // Remove selinux information if property is not present

        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_SELINUX_STATUS,

                PROPERTY_SELINUX_STATUS);