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

[MEP] The progress dialog use the same string for psim and esim cases

Browse Source 
1. The progress dialog use the same string for psim and esim cases
2. Add the radius on progress dialog
Bug: 227284982
Test: manual test.

Change-Id: Ia54a4bad94c88bb4efb0bd2f39627bf94092e3bc
This commit is contained in:
SongFerngWang
2022-03-29 22:23:11 +08:00
committed by SongFerng Wang
parent d1c349c572
commit 523bd80862
3 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/telephony/ProgressDialogFragment.java
View File

@@ -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));

12
src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
View File

@@ -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;