| commit | 8d190e6e4193ae5b4c3ab01e3fbf342587d78498 | [log] [tgz] |
|---|---|---|
| author | Tony Mantler <nicoya@google.com> | Fri Dec 18 14:29:56 2015 -0800 |
| committer | Tony Mantler <nicoya@google.com> | Fri Dec 18 22:32:20 2015 +0000 |
| tree | 3142c60235480b0bb75c8484e7ff34e9e6ee3d99 | |
| parent | e65fd835c5d97f32467b4873172f13341c29b257 [diff] |
Fix preference dialog double-creation Change-Id: I93aba64c2262c7b9e77265eeefd3bcd5a428ba48
diff --git a/v14/preference/src/android/support/v14/preference/PreferenceDialogFragment.java b/v14/preference/src/android/support/v14/preference/PreferenceDialogFragment.java index b9027a4..8f5dd64 100644 --- a/v14/preference/src/android/support/v14/preference/PreferenceDialogFragment.java +++ b/v14/preference/src/android/support/v14/preference/PreferenceDialogFragment.java
@@ -87,8 +87,7 @@ requestInputMethod(dialog); } - - return builder.create(); + return dialog; } /**
diff --git a/v7/preference/src/android/support/v7/preference/PreferenceDialogFragmentCompat.java b/v7/preference/src/android/support/v7/preference/PreferenceDialogFragmentCompat.java index f96d2ce..6bc2df0 100644 --- a/v7/preference/src/android/support/v7/preference/PreferenceDialogFragmentCompat.java +++ b/v7/preference/src/android/support/v7/preference/PreferenceDialogFragmentCompat.java
@@ -85,8 +85,7 @@ requestInputMethod(dialog); } - - return builder.create(); + return dialog; } /**