summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-11-11 09:06:02 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-11 09:06:02 -0800
commitf8d2aff41d347e029c9c0b1f51f20c92cd1cce8e (patch)
tree831afbcb012d39c0260b8e77458379f60d1d878a /core/java/android/preference
parent1ed7d65b5d781d10de91a199fbd94d6d445d1def (diff)
parentdb65907a2148f053e51f941979f0f7694acd5923 (diff)
downloadframeworks_base-f8d2aff41d347e029c9c0b1f51f20c92cd1cce8e.zip
frameworks_base-f8d2aff41d347e029c9c0b1f51f20c92cd1cce8e.tar.gz
frameworks_base-f8d2aff41d347e029c9c0b1f51f20c92cd1cce8e.tar.bz2
am db65907a: Merge "Adding pan behavior on preference dialog."
* commit 'db65907a2148f053e51f941979f0f7694acd5923': 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);
}
/**