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

Commit a1e66c3a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c0 am: 02701dd8 

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



Change-Id: I67259014672c0cac5375b25d6c05a73b5ffc30da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 106834ef 02701dd8

src/com/android/settings/ResetNetworkConfirm.java

+10 −1
Original line number Diff line number Diff line
@@ -150,7 +150,10 @@ public class ResetNetworkConfirm extends InstrumentedFragment { 


        @Override

        protected void onPostExecute(Boolean succeeded) {

            if (mProgressDialog != null && mProgressDialog.isShowing()) {

                mProgressDialog.dismiss();

            }



            if (succeeded) {

                Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)

                        .show();
@@ -189,6 +192,12 @@ public class ResetNetworkConfirm extends InstrumentedFragment { 
                }

            }



            // Should dismiss the progress dialog firstly if it is showing

            // Or not the progress dialog maybe not dismissed in fast clicking.

            if (mProgressDialog != null && mProgressDialog.isShowing()) {

                mProgressDialog.dismiss();

            }



            mProgressDialog = getProgressDialog(mActivity);

            mProgressDialog.show();