summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-11-11 09:10:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-11 09:10:51 -0800
commit8bda1c1ef76618ec3e4bd7bb9db44dd325edc629 (patch)
treec4b4db3fbcbc5b45c907d16283b2e7938530e46e /core/java/android/preference
parentb38caa5536d3db99f97ef3755ecd42e098cbbf9f (diff)
parentf8d2aff41d347e029c9c0b1f51f20c92cd1cce8e (diff)
downloadframeworks_base-8bda1c1ef76618ec3e4bd7bb9db44dd325edc629.zip
frameworks_base-8bda1c1ef76618ec3e4bd7bb9db44dd325edc629.tar.gz
frameworks_base-8bda1c1ef76618ec3e4bd7bb9db44dd325edc629.tar.bz2
am f8d2aff4: am db65907a: Merge "Adding pan behavior on preference dialog."
* commit 'f8d2aff41d347e029c9c0b1f51f20c92cd1cce8e': Adding pan behavior on preference dialog.
Diffstat (limited to 'core/java/android/preference')
-rw-r--r--core/java/android/preference/DialogPreference.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/preference/DialogPreference.java b/core/java/android/preference/DialogPreference.java
index bbad2b6..45c8174 100644
--- a/core/java/android/preference/DialogPreference.java
+++ b/core/java/android/preference/DialogPreference.java
@@ -322,7 +322,7 @@ public abstract class DialogPreference extends Preference implements
private void requestInputMethod(Dialog dialog) {
Window window = dialog.getWindow();
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE |
- WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+ WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
}
/**