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

am 7a40def1: am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev

Browse Source 
* commit '7a40def17c40279faf8ad01d730c88498cd2f549':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
This commit is contained in:
Vineeta Srivastava
2013-10-23 16:14:35 -07:00
committed by Android Git Automerger
parent d947e49b02 7a40def17c
commit 4a66909a6a
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/bools.xml
View File

@@ -32,4 +32,7 @@
<!-- Whether to show a preference item for regulatory information in About phone --> <!-- Whether to show a preference item for regulatory information in About phone -->
<bool name="config_show_regulatory_info">false</bool> <bool name="config_show_regulatory_info">false</bool>
<!-- Whether to show a preference item for mobile plan -->
<bool name="config_show_mobile_plan">true</bool>
</resources> </resources>

10
src/com/android/settings/WirelessSettings.java
View File

@@ -333,6 +333,16 @@ public class WirelessSettings extends RestrictedSettingsFragment
removePreference(KEY_MOBILE_NETWORK_SETTINGS); removePreference(KEY_MOBILE_NETWORK_SETTINGS);
removePreference(KEY_MANAGE_MOBILE_PLAN); removePreference(KEY_MANAGE_MOBILE_PLAN);
} }
// Remove Mobile Network Settings and Manage Mobile Plan
// if config_show_mobile_plan sets false.
boolean isMobilePlanEnabled = this.getResources().getBoolean(
R.bool.config_show_mobile_plan);
if (!isMobilePlanEnabled) {
Preference pref = findPreference(KEY_MANAGE_MOBILE_PLAN);
if (pref != null) {
removePreference(KEY_MANAGE_MOBILE_PLAN);
}
}
protectByRestrictions(KEY_MOBILE_NETWORK_SETTINGS); protectByRestrictions(KEY_MOBILE_NETWORK_SETTINGS);
protectByRestrictions(KEY_MANAGE_MOBILE_PLAN); protectByRestrictions(KEY_MANAGE_MOBILE_PLAN);