Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c101d2d3 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Dismiss dialogs properly on closing.

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

Bug: 5572140
Change-Id: I67b31f0682f189c7075011e0dd0660b0fbc543d9
parent 4b94e073
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,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" />
+5 −4
Original line number Diff line number Diff line
@@ -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;
            }
        });