satok a7ea6cad82 Merge remote branch 'goog/master' into merge ...

Conflicts:
	java/res/xml/method.xml
	java/src/com/android/inputmethod/latin/LatinIME.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/voice/VoiceIMEConnector.java

Change-Id: I9b62da120dcc08327fde92459ee5c7564a5eb6b8

2011-02-10 17:31:37 +09:00

..

kbd_azerty_rows.xml

Add tablet keyboards supported in Gingerbread

2011-01-27 15:21:01 +09:00

kbd_key_styles.xml

Remove multi-tap feature

2010-12-20 21:58:31 +09:00

kbd_number.xml

Remove multi-tap feature

2010-12-20 21:58:31 +09:00

kbd_numkey_styles.xml

Remove multi-tap feature

2010-12-20 21:58:31 +09:00

kbd_phone_symbols.xml

Remove multi-tap feature

2010-12-20 21:58:31 +09:00

kbd_phone.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_popup_narrow_template.xml

Support keyboardHeight and maxKeyboardHeight to Keyboard XML

2010-12-08 17:43:29 +09:00

kbd_popup_template.xml

Support keyboardHeight and maxKeyboardHeight to Keyboard XML

2010-12-08 17:43:29 +09:00

kbd_qwerty_black_symbol.xml

Remove multi-tap feature

2010-12-20 21:58:31 +09:00

kbd_qwerty_f1.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_qwerty_row1.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_qwerty_row2.xml

Add tablet keyboards supported in Gingerbread

2011-01-27 15:21:01 +09:00

kbd_qwerty_row3.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_qwerty_row4.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_qwerty_rows_scandinavia.xml

Add tablet keyboards supported in Gingerbread

2011-01-27 15:21:01 +09:00

kbd_qwerty_rows.xml

Support de,fr locale keyboard layouts for tablet

2010-12-01 10:17:16 +09:00

kbd_qwerty.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_qwertz_rows.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_ru_rows.xml

Add tablet keyboards supported in Gingerbread

2011-01-27 15:21:01 +09:00

kbd_sr_rows.xml

Add tablet keyboards supported in Gingerbread

2011-01-27 15:21:01 +09:00

kbd_symbols_f1.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_symbols_row4.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_symbols_shift_row4.xml

Support <key-style/> and keyStyle attribute for Keyboard XML

2010-11-22 18:33:47 -08:00

kbd_symbols_shift.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +09:00

kbd_symbols.xml

Add popupKeyboardTemplate attribute to Keyboard

2010-12-17 17:18:28 +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

Disable shortcut key when network is not available

2011-01-26 17:07:55 +09:00

prefs_for_debug.xml

Add config_default_keyboard_theme_id resource

2010-12-28 21:06:45 +09:00

prefs.xml

Merge remote branch 'goog/master' into merge

2011-02-10 17:31:37 +09:00