diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-30 14:59:20 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 14:59:22 +0000 |
| commit | 61a8a66ccac1de7e146344dd77c8be84aa8daf33 (patch) | |
| tree | dc2e8800f53fed13c633e6fd7332e4a452480a13 /java/src | |
| parent | ee4cc67e260a1d2397abd83820f72906c1871751 (diff) | |
| parent | 3558505bee4c5254ee31cb0101b0a5d8d44a46cd (diff) | |
| download | latinime-61a8a66ccac1de7e146344dd77c8be84aa8daf33.tar.gz latinime-61a8a66ccac1de7e146344dd77c8be84aa8daf33.tar.xz latinime-61a8a66ccac1de7e146344dd77c8be84aa8daf33.zip | |
Merge "Workaround to draw spacebar icon of emoji palettes" into lmp-preview-dev
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/emoji/EmojiLayoutParams.java | 7 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiLayoutParams.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiLayoutParams.java index fbc12829f..582e09124 100644 --- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiLayoutParams.java +++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiLayoutParams.java @@ -19,7 +19,6 @@ package com.android.inputmethod.keyboard.emoji; import android.content.res.Resources; import android.support.v4.view.ViewPager; import android.view.View; -import android.widget.ImageView; import android.widget.LinearLayout; import com.android.inputmethod.latin.R; @@ -84,10 +83,10 @@ final class EmojiLayoutParams { ll.setLayoutParams(lp); } - public void setKeyProperties(final ImageView ib) { - final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) ib.getLayoutParams(); + public void setKeyProperties(final View v) { + final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) v.getLayoutParams(); lp.leftMargin = mKeyHorizontalGap / 2; lp.rightMargin = mKeyHorizontalGap / 2; - ib.setLayoutParams(lp); + v.setLayoutParams(lp); } } diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java index 7b4bd3d36..c0c9e205a 100644 --- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java +++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java @@ -75,7 +75,9 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange private ImageButton mDeleteKey; private TextView mAlphabetKeyLeft; private TextView mAlphabetKeyRight; - private ImageButton mSpacebar; + private View mSpacebar; + // TODO: Remove this workaround. + private View mSpacebarIcon; private TabHost mTabHost; private ViewPager mEmojiPager; private int mCurrentPagerPosition = 0; @@ -195,12 +197,13 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange mAlphabetKeyRight.setTag(Constants.CODE_ALPHA_FROM_EMOJI); mAlphabetKeyRight.setOnTouchListener(this); mAlphabetKeyRight.setOnClickListener(this); - mSpacebar = (ImageButton)findViewById(R.id.emoji_keyboard_space); + mSpacebar = findViewById(R.id.emoji_keyboard_space); mSpacebar.setBackgroundResource(mSpacebarBackgroundId); mSpacebar.setTag(Constants.CODE_SPACE); mSpacebar.setOnTouchListener(this); mSpacebar.setOnClickListener(this); mEmojiLayoutParams.setKeyProperties(mSpacebar); + mSpacebarIcon = findViewById(R.id.emoji_keyboard_space_icon); } @Override @@ -349,7 +352,8 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange } final int spacebarResId = iconSet.getIconResourceId(KeyboardIconsSet.NAME_SPACE_KEY); if (spacebarResId != 0) { - mSpacebar.setImageResource(spacebarResId); + // TODO: Remove this workaround to place the spacebar icon. + mSpacebarIcon.setBackgroundResource(spacebarResId); } final KeyDrawParams params = new KeyDrawParams(); params.updateParams(mEmojiLayoutParams.getActionBarHeight(), keyVisualAttr); |