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

Dismiss dialogs properly on closing.

Browse Source 
Also make the invisible activity truly invisible (was
showing a blue line behind the dialog).

Bug: 5572140
Change-Id: I67b31f0682f189c7075011e0dd0660b0fbc543d9
This commit is contained in:
Amith Yamasani
2011-11-11 13:25:07 -08:00
parent 4b94e07385
commit c101d2d3ba
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

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