diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-05-17 09:57:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-17 09:57:38 -0700 |
| commit | e43e08bb24f1ecb85c2f045ae66799f23588de43 (patch) | |
| tree | ba8400fb0b055f5bef978f29c417d0c6966d71e7 /core/java | |
| parent | d88404d0a1991a13cce9d5e55e4314828839311d (diff) | |
| parent | ade026f749af1871563417e323684c02a55edc4e (diff) | |
Merge "Avoid launching dialogs twice from double-clicking a preference." into jb-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/preference/DialogPreference.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/preference/DialogPreference.java b/core/java/android/preference/DialogPreference.java index c59ed18184c7..a643c8a578e9 100644 --- a/core/java/android/preference/DialogPreference.java +++ b/core/java/android/preference/DialogPreference.java @@ -261,6 +261,8 @@ public abstract class DialogPreference extends Preference implements @Override protected void onClick() { + if (mDialog != null && mDialog.isShowing()) return; + showDialog(null); } |