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

am 6a83a875: am 47462172: Enter -> Alpha keyboard switcher in Emoji palette view 

* commit '6a83a87569dba536f47e61cff0e15437c85c5595':
  Enter -> Alpha keyboard switcher in Emoji palette view
main
Satoshi Kataoka 2013-10-09 20:59:33 -07:00 committed by Android Git Automerger
parent dd53038e4e 6a83a87569
commit 9eb2acc7e5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,10 +101,10 @@
android:layout_weight="0.70" android:layout_weight="0.70"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<ImageButton <ImageButton
android:id="@+id/emoji_keyboard_send" android:id="@+id/emoji_keyboard_alphabet2"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_weight="0.15" android:layout_weight="0.15"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/sym_keyboard_return_holo_dark" /> android:src="@drawable/ic_ime_switcher_dark" />
</LinearLayout> </LinearLayout>
</com.android.inputmethod.keyboard.EmojiPalettesView> </com.android.inputmethod.keyboard.EmojiPalettesView>

8
java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
View File

@ -484,10 +484,10 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
spaceKey.setTag(Constants.CODE_SPACE); spaceKey.setTag(Constants.CODE_SPACE);
spaceKey.setOnClickListener(this); spaceKey.setOnClickListener(this);
emojiLp.setKeyProperties(spaceKey); emojiLp.setKeyProperties(spaceKey);
final ImageView sendKey = (ImageView)findViewById(R.id.emoji_keyboard_send); final ImageView alphabetKey2 = (ImageView)findViewById(R.id.emoji_keyboard_alphabet2);
sendKey.setBackgroundResource(mEmojiFunctionalKeyBackgroundId); alphabetKey2.setBackgroundResource(mEmojiFunctionalKeyBackgroundId);
sendKey.setTag(Constants.CODE_ENTER); alphabetKey2.setTag(Constants.CODE_SWITCH_ALPHA_SYMBOL);
sendKey.setOnClickListener(this); alphabetKey2.setOnClickListener(this);
} }
@Override @Override