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

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

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

parents 98f3e241 5dae2420

res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -617,4 +617,8 @@ 


    <!-- Whether to enable the app battery usage list page feature. -->

    <bool name="config_app_battery_usage_list_enabled">false</bool>



    <!-- Whether sim related information is visible to the end user. -->

    <bool name="config_show_sim_info">true</bool>



</resources>

res/xml/my_device_info.xml

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
            android:order="3"

            android:title="@string/status_number"

            android:summary="@string/summary_placeholder"

            settings:isPreferenceVisible="@bool/config_show_sim_info"

            settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"

            settings:enableCopying="true"/>

    </PreferenceCategory>
@@ -98,6 +99,7 @@ 
            android:title="@string/sim_status_title"

            settings:keywords="@string/keywords_sim_status"

            android:summary="@string/summary_placeholder"

            settings:isPreferenceVisible="@bool/config_show_sim_info"

            settings:enableCopying="true"/>



        <!-- Model & hardware -->
@@ -119,6 +121,7 @@ 
            android:summary="@string/summary_placeholder"

            settings:keywords="@string/keywords_imei_info"

            settings:enableCopying="true"

            settings:isPreferenceVisible="@bool/config_show_sim_info"

            settings:controller="com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController"/>



        <!-- Android version -->

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.preference.PreferenceScreen; 


import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.network.SubscriptionUtil;

import com.android.settingslib.DeviceInfoUtils;



import java.util.ArrayList;
@@ -51,7 +52,8 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 


    @Override

    public int getAvailabilityStatus() {

        return mTelephonyManager.isVoiceCapable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

        return SubscriptionUtil.isSimHardwareVisible(mContext) ?

                AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }



    @Override
@@ -79,6 +81,9 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        if (!SubscriptionUtil.isSimHardwareVisible(mContext)) {

            return;

        }

        final Preference preference = screen.findPreference(getPreferenceKey());

        final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);

        mPreferenceList.add(preference);

src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import androidx.preference.PreferenceScreen; 
import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.deviceinfo.PhoneNumberSummaryPreference;

import com.android.settings.network.SubscriptionUtil;

import com.android.settingslib.Utils;



import java.util.ArrayList;
@@ -63,6 +64,9 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        if (!SubscriptionUtil.isSimHardwareVisible(mContext)) {

            return;

        }

        final Preference preference = screen.findPreference(getPreferenceKey());

        final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);
@@ -120,7 +124,8 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { 


    @Override

    public int getAvailabilityStatus() {

        return mContext.getSystemService(UserManager.class).isAdminUser()

        return SubscriptionUtil.isSimHardwareVisible(mContext) &&

                mContext.getSystemService(UserManager.class).isAdminUser()

                && !Utils.isWifiOnly(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }

src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java

+10 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.preference.PreferenceScreen; 


import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.network.SubscriptionUtil;

import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;



import java.util.ArrayList;
@@ -59,9 +60,18 @@ public class SimStatusPreferenceController extends 
        return KEY_SIM_STATUS;

    }



    @Override

    public boolean isAvailable() {

        return SubscriptionUtil.isSimHardwareVisible(mContext) &&

                super.isAvailable();

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        if (!SubscriptionUtil.isSimHardwareVisible(mContext)) {

            return;

        }

        final Preference preference = screen.findPreference(getPreferenceKey());

        if (!isAvailable() || preference == null || !preference.isVisible()) {

            return;