aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2010-09-02 13:35:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-02 13:35:17 -0700
commitefabc4eb52154906093cf906f1d0f6e22313629f (patch)
tree92b9831d5769c3fc4e61b1172b6059d1219905a3 /java/src
parent539fb1bc67f3f7e3a872c431656b2c21442fa7d3 (diff)
parent2fb112f142bdac2c7cb96da5f264b5575ce611e7 (diff)
downloadlatinime-efabc4eb52154906093cf906f1d0f6e22313629f.tar.gz
latinime-efabc4eb52154906093cf906f1d0f6e22313629f.tar.xz
latinime-efabc4eb52154906093cf906f1d0f6e22313629f.zip
am 2fb112f1: am 7083b748: Propagate preview enable attribute to mini-keyboard
Merge commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7' * commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7': 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());