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

[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: I6b76e6a4efe1dcd72c18e503dd3af853c8536276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerngWang
2022-07-08 19:08:48 +00:00
committed by Automerger Merge Worker
parent 36139e2e09 286dce6b6e
commit 289796e9a3
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,21 @@ public class SubscriptionActionDialogActivity extends FragmentActivity {
* @param message The string content should be displayed in the progress dialog. * @param message The string content should be displayed in the progress dialog.
*/ */
protected void showProgressDialog(String message) { protected void showProgressDialog(String message) {
showProgressDialog(message,false);
}
/**
* Displays a loading dialog.
*
* @param message The string content should be displayed in the progress dialog.
* @param updateIfNeeded is whether to update the progress state in the SharedPreferences.
*/
protected void showProgressDialog(String message, boolean updateIfNeeded) {
ProgressDialogFragment.show(getFragmentManager(), message, null); ProgressDialogFragment.show(getFragmentManager(), message, null);
if (updateIfNeeded) {
setProgressState(PROGRESS_IS_SHOWING); setProgressState(PROGRESS_IS_SHOWING);
} }
}
/** Dismisses the loading dialog. */ /** Dismisses the loading dialog. */
protected void dismissProgressDialog() { protected void dismissProgressDialog() {

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

@@ -220,8 +220,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
showProgressDialog( showProgressDialog(
getString( getString(
R.string.sim_action_switch_sub_dialog_progress, R.string.sim_action_switch_sub_dialog_progress,
SubscriptionUtil.getUniqueSubscriptionDisplayName( SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this)),
mSubInfo, this))); removedSubInfo != null ? true : false);
if (mIsEsimOperation) { if (mIsEsimOperation) {
mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(), mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(),
UiccSlotUtil.INVALID_PORT_ID, UiccSlotUtil.INVALID_PORT_ID,