diff --git a/res/drawable/sim_progress_dialog_rounded_bg.xml b/res/drawable/sim_progress_dialog_rounded_bg.xml new file mode 100644 index 00000000000..b29ee433823 --- /dev/null +++ b/res/drawable/sim_progress_dialog_rounded_bg.xml @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/src/com/android/settings/network/telephony/ProgressDialogFragment.java b/src/com/android/settings/network/telephony/ProgressDialogFragment.java index 0d1b65716db..29f269b8566 100644 --- a/src/com/android/settings/network/telephony/ProgressDialogFragment.java +++ b/src/com/android/settings/network/telephony/ProgressDialogFragment.java @@ -26,6 +26,8 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.KeyEvent; +import com.android.settings.R; + /** Fragment to show a progress dialog. */ public class ProgressDialogFragment extends DialogFragment { private static final String ARG_TITLE = "title"; @@ -83,6 +85,7 @@ public class ProgressDialogFragment extends DialogFragment { @SuppressWarnings("deprecation") // ProgressDialog is deprecated but is intended UX for now public Dialog onCreateDialog(Bundle savedInstanceState) { ProgressDialog dialog = new ProgressDialog(getActivity()); + dialog.getWindow().setBackgroundDrawableResource(R.drawable.sim_progress_dialog_rounded_bg); dialog.setCancelable(false); dialog.setCanceledOnTouchOutside(false); dialog.setMessage(getArguments().getString(ARG_TITLE)); diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java index cc2986d5344..2616a69ba1d 100644 --- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java +++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java @@ -217,19 +217,17 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc } case DIALOG_TAG_ENABLE_SIM_CONFIRMATION: Log.i(TAG, "User confirmed to enable the subscription."); + showProgressDialog( + getString( + R.string.sim_action_switch_sub_dialog_progress, + SubscriptionUtil.getUniqueSubscriptionDisplayName( + mSubInfo, this))); if (mIsEsimOperation) { - showProgressDialog( - getString( - R.string.sim_action_switch_sub_dialog_progress, - SubscriptionUtil.getUniqueSubscriptionDisplayName( - mSubInfo, this))); mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(), UiccSlotUtil.INVALID_PORT_ID, removedSubInfo); return; } - showProgressDialog( - getString(R.string.sim_action_enabling_sim_without_carrier_name)); mSwitchToRemovableSlotSidecar.run(UiccSlotUtil.INVALID_PHYSICAL_SLOT_ID, removedSubInfo); break;