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

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

Browse Source 
* commit 'cd76b687ad4945c9e3bec5231144354a15d498f7':
  Dismiss dialogs properly on closing.
This commit is contained in:
Amith Yamasani
2011-11-15 13:07:16 -08:00
committed by Android Git Automerger
parent 054c763406 cd76b687ad
commit d2b1a76c66
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -584,7 +584,7 @@
<activity android:name="SettingsLicenseActivity" <activity android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title" 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"> android:configChanges="orientation|screenSize">
<intent-filter> <intent-filter>
<action android:name="android.settings.LICENSE" /> <action android:name="android.settings.LICENSE" />

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

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