aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 63e48365: Merge "Make MAX_PREV_WORD_COUNT_FOR_N_GRAM 2."Keisuke Kuroyanagi2014-09-191-1/+1
|\ | | | | | | | | * commit '63e483658fb993338db1259d44de8de848aae14b': Make MAX_PREV_WORD_COUNT_FOR_N_GRAM 2.
| * Merge "Make MAX_PREV_WORD_COUNT_FOR_N_GRAM 2."Keisuke Kuroyanagi2014-09-191-1/+1
| |\
| | * Make MAX_PREV_WORD_COUNT_FOR_N_GRAM 2.Keisuke Kuroyanagi2014-09-181-1/+1
| | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Iefacd7e4a6c256658a58856240310eeb91ae32db
* | | am ca93dda3: am 106706ce: Merge branch \'lmp-mr1-dev-plus-aosp\' of ↵Budi Kusmiantoro2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/packages/inputmethods/LatinIME into lmp-mr1-dev-plus-aosp * commit 'ca93dda3fdb293a7a04782c2e02c4107900dc10b':
| * | am 106706ce: Merge branch \'lmp-mr1-dev-plus-aosp\' of ↵Budi Kusmiantoro2014-09-180-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/packages/inputmethods/LatinIME into lmp-mr1-dev-plus-aosp * commit '106706ced9bde3b31fffcb2acaa642e7bf00208a':
| | * \ Merge branch 'lmp-mr1-dev-plus-aosp' of ↵Budi Kusmiantoro2014-09-1551-148/+242
| | |\ \ | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/packages/inputmethods/LatinIME into lmp-mr1-dev-plus-aosp
* | | | | am 3e88484e: am f5901b6e: am 1b459415: am 486c4894: Keep aspect ratio of ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Material action key background * commit '3e88484e460f5e341883ec8dd8b43d804f7f9774':
| * | | | am f5901b6e: am 1b459415: am 486c4894: Keep aspect ratio of Material action ↵Tadashi G. Takaoka2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | key background * commit 'f5901b6e2ddbfbf4b9949688858f8461c3d7a1e5':
| | * | | am 1b459415: am 486c4894: Keep aspect ratio of Material action key backgroundTadashi G. Takaoka2014-09-120-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | * commit '1b459415883fa7ba8cf9b7237d4b78f030086f05':
| | | * \ \ am 486c4894: Keep aspect ratio of Material action key backgroundTadashi G. Takaoka2014-09-099-26/+90
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '486c4894ce0917fc7b18eaee4bfd031051f2b05b': Keep aspect ratio of Material action key background
* | | | | | | am 85f37c03: am c63e06ed: am 5e3b3ab8: am 9395014e: Don\'t resume ↵Jean Chalard2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestions with H/W keyboard * commit '85f37c0307edfb0a875348d4e5c2f4ee892d8302':
| * | | | | | am c63e06ed: am 5e3b3ab8: am 9395014e: Don\'t resume suggestions with H/W ↵Jean Chalard2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard * commit 'c63e06ede857c1987ae3514cda825eaee6788516':
| | * | | | | am 5e3b3ab8: am 9395014e: Don\'t resume suggestions with H/W keyboardJean Chalard2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e3b3ab80994963b79fb0ca6f402ca3bc1a2260d':
| | | * | | | am 9395014e: Don\'t resume suggestions with H/W keyboardJean Chalard2014-09-081-41/+72
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9395014e76877fc9ef060a3fe54a9e06f0036d6d': Don't resume suggestions with H/W keyboard
* | | | | | | | am 14d83af5: am 1314e81b: am 1708ff6e: am 914078fd: Fix a bug where ↵Jean Chalard2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recorrection would stop on connectors * commit '14d83af5529e32ef5b65df350c83d780a6f8e08c':
| * | | | | | | am 1314e81b: am 1708ff6e: am 914078fd: Fix a bug where recorrection would ↵Jean Chalard2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop on connectors * commit '1314e81b22a0bdc15f79d8a7f2ae66b9916227ae':
| | * | | | | | am 1708ff6e: am 914078fd: Fix a bug where recorrection would stop on connectorsJean Chalard2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1708ff6e5416d4333d3f52f62cd71b64ea580cd7':
| | | * | | | | am 914078fd: Fix a bug where recorrection would stop on connectorsJean Chalard2014-09-084-26/+54
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '914078fd9198aeb3d7ffa034562321d688d588f7': Fix a bug where recorrection would stop on connectors
* | | | | | | | | am 4f5da734: am 41d65a60: am b28b83cc: am 42665f0e: Merge "Mark ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isDefault="true" for all supported subtypes" into lmp-dev * commit '4f5da734fbe1262ee9ebd8821f73070ef40d3c16':
| * | | | | | | | am 41d65a60: am b28b83cc: am 42665f0e: Merge "Mark isDefault="true" for all ↵Tadashi G. Takaoka2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported subtypes" into lmp-dev * commit '41d65a60d59df75c42ab0fe93e575b8987bbbe2b':
| | * | | | | | | am b28b83cc: am 42665f0e: Merge "Mark isDefault="true" for all supported ↵Tadashi G. Takaoka2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subtypes" into lmp-dev * commit 'b28b83cc4c7b7dce85b0f51f7d4f3b1122db729d':
| | | * | | | | | am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into ↵Tadashi G. Takaoka2014-09-0818-0/+432
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '42665f0ee26407fae984446b306309376aac2b36': Mark isDefault="true" for all supported subtypes
* | | | | | | | | | am f99e2a0f: am 8d2551c6: am b0c7f313: am 1caa0b71: Merge "Follow up API ↵Yohei Yukawa2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signature changes of CursorAnchorInfo" into lmp-dev * commit 'f99e2a0fe2f26e353cf3ff462ccba0e51e4bbc2c':
| * | | | | | | | | am 8d2551c6: am b0c7f313: am 1caa0b71: Merge "Follow up API signature ↵Yohei Yukawa2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes of CursorAnchorInfo" into lmp-dev * commit '8d2551c68f9b567e719bc9912f5bb4ffcf6db400':
| | * | | | | | | | am b0c7f313: am 1caa0b71: Merge "Follow up API signature changes of ↵Yohei Yukawa2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CursorAnchorInfo" into lmp-dev * commit 'b0c7f31333313c6d7d492c32b31b883640f3c1e0':
| | | * | | | | | | am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" ↵Yohei Yukawa2014-09-082-13/+18
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '1caa0b714dc49c8723d36d4d9825427f8978a602': Follow up API signature changes of CursorAnchorInfo
* | | | | | | | | | | am 7389b763: am fc387d7e: am 7737c9d7: am cb077f75: Merge "Resolve an old ↵Jean Chalard2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO." into lmp-dev * commit '7389b76354e96059ced7ed43244763853772c926':
| * | | | | | | | | | am fc387d7e: am 7737c9d7: am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc387d7ef993bbcaf236a1ed65717432cfd8b0ec':
| | * | | | | | | | | am 7737c9d7: am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7737c9d712b37a3616267ac28848f8f3d74b29d6':
| | | * | | | | | | | am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-084-30/+37
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb077f75ac750d50c305ac5da20d81df5003907a': Resolve an old TODO.
* | | | | | | | | | | | am 03d37a29: am 9274e35e: am 97dbb22e: am 257dfa79: Merge "Revert "Use right ↵Yohei Yukawa2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arrow for the commit indicator"" into lmp-dev * commit '03d37a29184614b1c9f6d785ed5dee6ad0e9784d':
| * | | | | | | | | | | am 9274e35e: am 97dbb22e: am 257dfa79: Merge "Revert "Use right arrow for ↵Yohei Yukawa2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the commit indicator"" into lmp-dev * commit '9274e35ed567f05058515fd9e2973bb0b5e47021':
| | * | | | | | | | | | am 97dbb22e: am 257dfa79: Merge "Revert "Use right arrow for the commit ↵Yohei Yukawa2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indicator"" into lmp-dev * commit '97dbb22e8608cb86eb97fc9ae4c6d0321b5e0b24':
| | | * | | | | | | | | am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into ↵Yohei Yukawa2014-09-081-16/+10
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '257dfa79f7f19eac5f3481f1b8fe28038d1e0c5e': Revert "Use right arrow for the commit indicator"
* | | | | | | | | | | | | am 39141c37: am 27c45d42: am 40b0e3a4: am 0f33e614: Implement Floating ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Action Button more keys keyboard * commit '39141c37e754b96003b455382142d1e3753da4a0':
| * | | | | | | | | | | | am 27c45d42: am 40b0e3a4: am 0f33e614: Implement Floating Action Button more ↵Tadashi G. Takaoka2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keys keyboard * commit '27c45d42485964dabeb29b3c869220db68c4152f':
| | * | | | | | | | | | | am 40b0e3a4: am 0f33e614: Implement Floating Action Button more keys keyboardTadashi G. Takaoka2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40b0e3a4c87c2422c3adcc67cffe4756b510f160':
| | | * | | | | | | | | | am 0f33e614: Implement Floating Action Button more keys keyboardTadashi G. Takaoka2014-09-0810-3/+117
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f33e614c0799fa3a14a2c32db4bf0654df039da': Implement Floating Action Button more keys keyboard
* | | | | | | | | | | | | | am 516e618a: am a09dcf8f: am 0ee849d7: am 727e818e: Move more keys divider ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to MoreKeysKeyboardView * commit '516e618abbf9a8b41e5149ebc378d1f4e0a57b73':
| * | | | | | | | | | | | | am a09dcf8f: am 0ee849d7: am 727e818e: Move more keys divider to ↵Tadashi G. Takaoka2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MoreKeysKeyboardView * commit 'a09dcf8f856a90319d5be8be9ae325643350e4f8':
| | * | | | | | | | | | | | am 0ee849d7: am 727e818e: Move more keys divider to MoreKeysKeyboardViewTadashi G. Takaoka2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ee849d7168bc168a43a74f80d8d73a26ac54b45':
| | | * | | | | | | | | | | am 727e818e: Move more keys divider to MoreKeysKeyboardViewTadashi G. Takaoka2014-09-089-27/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '727e818e95ef68460ebafb2eb3b11c23a2d8fcd8': Move more keys divider to MoreKeysKeyboardView
* | | | | | | | | | | | | | | am 669821bd: am e5ab9414: am 1a6651f6: am 6888ec00: Merge "Create ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | donottranslate debug settings string resources file" into lmp-dev * commit '669821bd9237e7f0d7e10697f079c4421d8b135e':
| * | | | | | | | | | | | | | am e5ab9414: am 1a6651f6: am 6888ec00: Merge "Create donottranslate debug ↵Tadashi G. Takaoka2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings string resources file" into lmp-dev * commit 'e5ab941402b979091afe337523ef64b49791896b':
| | * | | | | | | | | | | | | am 1a6651f6: am 6888ec00: Merge "Create donottranslate debug settings string ↵Tadashi G. Takaoka2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources file" into lmp-dev * commit '1a6651f63603fab3b92029cd3eb3c1e818bdf5f4':
| | | * | | | | | | | | | | | am 6888ec00: Merge "Create donottranslate debug settings string resources ↵Tadashi G. Takaoka2014-09-054-41/+60
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file" into lmp-dev * commit '6888ec009951ffd900c04a0ad179a94d47eca03c': Create donottranslate debug settings string resources file
* | | | | | | | | | | | | | | | am 6edbf8b1: am b4499a1e: am 7f850186: am 6ba84dcd: Merge "Refactor action ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | label/icon definitions" into lmp-dev * commit '6edbf8b1183563d3973994838f176b4b6917abd2':
| * | | | | | | | | | | | | | | am b4499a1e: am 7f850186: am 6ba84dcd: Merge "Refactor action label/icon ↵Tadashi G. Takaoka2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | definitions" into lmp-dev * commit 'b4499a1e0e65413319b233076c4d2276a7c7492a':
| | * | | | | | | | | | | | | | am 7f850186: am 6ba84dcd: Merge "Refactor action label/icon definitions" ↵Tadashi G. Takaoka2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '7f8501867e488c2936366c2db2a48d2c6f200de3':
| | | * | | | | | | | | | | | | am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-devTadashi G. Takaoka2014-09-057-268/+292
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ba84dcd96418a7a568afeaf064aa64cf94a1839': Refactor action label/icon definitions