| commit | 4621b6155ce43d91ccf46bf180cc3480b0491c8b | [log] [tgz] |
|---|---|---|
| author | Tony Mantler <nicoya@google.com> | Mon Jan 04 17:25:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 04 17:25:07 2016 +0000 |
| tree | e22bc9d0ff5e8a02ca59d3f774033f7ceee7ae17 | |
| parent | 478906d0119d7051e93e745a85ff8e3e50fd394e [diff] | |
| parent | eef0bfaec211fdfb0fdf52bc0a591707a4731a35 [diff] |
Merge "Fix preference dialog double-creation" into mnc-ub-dev am: a038569b5d am: eef0bfaec2 * commit 'eef0bfaec211fdfb0fdf52bc0a591707a4731a35': Fix preference dialog double-creation
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; } /**