diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 08:35:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-19 08:35:16 -0700 |
| commit | 56d4bcd85cbe7092dd26b03ecea413d4ccefff18 (patch) | |
| tree | 8e0e58c9124fd384217fc74851114ddb8a66c329 /core/java/android | |
| parent | 6e7cad67a9148944b3b9b22cafa0f95452e62381 (diff) | |
| parent | 627356cee467fad0335b2bc8cc058a3784f0bf63 (diff) | |
am 627356ce: am d6c0bb0f: merge from open-source master
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/preference/DialogPreference.java | 3 | ||||
| -rw-r--r-- | core/java/android/widget/Gallery.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/preference/DialogPreference.java b/core/java/android/preference/DialogPreference.java index cc48aeb70844..bbad2b6d432c 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) diff --git a/core/java/android/widget/Gallery.java b/core/java/android/widget/Gallery.java index f34823cb484a..1ed6b166ee04 100644 --- a/core/java/android/widget/Gallery.java +++ b/core/java/android/widget/Gallery.java @@ -1087,7 +1087,7 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList @Override public boolean dispatchKeyEvent(KeyEvent event) { // Gallery steals all key events - return event.dispatch(this); + return event.dispatch(this, null, null); } /** |