From 2490315e49d235a1ba9a84600a21febf85959a1a Mon Sep 17 00:00:00 2001 From: Sungmin Choi Date: Tue, 15 Oct 2013 16:11:55 -0700 Subject: [PATCH] Remove Manage Mobile Plan when config_show_mobile_plan is set to false config_show_mobile_plan is set to true by default. When you don't want to show "Manage mobile plan" set config_show_mobile_plan to false in overlay. Bug: 10819853 Change-Id: Ic3c69fb4246cc0de38518ef6c9950cee7fa4d987 --- res/values/bools.xml | 3 +++ src/com/android/settings/WirelessSettings.java | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/res/values/bools.xml b/res/values/bools.xml index 76dc44a7a7e..137d4ce0112 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -32,4 +32,7 @@ false + + + true diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 6724cc129a6..65127b5773f 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -333,6 +333,16 @@ public class WirelessSettings extends RestrictedSettingsFragment removePreference(KEY_MOBILE_NETWORK_SETTINGS); 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_MANAGE_MOBILE_PLAN);