diff --git a/res/layout/dialog_mobile_network_rename.xml b/res/layout/dialog_mobile_network_rename.xml
index 921ab8602e5..2c583d3bc9e 100644
--- a/res/layout/dialog_mobile_network_rename.xml
+++ b/res/layout/dialog_mobile_network_rename.xml
@@ -80,13 +80,15 @@
android:paddingTop="@dimen/sim_label_padding"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary"
- android:text="@string/status_operator"/>
+ android:text="@string/status_operator"
+ android:visibility="gone"/>
+ android:text="@string/device_info_not_available"
+ android:visibility="gone"/>
+ android:text="@string/status_number_sim_status"
+ android:visibility="gone"/>
+ android:text="@string/device_info_not_available"
+ android:visibility="gone"/>
diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
index 88233534dd2..ebc5575146e 100644
--- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
@@ -46,6 +46,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.flags.Flags;
import com.android.settings.network.SubscriptionUtil;
import com.google.common.collect.ImmutableMap;
@@ -131,7 +132,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
LayoutInflater.class);
final View view = layoutInflater.inflate(R.layout.dialog_mobile_network_rename, null);
populateView(view);
- builder.setTitle(R.string.mobile_network_sim_name)
+ builder.setTitle(R.string.mobile_network_sim_label_color_title)
.setView(view)
.setPositiveButton(R.string.mobile_network_sim_name_rename, (dialog, which) -> {
mSubscriptionManager.setDisplayName(mNameView.getText().toString(), mSubId,
@@ -175,14 +176,23 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
mColorSpinner.setAdapter(adapter);
mColorSpinner.setSelection(getSimColorIndex(info.getIconTint()));
+ if(Flags.isDualSimOnboardingEnabled()){
+ return;
+ }
+
+ final TextView operatorTitle = view.findViewById(R.id.operator_name_label);
+ operatorTitle.setVisibility(View.VISIBLE);
+
final TextView operatorName = view.findViewById(R.id.operator_name_value);
mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
+ operatorName.setVisibility(View.VISIBLE);
operatorName.setText(info.getCarrierName());
final TextView phoneTitle = view.findViewById(R.id.number_label);
phoneTitle.setVisibility(info.isOpportunistic() ? View.GONE : View.VISIBLE);
final TextView phoneNumber = view.findViewById(R.id.number_value);
+ phoneNumber.setVisibility(View.VISIBLE);
final String pn = SubscriptionUtil.getBidiFormattedPhoneNumber(getContext(), info);
if (!TextUtils.isEmpty(pn)) {
phoneNumber.setText(pn);