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

Commit 210fba09 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] configuration for hidding SIM provider UI"

parents d0715769 2f07595e

res/xml/network_provider_internet.xml

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
        android:icon="@drawable/ic_calls_sms"

        android:order="-20"

        android:summary="@string/summary_placeholder"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:allowDividerBelow="true"

        settings:keywords="@string/calls_and_sms"

        settings:useAdminDisabledSummary="true" />
@@ -49,6 +50,7 @@ 
        android:order="-15"

        settings:keywords="@string/keywords_more_mobile_networks"

        settings:userRestriction="no_config_mobile_networks"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:allowDividerAbove="true"

        settings:useAdminDisabledSummary="true" />
@@ -66,6 +68,7 @@ 
        android:persistent="false"

        android:order="19"

        settings:userRestriction="no_config_mobile_networks"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:useAdminDisabledSummary="true" />



    <com.android.settingslib.RestrictedPreference

res/xml/network_provider_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
        android:key="provider_model_mobile_network"

        android:title="@string/summary_placeholder"

        android:layout="@layout/preference_category_no_label"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:controller="com.android.settings.network.NetworkMobileProviderController"/>



    <com.android.settingslib.RestrictedSwitchPreference

src/com/android/settings/network/MobileNetworkSummaryController.java

+2 −1
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController 


    @Override

    public boolean isAvailable() {

        return !Utils.isWifiOnly(mContext) && mUserManager.isAdminUser();

        return SubscriptionUtil.isSimHardwareVisible(mContext) &&

                !Utils.isWifiOnly(mContext) && mUserManager.isAdminUser();

    }



    @Override

src/com/android/settings/network/NetworkProviderCallsSmsController.java

+2 −1
Original line number Diff line number Diff line
@@ -186,7 +186,8 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl 


    @Override

    public boolean isAvailable() {

        return mUserManager.isAdminUser();

        return SubscriptionUtil.isSimHardwareVisible(mContext) &&

                mUserManager.isAdminUser();

    }



    @Override

src/com/android/settings/network/NetworkProviderCallsSmsFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment { 


                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    return context.getSystemService(UserManager.class).isAdminUser();

                    return SubscriptionUtil.isSimHardwareVisible(context) &&

                            context.getSystemService(UserManager.class).isAdminUser();

                }

            };

}