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

Merge "Dismiss dialogs properly on closing." into ics-mr1

Browse Source
This commit is contained in:
Amith Yamasani
2011-11-15 10:12:32 -08:00
committed by Android (Google) Code Review
parent 9e2e24202d c101d2d3ba
commit cd76b687ad
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/SettingsLicenseActivity.java
View File

@@ -173,10 +173,13 @@ public class SettingsLicenseActivity extends Activity {
@Override
protected void onDestroy() {
super.onDestroy();
if (mTextDlg != null) {
if (mTextDlg != null && mTextDlg.isShowing()) {
mTextDlg.dismiss();
}
if (mSpinnerDlg != null && mSpinnerDlg.isShowing()) {
mSpinnerDlg.dismiss();
}
super.onDestroy();
}
private void showPageOfText(String text) {
@@ -200,9 +203,7 @@ public class SettingsLicenseActivity extends Activity {
@Override
public void onPageFinished(WebView view, String url) {
mSpinnerDlg.dismiss();
mSpinnerDlg = null;
mTextDlg.show();
mTextDlg = null;
}
});