Ken Wakasa 39004972b1 resolved conflicts for merge of fd64e47c to master ...

Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085

2010-10-12 03:15:36 +09:00

..

AutoDictionary.java

DO NOT MERGE. Backport LatinIME from master to Gingerbread

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

BaseKeyboard.java

Keyboard XML file supports include and merge tag

2010-10-07 23:51:38 +09:00

BinaryDictionary.java

Clean up LatinIME java

2010-08-24 12:40:00 +09:00

CandidateView.java

Dismiss orange highlight after suggestion has been selected

2010-10-01 12:55:34 +09:00

ContactsDictionary.java

Fix LatinIME crashing due to crash in Contacts DB

2010-08-20 20:12:39 +09:00

Dictionary.java

DO NOT MERGE. Backport LatinIME from master to Gingerbread

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

EditingUtil.java

Correction improvements - use the new InputConnection APIs for underlining and

2010-09-01 14:16:50 -07:00

ExpandableDictionary.java

DO NOT MERGE. Backport LatinIME from master to Gingerbread

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

Hints.java

More commit -> apply changes with SharedPreferencesCompat.

2010-09-13 00:50:48 +09:00

InputLanguageSelection.java

More commit -> apply changes with SharedPreferencesCompat.

2010-09-13 00:50:48 +09:00

KeyboardSwitcher.java

Make sure to set symbol keyboard shifted

2010-10-09 02:39:39 +09:00

KeyDetector.java

Unbundle Keyboard.java to BaseKeyboard.java

2010-10-02 00:02:00 +09:00

LanguageSwitcher.java

More commit -> apply changes with SharedPreferencesCompat.

2010-09-13 00:50:48 +09:00

LatinIME.java

am 938c0a37: am 364da8c6: Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.

2010-10-11 10:42:25 -07:00

LatinIMEBackupAgent.java

Clean up LatinIME java

2010-08-24 12:40:00 +09:00

LatinIMEDebugSettings.java

Add Debug Settings Activity

2010-09-27 14:07:10 +09:00

LatinImeLogger.java

Unbundle Keyboard.java to BaseKeyboard.java

2010-10-02 00:02:00 +09:00

LatinIMESettings.java

Add an auto complete's threshold option.

2010-10-05 14:44:00 +09:00

LatinIMEUtil.java

Add an auto complete's threshold option.

2010-10-05 14:44:00 +09:00

LatinKeyboard.java

Add keyHintIcon attribute to BaseKeyboard.Key class

2010-10-05 20:28:04 +09:00

LatinKeyboardBaseView.java

resolved conflicts for merge of fd64e47c to master

2010-10-12 03:15:36 +09:00

LatinKeyboardView.java

Add keyHintIcon attribute to BaseKeyboard.Key class

2010-10-05 20:28:04 +09:00

MiniKeyboardKeyDetector.java

Unbundle Keyboard.java to BaseKeyboard.java

2010-10-02 00:02:00 +09:00

ModifierKeyState.java

Queuing PointerTracker to support n-key roll-over and shift modifier.

2010-09-02 16:03:46 +09:00

PointerTracker.java

Fix merge that should have been manually merged

2010-10-10 17:15:21 -07:00

ProximityKeyDetector.java

Unbundle Keyboard.java to BaseKeyboard.java

2010-10-02 00:02:00 +09:00

SharedPreferencesCompat.java

Eliminate compiler warning

2010-09-30 12:43:43 +09:00

Suggest.java

Add an auto complete's threshold option.

2010-10-05 14:44:00 +09:00

SwipeTracker.java

Remove unused import statement

2010-08-27 11:11:05 +09:00

TextEntryState.java

Unbundle Keyboard.java to BaseKeyboard.java

2010-10-02 00:02:00 +09:00

Tutorial.java

Clean up LatinIME java

2010-08-24 12:40:00 +09:00

UserBigramDictionary.java

Clean up LatinIME java

2010-08-24 12:40:00 +09:00

UserDictionary.java

Keep addWordToDictionary from doing disk I/O on main thread

2010-09-25 00:14:24 +09:00

WordComposer.java

Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case

2010-09-28 01:15:11 +09:00