satok 9c383385d5 Merge remote branch 'goog/master' into merge ...

Conflicts:
	java/src/com/android/inputmethod/latin/Settings.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/voice/VoiceIMEConnector.java

Change-Id: If30410c4814c3224f87698c165312494c0efca23

2011-01-19 20:33:55 +09:00

..

attrs.xml

Remove multi-tap feature

2010-12-20 21:58:31 +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

Simplify text correction settings in latin IME.

2011-01-19 20:08:46 +09:00

dimens.xml

Make input language selection settings work

2011-01-14 14:21:12 +09:00

donottranslate-altchars.xml

Add popupKeyboardTemplate attribute to Keyboard

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

Fix voice key on phone device

2010-12-06 12:29:59 +09:00

strings.xml

Merge remote branch 'goog/master' into merge

2011-01-19 20:33:55 +09:00

styles.xml

Move some inner static class to top class in new package

2010-12-02 20:06:01 +09:00