satok a511e0b432 Merge remote branch 'goog/master' into merge ... Conflicts: java/res/xml/method.xml java/src/com/android/inputmethod/deprecated/VoiceProxy.java java/src/com/android/inputmethod/keyboard/KeyboardId.java java/src/com/android/inputmethod/latin/BinaryDictionary.java java/src/com/android/inputmethod/latin/LatinIME.java java/src/com/android/inputmethod/latin/Settings.java java/src/com/android/inputmethod/latin/SubtypeSwitcher.java java/src/com/android/inputmethod/latin/Utils.java Change-Id: Ic102a0fbfc3b8f9dd65dd6eabb421f9211f5d9a5		2011-03-25 15:17:08 -07:00
..
attrs.xml	Add countryCode attribute to case tag of Keyboard	2011-02-23 17:09:24 +09:00
bools.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
colors.xml	Change suggestion & bold colors	2010-09-16 16:36:41 +09:00
config.xml	Introduce timeout for "." shortcut	2011-03-01 23:57:51 -08:00
dimens.xml	Revert "Implement callback to handle touch event outside SoftInputWindow"	2011-01-25 19:27:10 +09:00
donottranslate-altchars.xml	Dynamic currency key label	2011-02-24 16:47:25 +09:00
donottranslate.xml	Add SubtypeLocale class	2011-01-14 16:12:36 +09:00
durations.xml	Don't let the native code target be included twice when unbundling.	2010-03-09 15:01:09 -08:00
keycodes.xml	Added support for speaking keys through accessibility service.	2011-02-23 18:16:43 -08:00
strings.xml	Merge remote branch 'goog/master' into merge	2011-03-25 15:17:08 -07:00
styles.xml	Move some inner static class to top class in new package	2010-12-02 20:06:01 +09:00
whitelist.xml	Add whitelist dictionary	2011-03-08 11:29:10 +09:00