PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Sim UI enhancement] hide Calls & SMS when using new ui

Browse Source 
Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: manually test
Change-Id: Ic6e1b77a300f3e9d86225f9cd4812b0f9b426269
This commit is contained in:
SongFerngWang
2024-01-24 13:04:25 +08:00
committed by SongFerng Wang
parent 96d8953e15
commit 0e4018f469
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/NetworkProviderCallsSmsController.kt
View File

@@ -28,6 +28,7 @@ import androidx.lifecycle.LifecycleOwner
import androidx.preference.PreferenceScreen import androidx.preference.PreferenceScreen
import com.android.settings.R import com.android.settings.R
import com.android.settings.core.BasePreferenceController import com.android.settings.core.BasePreferenceController
import com.android.settings.flags.Flags
import com.android.settingslib.RestrictedPreference import com.android.settingslib.RestrictedPreference
import com.android.settingslib.Utils import com.android.settingslib.Utils
import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
@@ -62,6 +63,7 @@ open class NetworkProviderCallsSmsController @JvmOverloads constructor(
} }
override fun getAvailabilityStatus() = when { override fun getAvailabilityStatus() = when {
Flags.isDualSimOnboardingEnabled() -> UNSUPPORTED_ON_DEVICE
!SubscriptionUtil.isSimHardwareVisible(mContext) -> UNSUPPORTED_ON_DEVICE !SubscriptionUtil.isSimHardwareVisible(mContext) -> UNSUPPORTED_ON_DEVICE
!mContext.userManager.isAdminUser -> DISABLED_FOR_USER !mContext.userManager.isAdminUser -> DISABLED_FOR_USER
else -> AVAILABLE else -> AVAILABLE

6
src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
View File

@@ -24,6 +24,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; 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.CallsDefaultSubscriptionController;
import com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController; import com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController;
import com.android.settings.network.telephony.SmsDefaultSubscriptionController; import com.android.settings.network.telephony.SmsDefaultSubscriptionController;
@@ -91,8 +92,9 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment {
@Override @Override
protected boolean isPageSearchEnabled(Context context) { protected boolean isPageSearchEnabled(Context context) {
return SubscriptionUtil.isSimHardwareVisible(context) && return !Flags.isDualSimOnboardingEnabled()
context.getSystemService(UserManager.class).isAdminUser(); && SubscriptionUtil.isSimHardwareVisible(context)
&& context.getSystemService(UserManager.class).isAdminUser();
} }
}; };
} }