PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
  DO NOT MERGE Add support for additional System Update menu item
This commit is contained in:
Park Sanghyun
2011-03-30 09:31:15 -07:00
committed by Android Git Automerger
parent 70a1ff0357 e5da8565ca
commit 2b2959b321
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/bools.xml
View File

@@ -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>

4
res/values/strings.xml
View File

@@ -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>

11
res/xml/device_info_settings.xml
View File

@@ -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"

9
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -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