aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2010-09-02 13:32:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-02 13:32:39 -0700
commit2fb112f142bdac2c7cb96da5f264b5575ce611e7 (patch)
treeda635ae1b1231131680e170ebe6d1f3f8ad3e5ec /java/src
parent20052f34f987ab946d54cc405fa42cd0510fb94f (diff)
parent7083b7486ec62ab06818e1bfbd0694d5f3563473 (diff)
downloadlatinime-2fb112f142bdac2c7cb96da5f264b5575ce611e7.tar.gz
latinime-2fb112f142bdac2c7cb96da5f264b5575ce611e7.tar.xz
latinime-2fb112f142bdac2c7cb96da5f264b5575ce611e7.zip
am 7083b748: Propagate preview enable attribute to mini-keyboard
Merge commit '7083b7486ec62ab06818e1bfbd0694d5f3563473' into gingerbread-plus-aosp * commit '7083b7486ec62ab06818e1bfbd0694d5f3563473': Propagate preview enable attribute to mini-keyboard
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
index ab1789ffe..805bc2d6b 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
@@ -1054,6 +1054,7 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
mMiniKeyboardOriginY = y + mMiniKeyboardContainer.getPaddingTop();
mMiniKeyboard.setPopupOffset((x < 0) ? 0 : x, y);
mMiniKeyboard.setShifted(isShifted());
+ mMiniKeyboard.setPreviewEnabled(isPreviewEnabled());
mMiniKeyboardPopup.setContentView(mMiniKeyboardContainer);
mMiniKeyboardPopup.setWidth(mMiniKeyboardContainer.getMeasuredWidth());
mMiniKeyboardPopup.setHeight(mMiniKeyboardContainer.getMeasuredHeight());