aboutsummaryrefslogtreecommitdiffstats
path: root/java/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'goog/master' into mergescriptpackageSatoshi Kataoka2012-11-06113-2053/+3505
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: java/res/values-ca/strings.xml java/res/values-cs/strings.xml java/res/values-de/strings.xml java/res/values-es/strings.xml java/res/values-hr/strings.xml java/res/values-hu/strings.xml java/res/values-it/strings.xml java/res/values-lv/strings.xml java/res/values-nb/strings.xml java/res/values-nl/strings.xml java/res/values-pl/strings.xml java/res/values-pt/strings.xml java/res/values-ro/strings.xml java/res/values-ru/strings.xml java/res/values-sv/strings.xml java/res/values-sw/strings.xml java/res/values-tr/strings.xml java/res/values-uk/strings.xml java/res/values-zh-rCN/strings.xml java/res/values-zh-rTW/strings.xml java/src/com/android/inputmethod/latin/RichInputConnection.java Change-Id: Iba00dd5b86cb16d72968bc7e40d75853845b6dcb
| * Merge "Cleanup logging code"Tadashi G. Takaoka2012-11-011-40/+41
| |\
| | * Cleanup logging codeTadashi G. Takaoka2012-11-011-40/+41
| | | | | | | | | | | | Change-Id: Ia604a4fcebfc5179bdbeaa982e052f7d3882ac6e
| * | Make sure PointerTrackerQueue is non-nullTadashi G. Takaoka2012-11-012-44/+23
| |/ | | | | | | Change-Id: I2106cf64bed1472fb39d24e7e5bdee7238a30bfe
| * Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulatorTadashi G. Takaoka2012-11-012-15/+15
| | | | | | | | Change-Id: Ia4fb5b3612ff78ed1b243c80a03294b829470f5c
| * Merge "Move isInvalidCordinates() method to Constants class"Tadashi G. Takaoka2012-10-313-14/+10
| |\
| | * Move isInvalidCordinates() method to Constants classTadashi G. Takaoka2012-11-013-14/+10
| | | | | | | | | | | | Change-Id: Iad1464c299ad6055af1db1ff7978e5cd9a14750f
| * | Merge "Cosmetic source code formating change"Tadashi G. Takaoka2012-10-313-34/+51
| |\ \
| | * | Cosmetic source code formating changeTadashi G. Takaoka2012-11-013-34/+51
| | |/ | | | | | | | | | Change-Id: I3a53b49afab70dfb13f12027070635da6001eb79
| * | Merge "Straighten an if-else-if blocks into if-return blocks"Tadashi G. Takaoka2012-10-311-28/+28
| |\ \
| | * | Straighten an if-else-if blocks into if-return blocksTadashi G. Takaoka2012-11-011-28/+28
| | |/ | | | | | | | | | Change-Id: If3eede1257658f27384e3efc72586fabbed19f7b
| * / Cleaup non-distinct multitouch related stuffTadashi G. Takaoka2012-11-013-31/+17
| |/ | | | | | | Change-Id: I09072267217caad2513f83b61d7db1c6d74e18d1
| * Use 32-bit code points for suggestions outputKen Wakasa2012-11-011-17/+19
| | | | | | | | | | | | | | This is a multi-project commit with Ic43dd666 bug: 6526418 Change-Id: I39c1acb4e91d04cd8a4ec5a943c8cf575da75ebc
| * Merge "Consolidate two helper methods (refactor step 3)"Tadashi G. Takaoka2012-10-311-25/+13
| |\
| | * Consolidate two helper methods (refactor step 3)Tadashi G. Takaoka2012-10-311-25/+13
| | | | | | | | | | | | Change-Id: I8b8522d1e5342fc73346ba2748e75f0c1d5bf03c
| * | Merge "Flatten nested if-else blocks into plain if-else blocks (refactor ↵Tadashi G. Takaoka2012-10-311-36/+32
| |\| | | | | | | | | | step 2.5)"
| | * Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)Tadashi G. Takaoka2012-10-311-36/+32
| | | | | | | | | | | | Change-Id: I42aad04658e14e8fd703e3828676719a333ec8f9
| * | Merge "Separate nested if-blocks into helper methods (refactor step 2)"Tadashi G. Takaoka2012-10-311-61/+77
| |\|
| | * Separate nested if-blocks into helper methods (refactor step 2)Tadashi G. Takaoka2012-10-311-61/+77
| | | | | | | | | | | | Change-Id: Ic0ed243f8c1fbf62793565ee37175270b47f0801
| * | Merge "Separate nested if-blocks into helper methods (refactor step 1)"Tadashi G. Takaoka2012-10-311-112/+127
| |\|
| | * Separate nested if-blocks into helper methods (refactor step 1)Tadashi G. Takaoka2012-10-311-112/+127
| | | | | | | | | | | | Change-Id: I87ef8b174295fb12a91fec35acd3b0cc152ad8f0
| * | Add a plumbing option to dicttool info.Jean Chalard2012-10-311-5/+9
| |/ | | | | | | | | | | | | | | Also align the `porcelain' option to the diff command that was used mistakenly. Bug: 7388665 Change-Id: Ic0e1b98c62ce37b2e909384a0370af4458563703
| * Fix possible NPETadashi G. Takaoka2012-10-291-1/+1
| | | | | | | | | | Bug: 7398904 Change-Id: I6b7aba7a9bf52ca494cb4390b19525c98790bd49
| * Remove reference of android.util.Log in Constants classTadashi G. Takaoka2012-10-291-4/+0
| | | | | | | | | | | | This is a follow up of Iee01d4d2. Change-Id: I0bcd349d317d9f7d40ef0574e72c640f9f990c5d
| * Merge "Move code point constants from Keyboard to Constants class"Tadashi G. Takaoka2012-10-2923-233/+233
| |\
| | * Move code point constants from Keyboard to Constants classTadashi G. Takaoka2012-10-2923-233/+233
| | | | | | | | | | | | Change-Id: Iee01d4d2b916d0b584531104ac865ae6e6370a3d
| * | Remove warningsJean Chalard2012-10-293-13/+8
| | | | | | | | | | | | | | | | | | Thanks Eclipse Change-Id: I88e3979ed22be5d8be5a5accdde417c6b1a8bf2d
| * | Implement the word-level diff (A9)Jean Chalard2012-10-291-1/+24
| |/ | | | | | | | | Bug: 7388857 Change-Id: I4c4560d4f4b579936a44cdf409a4c27300b65610
| * am 5199b8bf: am f6df37ce: Merge "LatinIME: Add accents to german keyboard"Ken Wakasa2012-10-251-1/+5
| |\ | | | | | | | | | | | | * commit '5199b8bf1a212b93c9f37d4bb18121ba7f174bd0': LatinIME: Add accents to german keyboard
| | * am f6df37ce: Merge "LatinIME: Add accents to german keyboard"Ken Wakasa2012-10-251-1/+5
| | |\ | | | | | | | | | | | | | | | | * commit 'f6df37ce2dce9ada1af097e0c2fbdd84c0334c61': LatinIME: Add accents to german keyboard
| | | * LatinIME: Add accents to german keyboardKim Le2012-10-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes http://code.google.com/p/android/issues/detail?id=26247 Add // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS Change-Id: I81d79f153cdfe7015bd0a343c681322ab8316db7
| | | * DO NOT MERGE: Clear cache of the user dictionary when a word is addedsatok2012-09-201-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | This is a backport of Iec2793de3fff7bf15f68f Change-Id: If16d1c48edf084d892da722fb288e467f211b08e
| | | * Merge "Initialize SubtypeLocale from Settings (DO NOT MERGE)" into jb-devTadashi G. Takaoka2012-07-102-1/+11
| | | |\
| | | | * Initialize SubtypeLocale from Settings (DO NOT MERGE)Tadashi G. Takaoka2012-07-052-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6781106 Change-Id: Ic1b2b8363486820eabaa415ab3812c0e8565b7bb
| * | | | am ef5f88f3: am 5e118c4c: am 60dea36d: Assuming that NO_EXTRACT_UI mode is ↵Satoshi Kataoka2012-10-251-1/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NO_FULSCREEN * commit 'ef5f88f33e432284c958fafe18f891a10f77e1f9': Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
| | * | | Assuming that NO_EXTRACT_UI mode is NO_FULSCREENSatoshi Kataoka2012-10-251-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7393485 Bug: 7272829 Change-Id: I873e8d99486c734e76484526631a90fc55e91c86
| * | | | Finish up the "info" command in dicttool. (A6)Jean Chalard2012-10-252-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7388857 Change-Id: I704f12a6be76ce1644ec5e8dd3b667f112e9c04a
| * | | | Add auto detection and decoding of dictionary files. (A2)Jean Chalard2012-10-252-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7388852 Change-Id: I25e755fc15f5b383acc046f668e9681efa4f0c2f
| * | | | Fix a bug where a bigram would be ignoredJean Chalard2012-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7403386 Change-Id: I89f495d07f7059a9f1ccd97d487c2f2657a8ebd2
| * | | | Merge "Return the correct bigram frequency"Jean Chalard2012-10-231-12/+21
| |\ \ \ \
| | * | | | Return the correct bigram frequencyJean Chalard2012-10-231-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "correct" bigram frequency is now returned by the reading code. However, as the binary format represents the frequency in a lossy manner, the frequency is not guaranteed to be the exact same as the one in the source text format - only a close enough value. It is however the exact same value seen by the native code. Bug: 7395653 Change-Id: I49199ef18901c671189912b3550623e9643baedd
| * | | | | Fix the build.Jean Chalard2012-10-231-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems this change snuck out from a previous version. Change-Id: I9c33d51273732b1d55bfd60f0957184c86fa88ab
| * | | | | Merge "Add reader and writer for the combined dict format."Jean Chalard2012-10-221-7/+1
| |\ \ \ \ \
| | * | | | | Add reader and writer for the combined dict format.Jean Chalard2012-10-231-7/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new textual format for the dictionary that combines words, bigrams and shortcuts to avoid complexity. It is also extensible to n-grams to fool-prof for the future, and easier to read than XML. Bug: 7388540 Change-Id: I942bbad51bd0c905a5a54c278667563fd6dd66ec
| * | | | | am 6fe6f38d: am d39e6435: am f960eb18: Don\'t put spaces after characters ↵Jean Chalard2012-10-222-1/+7
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | that don\'t take one * commit '6fe6f38d8af09b24e40a6e01eae919820cd04c16': Don't put spaces after characters that don't take one
| | * | | Don't put spaces after characters that don't take oneJean Chalard2012-10-232-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7393639 Change-Id: I1245a7b5077e554642838d6856ce269ca7f91988
| * | | | Merge "Replace useless CharSequence to String"Tadashi G. Takaoka2012-10-2226-298/+248
| |\ \ \ \
| | * | | | Replace useless CharSequence to StringTadashi G. Takaoka2012-10-2226-298/+248
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc478f901185ee1b4912acc82d0cbc54fee4e991
| * | | | | Add @UsedForTesting and @ExternallyReferenced annotationsTadashi G. Takaoka2012-10-2218-41/+98
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 7268357 Change-Id: I0b7e0c19f04af9ae30874d0a4c26ad81bc80be8c
| * | | | Suggestion strip will honor haptic feedback settings of keyboardTadashi G. Takaoka2012-10-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7313372 Change-Id: I427da8de68be3d2a78e810556340b96ab4edcc2d