summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2015-08-14 01:24:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-14 01:24:44 +0000
commitb6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a (patch)
tree8e0ef45345364febb8efc2937ceb37a9cf8f2f54
parent672c0a75d3905825365394d174b983dc5e796cf3 (diff)
parentcfcf6af915bee878bdaea04f48592bbbe506ad26 (diff)
downloadframeworks_base-b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a.zip
frameworks_base-b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a.tar.gz
frameworks_base-b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a.tar.bz2
am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
* commit 'cfcf6af915bee878bdaea04f48592bbbe506ad26': Method to show DialogFragment allowing state loss.
-rw-r--r--core/java/android/app/DialogFragment.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/app/DialogFragment.java b/core/java/android/app/DialogFragment.java
index 2fb8cc2..9caf752 100644
--- a/core/java/android/app/DialogFragment.java
+++ b/core/java/android/app/DialogFragment.java
@@ -230,6 +230,15 @@ public class DialogFragment extends Fragment
ft.commit();
}
+ /** {@hide} */
+ public void showAllowingStateLoss(FragmentManager manager, String tag) {
+ mDismissed = false;
+ mShownByMe = true;
+ FragmentTransaction ft = manager.beginTransaction();
+ ft.add(this, tag);
+ ft.commitAllowingStateLoss();
+ }
+
/**
* Display the dialog, adding the fragment using an existing transaction
* and then committing the transaction.