satok e1cb2e4977 resolved conflicts for merge of 36d2d0e7 to master ...

Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12

2010-09-07 15:37:32 +09:00

..

azerty.xml

Don't let the native code target be included twice when unbundling.

2010-03-09 15:01:09 -08:00

dictionary.xml

DO NOT MERGE. Backport LatinIME from master to Gingerbread

2010-08-20 14:37:03 +09:00

kbd_phone_black.xml

Disable long-press on shift and symbol keys

2010-08-27 15:47:35 +09:00

kbd_phone_symbols_black.xml

Disable long-press on shift and symbol keys

2010-08-27 15:47:35 +09:00

kbd_phone_symbols.xml

Disable long-press on shift and symbol keys

2010-08-27 15:47:35 +09:00

kbd_phone.xml

Disable long-press on shift and symbol keys

2010-08-27 15:47:35 +09:00

kbd_popup_template.xml

Don't let the native code target be included twice when unbundling.

2010-03-09 15:01:09 -08:00

kbd_qwerty_black.xml

Fix layout issue of the bottom row in web entry mode

2010-09-05 22:26:55 +09:00

kbd_qwerty.xml

Add isModifier to the buttons in the lowest line

2010-09-07 14:57:49 +09:00

kbd_symbols_black.xml

Add settings button

2010-08-31 14:03:50 +09:00

kbd_symbols_shift_black.xml

Add settings button

2010-08-31 14:03:50 +09:00

kbd_symbols_shift.xml

Change background color for functional keys in LatinIME

2010-09-02 11:47:33 +09:00

kbd_symbols.xml

Change background color for functional keys in LatinIME

2010-09-02 11:47:33 +09:00

language_prefs.xml

Don't let the native code target be included twice when unbundling.

2010-03-09 15:01:09 -08:00

method.xml

Add subtype to method.xml

2010-08-19 20:02:00 +09:00

popup_domains.xml

Don't let the native code target be included twice when unbundling.

2010-03-09 15:01:09 -08:00

popup_punctuation.xml

Don't let the native code target be included twice when unbundling.

2010-03-09 15:01:09 -08:00

popup_smileys.xml

Don't let the native code target be included twice when unbundling.

2010-03-09 15:01:09 -08:00

prefs.xml

resolved conflicts for merge of 36d2d0e7 to master

2010-09-07 15:37:32 +09:00