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

Commit 7b8848a6 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "[Sim UI enhancement] hide Calls & SMS when using new ui" into main

parents 105afa40 0e4018f4

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import androidx.lifecycle.LifecycleOwner 
import androidx.preference.PreferenceScreen

import com.android.settings.R

import com.android.settings.core.BasePreferenceController

import com.android.settings.flags.Flags

import com.android.settingslib.RestrictedPreference

import com.android.settingslib.Utils

import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
@@ -62,6 +63,7 @@ open class NetworkProviderCallsSmsController @JvmOverloads constructor( 
    }



    override fun getAvailabilityStatus() = when {

        Flags.isDualSimOnboardingEnabled() -> UNSUPPORTED_ON_DEVICE

        !SubscriptionUtil.isSimHardwareVisible(mContext) -> UNSUPPORTED_ON_DEVICE

        !mContext.userManager.isAdminUser -> DISABLED_FOR_USER

        else -> AVAILABLE

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

+4 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import androidx.annotation.VisibleForTesting; 


import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.flags.Flags;

import com.android.settings.network.telephony.CallsDefaultSubscriptionController;

import com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController;

import com.android.settings.network.telephony.SmsDefaultSubscriptionController;
@@ -91,8 +92,9 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment { 


                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    return SubscriptionUtil.isSimHardwareVisible(context) &&

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

                    return !Flags.isDualSimOnboardingEnabled()

                            && SubscriptionUtil.isSimHardwareVisible(context)

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

                }

            };

}