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

Commit 47963424 authored by Vineeta Srivastava's avatar Vineeta Srivastava Committed by Android (Google) Code Review
Browse files

Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev

parents 311a7845 2490315e

res/values/bools.xml

+3 −0
Original line number Diff line number Diff line
@@ -32,4 +32,7 @@ 


    <!-- Whether to show a preference item for regulatory information in About phone -->

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

src/com/android/settings/WirelessSettings.java

+10 −0
Original line number Diff line number Diff line
@@ -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);