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

Commit cd76b687 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

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

parents 9e2e2420 c101d2d3

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

+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;

            }

        });