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

Commit 2b2959b3 authored by Park Sanghyun's avatar Park Sanghyun Committed by Android Git Automerger
Browse files

am e5da8565: DO NOT MERGE Add support for additional System Update menu item 

* commit 'e5da8565':
  DO NOT MERGE Add support for additional System Update menu item
parents 70a1ff03 e5da8565

res/values/bools.xml

+3 −0
Original line number Diff line number Diff line
@@ -20,4 +20,7 @@ 
    <bool name="has_intrusive_led">false</bool>

    <!-- Whether or not the dock settings are to be displayed for this device when docked -->

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



    <!-- Display additional System Update menu if true -->

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

</resources>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2655,4 +2655,8 @@ found in the list of installed applications.</string> 
    <string name="wimax_settings">4G settings</string>

    <string name="wimax_settings_summary">Set up &amp; manage 4G network and modem</string>

    <string name="status_wimax_mac_address">4G MAC address</string>



    <string name="additional_system_update_settings_list_item_title"></string>

    <string name="additional_system_update"></string>

    <string name="additional_system_update_menu"></string>

</resources>

res/xml/device_info_settings.xml

+10 −1
Original line number Diff line number Diff line
@@ -24,6 +24,15 @@ 
            <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />

        </PreferenceScreen>



        <!-- Additional System Update menu -->

        <PreferenceScreen android:key="additional_system_update_settings"

                android:title="@string/additional_system_update_settings_list_item_title">

            <intent

                android:action="android.intent.action.MAIN"

                android:targetPackage="@string/additional_system_update"

                android:targetClass="@string/additional_system_update_menu" />

        </PreferenceScreen>



        <!-- Device status - launches activity -->

        <PreferenceScreen android:key="status_info"

                android:title="@string/device_status"

src/com/android/settings/DeviceInfoSettings.java

+9 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class DeviceInfoSettings extends PreferenceActivity { 
    private static final String KEY_COPYRIGHT = "copyright";

    private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";

    private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";

    private static final String KEY_UPDATE_SETTING = "additional_system_update_settings";



    long[] mHits = new long[3];
@@ -104,6 +105,14 @@ public class DeviceInfoSettings extends PreferenceActivity { 
                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_CONTRIBUTORS,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);



        // Read platform settings for additional system update setting

        boolean mUpdateSettingAvailable =

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



        if(mUpdateSettingAvailable == false) {

            getPreferenceScreen().removePreference(findPreference(KEY_UPDATE_SETTING));

        }

    }



    @Override