commit 2fb112f142bdac2c7cb96da5f264b5575ce611e7
author Tadashi G. Takaoka <takaoka@google.com> Thu Sep 02 13:32:39 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 02 13:32:39 2010 -0700
tree da635ae1b1231131680e170ebe6d1f3f8ad3e5ec
parent 20052f34f987ab946d54cc405fa42cd0510fb94f
parent 7083b7486ec62ab06818e1bfbd0694d5f3563473

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

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());