commit efabc4eb52154906093cf906f1d0f6e22313629f
author Tadashi G. Takaoka <takaoka@google.com> Thu Sep 02 13:35:17 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 02 13:35:17 2010 -0700
tree 92b9831d5769c3fc4e61b1172b6059d1219905a3
parent 539fb1bc67f3f7e3a872c431656b2c21442fa7d3
parent 2fb112f142bdac2c7cb96da5f264b5575ce611e7

am 2fb112f1: am 7083b748: Propagate preview enable attribute to mini-keyboard

Merge commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7'

* commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7':
  Propagate preview enable attribute to mini-keyboard

java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
index ab1789f..805bc2d 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
@@ -1054,6 +1054,7 @@
             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());