am e5da8565: DO NOT MERGE Add support for additional System Update menu item
* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
DO NOT MERGE Add support for additional System Update menu item
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 61cc79e..e08b2ad 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b899a2c..de2ba54 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2655,4 +2655,8 @@
<string name="wimax_settings">4G settings</string>
<string name="wimax_settings_summary">Set up & 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>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 860c2ea..ac7952e 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -23,7 +23,16 @@
android:summary="@string/system_update_settings_list_item_summary">
<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"
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 8383987..b2a5d48 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -50,6 +50,7 @@
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 @@
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