diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2014-09-02 12:31:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-02 12:31:19 +0000 |
| commit | 3ad86d91f1e3d251635303e0fb9a83dce22efa3a (patch) | |
| tree | 54654397b921a214b48c0c1da6405c9e18e75b17 /java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | |
| parent | 3e9bbf17350d385352e62ce2326ad5898619fb88 (diff) | |
| parent | afa9d6d8de0c52584465a5454b69540e529bb249 (diff) | |
am afa9d6d8: Merge "Add theme aware key popup preview animation" into lmp-dev
* commit 'afa9d6d8de0c52584465a5454b69540e529bb249':
Add theme aware key popup preview animation
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index e952f02f7..ec089f7eb 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -153,9 +153,12 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { mCurrentSettingsValues.mKeyPreviewPopupOn, mCurrentSettingsValues.mKeyPreviewPopupDismissDelay); keyboardView.setKeyPreviewAnimationParams( - mCurrentSettingsValues.mKeyPreviewShowUpStartScale, + mCurrentSettingsValues.mHasCustomKeyPreviewAnimationParams, + mCurrentSettingsValues.mKeyPreviewShowUpStartXScale, + mCurrentSettingsValues.mKeyPreviewShowUpStartYScale, mCurrentSettingsValues.mKeyPreviewShowUpDuration, - mCurrentSettingsValues.mKeyPreviewDismissEndScale, + mCurrentSettingsValues.mKeyPreviewDismissEndXScale, + mCurrentSettingsValues.mKeyPreviewDismissEndYScale, mCurrentSettingsValues.mKeyPreviewDismissDuration); keyboardView.updateShortcutKey(mSubtypeSwitcher.isShortcutImeReady()); final boolean subtypeChanged = (oldKeyboard == null) |