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

AndroidManifest.xml

@@ -584,7 +584,7 @@
 
         <activity android:name="SettingsLicenseActivity"
                 android:label="@string/settings_license_activity_title"
-                android:theme="@*android:style/Theme.Holo.Dialog.Alert"
+                android:theme="@android:style/Theme.Holo.Panel"
                 android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.settings.LICENSE" />

src/com/android/settings/SettingsLicenseActivity.java

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