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

Commit 32d7cd2f authored by jinwu's avatar jinwu Committed by Rajshekar Eashwarappa
Browse files

Fix the preset dialog showing error. 

When click the blank area to dismiss the dialog, it still need
to set mPresetDialog null.

Change-Id: I89f364b27cff5f9d105c021e4d1b3b6e1fdd58e2
CRs-Fixed: 2097627
parent ffbc6ec0

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -2335,12 +2335,14 @@ DialogInterface.OnDismissListener, PopupMenu.OnDismissListener{ 
        switch (newConfig.orientation) {

            case (Configuration.ORIENTATION_LANDSCAPE):

                if (mPresetDialog != null) {

                    mPresetDialog.setDismissFlag(false);

                    mPresetDialog.dismiss();

                    mPresetDialog.show(getSupportFragmentManager(), "NoticeDialogFragment");

                }

                break;

            case (Configuration.ORIENTATION_PORTRAIT):

                if (mPresetDialog != null) {

                    mPresetDialog.setDismissFlag(false);

                    mPresetDialog.dismiss();

                    mPresetDialog.show(getSupportFragmentManager(), "NoticeDialogFragment");

                }

src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java

+7 −7
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.gallery3d.util.GalleryUtils; 
public class PresetManagementDialog extends BaseDialogFragment implements View.OnClickListener {

    private CheckBox mCheckBox;

    private boolean checked;

    private boolean mDismissInternel = false;

    private boolean mDismissInternal = true;

    private DialogInterface.OnDismissListener mDialogDismissListener;



    @Override
@@ -62,14 +62,14 @@ public class PresetManagementDialog extends BaseDialogFragment implements View.O 
    @Override

    public void onDismiss(DialogInterface dialog) {

        super.onDismiss(dialog);

        if ((mDialogDismissListener != null) && mDismissInternel) {

        if ((mDialogDismissListener != null) && mDismissInternal) {

            mDialogDismissListener.onDismiss(dialog);

        }

        mDismissInternal = true;

    }



    public void dismissInternal() {

        mDismissInternel = true;

        dismiss();

    public void setDismissFlag(boolean isInternal) {

        mDismissInternal = isInternal;

    }



    @Override
@@ -77,13 +77,13 @@ public class PresetManagementDialog extends BaseDialogFragment implements View.O 
        FilterShowActivity activity = (FilterShowActivity) getActivity();

        switch (v.getId()) {

            case R.id.cancel:

                dismissInternal();

                dismiss();

                break;

            case R.id.ok:

                checked = mCheckBox.isChecked();

                GalleryUtils.setBooleanPref(activity,activity.getString(R.string.pref_filtergenerator_intro_show_key),checked);

                activity.onMediaPickerStarted ();

                dismissInternal();

                dismiss();

                break;

        }

    }