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

Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1

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

Change-Id: I67259014672c0cac5375b25d6c05a73b5ffc30da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-04-08 10:41:07 +00:00
committed by Automerger Merge Worker
parent 106834efae 02701dd8b1
commit a1e66c3aca
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -150,7 +150,10 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
@Override @Override
protected void onPostExecute(Boolean succeeded) { protected void onPostExecute(Boolean succeeded) {
mProgressDialog.dismiss(); if (mProgressDialog != null && mProgressDialog.isShowing()) {
mProgressDialog.dismiss();
}
if (succeeded) { if (succeeded) {
Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT) Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
.show(); .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 = getProgressDialog(mActivity);
mProgressDialog.show(); mProgressDialog.show();