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

Commit e64341f9 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 6f3faea2

res/values/cm_strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ 
    <string name="mod_version">CyanogenMod version</string>

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



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

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

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

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



    <!-- About phone screen, CyanogenMod Api Level -->

    <string name="mod_api_level">CyanogenMod API level</string>

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

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -81,4 +81,7 @@ 
    <!-- When true enable gesture setting. -->

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



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

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



</resources>

res/xml/device_info_settings.xml

+8 −1
Original line number Diff line number Diff line
@@ -85,11 +85,18 @@ 
        <org.cyanogenmod.internal.cmparts.CMPartsPreference

                android:key="contributors" />



        <!-- Device name -->

        <Preference android:key="device_name"

                android:enabled="false"

                android:shouldDisableView="false"

                android:title="@string/device_name"

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



        <!-- Device hardware model -->

        <Preference android:key="device_model"

                android:enabled="false"

                android:shouldDisableView="false"

                android:title="@string/model_number"

                android:title="@string/device_model"

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



        <!-- Device firmware version -->

src/com/android/settings/DeviceInfoSettings.java

+4 −1
Original line number Diff line number Diff line
@@ -62,6 +62,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";
@@ -120,7 +121,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
        }



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

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

        setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);

        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);

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

        }



        setStringSummary(KEY_DEVICE_NAME, Build.PRODUCT);

        removePreferenceIfBoolFalse(KEY_DEVICE_NAME, R.bool.config_displayDeviceName);



        // Remove selinux information if property is not present

        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_SELINUX_STATUS,

                PROPERTY_SELINUX_STATUS);