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

Commit b0c3b951 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge ""QGP version" information should show in Settings" into android_ui.lnx.2.1-dev

parents 4e86b61f 9ac43143

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2286,6 +2286,8 @@ 
    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->

    <string name="build_number">Build number</string>

    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->

    <string name="qgp_version">QGP Version</string>

    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->

    <string name="selinux_status">SELinux status</string>









    <!-- About phone screen, show when a value of some status item is unavailable. -->
































res/xml/device_info_settings.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -120,6 +120,12 @@







                android:title="@string/build_number"









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



















        <!-- Device QGP version -->









        <Preference android:key="qgp_version"









                style="?android:preferenceInformationStyle"









                android:title="@string/qgp_version"









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



















        <!-- SELinux status information -->









        <Preference android:key="selinux_status"









                android:enabled="false"
































src/com/android/settings/DeviceInfoSettings.java



+6
−0






























Original line number
Diff line number
Diff line







@@ -73,6 +73,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In







    private static final String KEY_SAFETY_LEGAL = "safetylegal";









    private static final String KEY_MBN_VERSION = "mbn_version";









    private static final String PROPERTY_MBN_VERSION = "persist.mbn.version";









    private static final String KEY_QGP_VERSION = "qgp_version";









    private static final String PROPERTY_QGP_VERSION = "persist.qgp.version";



















    static final int TAPS_TO_BE_A_DEVELOPER = 7;


















@@ -120,6 +122,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In







        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);









        setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);









        findPreference(KEY_BUILD_NUMBER).setEnabled(true);









        setValueSummary(KEY_QGP_VERSION, PROPERTY_QGP_VERSION);









        // Remove QGP Version if property is not present









        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_QGP_VERSION,









                PROPERTY_QGP_VERSION);









        findPreference(KEY_KERNEL_VERSION).setSummary(DeviceInfoUtils.customizeFormatKernelVersion(









                getResources().getBoolean(R.bool.def_hide_kernel_version_name)));









        setValueSummary(KEY_MBN_VERSION, PROPERTY_MBN_VERSION);