diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 08:36:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-19 08:36:58 -0700 |
| commit | 39ccc0811fad542fdce8e8226d90c219dec7e451 (patch) | |
| tree | 3b35e370461f98bef51a0e571d81d519976b4715 /core/java/android/preference | |
| parent | 1dab0e4355c612d28ab75b9ef12f769d73703ee0 (diff) | |
| parent | 56d4bcd85cbe7092dd26b03ecea413d4ccefff18 (diff) | |
| download | frameworks_base-39ccc0811fad542fdce8e8226d90c219dec7e451.zip frameworks_base-39ccc0811fad542fdce8e8226d90c219dec7e451.tar.gz frameworks_base-39ccc0811fad542fdce8e8226d90c219dec7e451.tar.bz2 | |
am 56d4bcd8: am 627356ce: am d6c0bb0f: merge from open-source master
Diffstat (limited to 'core/java/android/preference')
| -rw-r--r-- | core/java/android/preference/DialogPreference.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/preference/DialogPreference.java b/core/java/android/preference/DialogPreference.java index cc48aeb..bbad2b6 100644 --- a/core/java/android/preference/DialogPreference.java +++ b/core/java/android/preference/DialogPreference.java @@ -33,7 +33,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.view.inputmethod.InputMethodManager; import android.widget.TextView; /** @@ -275,7 +274,7 @@ public abstract class DialogPreference extends Preference implements protected void showDialog(Bundle state) { Context context = getContext(); - mWhichButtonClicked = DialogInterface.BUTTON2; + mWhichButtonClicked = DialogInterface.BUTTON_NEGATIVE; mBuilder = new AlertDialog.Builder(context) .setTitle(mDialogTitle) |