nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 61a8a66c: Merge "Workaround to draw spacebar icon of emoji palettes" into lmp-preview-dev 

* commit '61a8a66ccac1de7e146344dd77c8be84aa8daf33':
  Workaround to draw spacebar icon of emoji palettes
main
Tadashi G. Takaoka 2014-05-30 15:03:10 +00:00 committed by Android Git Automerger
parent dc1d4455fe 61a8a66cca
commit 509d07c764
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/res/layout/emoji_palettes_view.xml
View File

@ -61,6 +61,7 @@
android:layout_width="2dip" android:layout_width="2dip"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/suggestions_strip_divider" /> android:background="@drawable/suggestions_strip_divider" />
<!-- TODO: Implement KeyView and replace this. -->
<ImageButton <ImageButton
android:id="@+id/emoji_keyboard_delete" android:id="@+id/emoji_keyboard_delete"
android:layout_width="0dip" android:layout_width="0dip"
@ -83,18 +84,30 @@
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1"
> >
<!-- TODO: Implement a KeyView and replace this. -->
<TextView <TextView
android:id="@+id/emoji_keyboard_alphabet_left" android:id="@+id/emoji_keyboard_alphabet_left"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_weight="0.15" android:layout_weight="0.15"
android:gravity="center" android:gravity="center"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<ImageButton <!-- TODO: Implement KeyView and replace this. -->
<RelativeLayout
android:id="@+id/emoji_keyboard_space" android:id="@+id/emoji_keyboard_space"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_weight="0.70" android:layout_weight="0.70"
android:layout_height="match_parent" android:layout_height="match_parent"
android:contentDescription="@string/spoken_description_space"/> android:contentDescription="@string/spoken_description_space">
<!-- WORKAROUND: Show the spacebar icon as a bacground of this View. -->
<View
android:id="@+id/emoji_keyboard_space_icon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_centerInParent="true" />
</RelativeLayout>
<!-- TODO: Implement KeyView and replace this. -->
<TextView <TextView
android:id="@+id/emoji_keyboard_alphabet_right" android:id="@+id/emoji_keyboard_alphabet_right"
android:layout_width="0dip" android:layout_width="0dip"

7
java/src/com/android/inputmethod/keyboard/emoji/EmojiLayoutParams.java
View File

@ -19,7 +19,6 @@ package com.android.inputmethod.keyboard.emoji;
import android.content.res.Resources; import android.content.res.Resources;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.view.View; import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.R;
@ -84,10 +83,10 @@ final class EmojiLayoutParams {
ll.setLayoutParams(lp); ll.setLayoutParams(lp);
} }
public void setKeyProperties(final ImageView ib) { public void setKeyProperties(final View v) {
final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) ib.getLayoutParams(); final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) v.getLayoutParams();
lp.leftMargin = mKeyHorizontalGap / 2; lp.leftMargin = mKeyHorizontalGap / 2;
lp.rightMargin = mKeyHorizontalGap / 2; lp.rightMargin = mKeyHorizontalGap / 2;
ib.setLayoutParams(lp); v.setLayoutParams(lp);
} }
} }

10
java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java
View File

@ -81,7 +81,9 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
private ImageButton mDeleteKey; private ImageButton mDeleteKey;
private TextView mAlphabetKeyLeft; private TextView mAlphabetKeyLeft;
private TextView mAlphabetKeyRight; private TextView mAlphabetKeyRight;
private ImageButton mSpacebar; private View mSpacebar;
// TODO: Remove this workaround.
private View mSpacebarIcon;
private TabHost mTabHost; private TabHost mTabHost;
private ViewPager mEmojiPager; private ViewPager mEmojiPager;
private int mCurrentPagerPosition = 0; private int mCurrentPagerPosition = 0;
@ -221,12 +223,13 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
mAlphabetKeyRight.setTag(Constants.CODE_ALPHA_FROM_EMOJI); mAlphabetKeyRight.setTag(Constants.CODE_ALPHA_FROM_EMOJI);
mAlphabetKeyRight.setOnTouchListener(this); mAlphabetKeyRight.setOnTouchListener(this);
mAlphabetKeyRight.setOnClickListener(this); mAlphabetKeyRight.setOnClickListener(this);
mSpacebar = (ImageButton)findViewById(R.id.emoji_keyboard_space); mSpacebar = findViewById(R.id.emoji_keyboard_space);
mSpacebar.setBackgroundResource(mSpacebarBackgroundId); mSpacebar.setBackgroundResource(mSpacebarBackgroundId);
mSpacebar.setTag(Constants.CODE_SPACE); mSpacebar.setTag(Constants.CODE_SPACE);
mSpacebar.setOnTouchListener(this); mSpacebar.setOnTouchListener(this);
mSpacebar.setOnClickListener(this); mSpacebar.setOnClickListener(this);
mEmojiLayoutParams.setKeyProperties(mSpacebar); mEmojiLayoutParams.setKeyProperties(mSpacebar);
mSpacebarIcon = findViewById(R.id.emoji_keyboard_space_icon);
} }
@Override @Override
@ -375,7 +378,8 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
} }
final int spacebarResId = iconSet.getIconResourceId(KeyboardIconsSet.NAME_SPACE_KEY); final int spacebarResId = iconSet.getIconResourceId(KeyboardIconsSet.NAME_SPACE_KEY);
if (spacebarResId != 0) { if (spacebarResId != 0) {
mSpacebar.setImageResource(spacebarResId); // TODO: Remove this workaround to place the spacebar icon.
mSpacebarIcon.setBackgroundResource(spacebarResId);
} }
final KeyDrawParams params = new KeyDrawParams(); final KeyDrawParams params = new KeyDrawParams();
params.updateParams(mEmojiLayoutParams.getActionBarHeight(), keyVisualAttr); params.updateParams(mEmojiLayoutParams.getActionBarHeight(), keyVisualAttr);