diff options
author | zhuw <zhuw@codeaurora.org> | 2017-06-21 10:46:54 +0800 |
---|---|---|
committer | zhuw <zhuw@codeaurora.org> | 2017-06-28 15:30:31 +0800 |
commit | aa4c01f8912b8f76aa89b8f99ef708fe155b6a4a (patch) | |
tree | c0b2cb717ff8e3ffab30335d29939da554c9751f /src/com/android/gallery3d/ui | |
parent | acb1142fdf21ad30fe8575d8d0de9ae649ddaaa7 (diff) | |
download | android_packages_apps_Gallery2-aa4c01f8912b8f76aa89b8f99ef708fe155b6a4a.tar.gz android_packages_apps_Gallery2-aa4c01f8912b8f76aa89b8f99ef708fe155b6a4a.tar.bz2 android_packages_apps_Gallery2-aa4c01f8912b8f76aa89b8f99ef708fe155b6a4a.zip |
Fix crash when show dialog after onSaveInstanceState
1. add BaseDialogFragment and overwrite show(...)
2. modify some subclass of DialogFragment to extend BaseDialogFragment
Change-Id: Ic15d1d712f0fa08da741e22bec680d01c20a22cd
CRs-Fixed: 2062499
Diffstat (limited to 'src/com/android/gallery3d/ui')
-rw-r--r-- | src/com/android/gallery3d/ui/BaseDialogFragment.java | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/ui/BaseDialogFragment.java b/src/com/android/gallery3d/ui/BaseDialogFragment.java new file mode 100644 index 000000000..4fa9f23a7 --- /dev/null +++ b/src/com/android/gallery3d/ui/BaseDialogFragment.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2017, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.android.gallery3d.ui; + +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; + +public class BaseDialogFragment extends DialogFragment { + + @Override + public void show(FragmentManager manager, String tag) { + try { + super.show(manager, tag); + } catch(IllegalStateException e) { + FragmentTransaction transaction = manager.beginTransaction(); + transaction.add(this, tag); + transaction.commitAllowingStateLoss(); + } + } + + @Override + public int show(FragmentTransaction transaction, String tag) { + try { + return super.show(transaction, tag); + } catch (IllegalStateException e) { + transaction.add(this, tag); + return transaction.commitAllowingStateLoss(); + } + } +} |