diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-09 20:59:33 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 20:59:33 -0700 |
| commit | 9eb2acc7e5933738550a3d5398e0ca223190b6fe (patch) | |
| tree | cdce002a9c1ef116946287e66490d2e700ca3d8e /java | |
| parent | dd53038e4e3a75f59755793e4a6fa67d4618c1e8 (diff) | |
| parent | 6a83a87569dba536f47e61cff0e15437c85c5595 (diff) | |
| download | latinime-9eb2acc7e5933738550a3d5398e0ca223190b6fe.tar.gz latinime-9eb2acc7e5933738550a3d5398e0ca223190b6fe.tar.xz latinime-9eb2acc7e5933738550a3d5398e0ca223190b6fe.zip | |
am 6a83a875: am 47462172: Enter -> Alpha keyboard switcher in Emoji palette view
* commit '6a83a87569dba536f47e61cff0e15437c85c5595':
Enter -> Alpha keyboard switcher in Emoji palette view
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/layout/emoji_palettes_view.xml | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml index 613332675..1c6da90ba 100644 --- a/java/res/layout/emoji_palettes_view.xml +++ b/java/res/layout/emoji_palettes_view.xml @@ -101,10 +101,10 @@ android:layout_weight="0.70" android:layout_height="match_parent" /> <ImageButton - android:id="@+id/emoji_keyboard_send" + android:id="@+id/emoji_keyboard_alphabet2" android:layout_width="0dip" android:layout_weight="0.15" android:layout_height="match_parent" - android:src="@drawable/sym_keyboard_return_holo_dark" /> + android:src="@drawable/ic_ime_switcher_dark" /> </LinearLayout> </com.android.inputmethod.keyboard.EmojiPalettesView> diff --git a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java index 46e72bf95..85ae50092 100644 --- a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java +++ b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java @@ -484,10 +484,10 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange spaceKey.setTag(Constants.CODE_SPACE); spaceKey.setOnClickListener(this); emojiLp.setKeyProperties(spaceKey); - final ImageView sendKey = (ImageView)findViewById(R.id.emoji_keyboard_send); - sendKey.setBackgroundResource(mEmojiFunctionalKeyBackgroundId); - sendKey.setTag(Constants.CODE_ENTER); - sendKey.setOnClickListener(this); + final ImageView alphabetKey2 = (ImageView)findViewById(R.id.emoji_keyboard_alphabet2); + alphabetKey2.setBackgroundResource(mEmojiFunctionalKeyBackgroundId); + alphabetKey2.setTag(Constants.CODE_SWITCH_ALPHA_SYMBOL); + alphabetKey2.setOnClickListener(this); } @Override |