Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 289796e9 authored by SongFerngWang's avatar SongFerngWang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I6b76e6a4efe1dcd72c18e503dd3af853c8536276
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36139e2e 286dce6b

src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java

+13 −1
Original line number Diff line number Diff line
@@ -60,9 +60,21 @@ public class SubscriptionActionDialogActivity extends FragmentActivity { 
     * @param message The string content should be displayed in the progress dialog.

     */

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

        if (updateIfNeeded) {

            setProgressState(PROGRESS_IS_SHOWING);

        }

    }



    /** Dismisses the loading dialog. */

    protected void dismissProgressDialog() {

src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc 
                showProgressDialog(

                        getString(

                                R.string.sim_action_switch_sub_dialog_progress,

                                SubscriptionUtil.getUniqueSubscriptionDisplayName(

                                        mSubInfo, this)));

                                SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this)),

                        removedSubInfo != null ? true : false);

                if (mIsEsimOperation) {

                    mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(),

                            UiccSlotUtil.INVALID_PORT_ID,