aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | am 1b770503: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-140-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | * commit '1b770503394da4968fdabf5c39190edf60031f59':
| | * | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-140-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I53296de92b1846263d7aa2dc588d13d3bd7ce930
| | | * \ \ \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-140-0/+0
| | | |\ \ \ \
* | | | | | | | am 8c15e913: resolved conflicts for merge of d48d6fee to masterKen Wakasa2012-12-145-4/+189
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c15e91344a5e97ca069200070745c4384f40750': Use the amended user dictionary word for insertion
| * | | | | | | resolved conflicts for merge of d48d6fee to masterKen Wakasa2012-12-155-4/+189
| |\| | | | | | | | |_|_|_|/ / | |/| | | | | | | | | | | | Change-Id: I21141956135debe737453dba87617671b1716d0a
| | * | | | | am db6f21c6: am 18d688c9: Use the amended user dictionary word for insertionJean Chalard2012-12-145-4/+189
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db6f21c6792fe07a733572e1d4978f46b5462c35': Use the amended user dictionary word for insertion
| | | * | | | | am 18d688c9: Use the amended user dictionary word for insertionJean Chalard2012-12-145-4/+189
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18d688c94bb8e1e26de2d12445cb3096c6126f75': Use the amended user dictionary word for insertion
| | | | * | | | Use the amended user dictionary word for insertionJean Chalard2012-12-145-4/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user edits a word before adding it to the user dictionary, the keyboard should replace whatever was committed before with the amended version. Bug: 7725834 Change-Id: I1a417be6c5a86d6a96bc2c76aca314ad8f1202a9
* | | | | | | | am 39b5396f: Merge "[Rlog1] Track time of log statements"Kurt Partridge2012-12-144-28/+77
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '39b5396f8e70eaac73d4c5eaa2bfede32a3f1f49': [Rlog1] Track time of log statements
| * | | | | | | Merge "[Rlog1] Track time of log statements"Kurt Partridge2012-12-144-28/+77
| |\ \ \ \ \ \ \
| | * | | | | | | [Rlog1] Track time of log statementsKurt Partridge2012-12-134-28/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log statements are now recorded with a timestamp. This is important for filtering out statements not part of words that are sampled when spaces are inserted automatically. multi-project commit with Change-Id: I68221a2528045d25632aef4bb716f92a4f4a56a4 Change-Id: I46ac9b3b1dcbb08425160d0109028cb64445139c
* | | | | | | | | am edbb65be: Reset composing state at onFinishInputViewTadashi G. Takaoka2012-12-141-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'edbb65be3e5e391affbf47e134422ac1d1a4ae13': Reset composing state at onFinishInputView
| * | | | | | | | Reset composing state at onFinishInputViewTadashi G. Takaoka2012-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7709817 Change-Id: Icac0b8cb28209d98d291d8f00be55e33af5bf696
* | | | | | | | | am ac69ab40: Refactor more keys menu framework (part 3)Tom Ouyang2012-12-136-9/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac69ab400d1ea4f90b4ca24486d62212decf1069': Refactor more keys menu framework (part 3)
| * | | | | | | | Refactor more keys menu framework (part 3)Tom Ouyang2012-12-136-9/+56
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to re-enter gesture input even after triggering the long-press menu. This is useful for new users who may pause at the start of a word. Works for both single and bi-manual gestures. Bug: 7595193 Change-Id: Ieaecfd5385ed6c10ae9347b99c2e35a0de5e895d
* | | | | | | | am be68b41c: Fix more suggestion window asymmetry bug in N7.Tom Ouyang2012-12-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be68b41ccb1a16201c3b91f1576a731f7715aaf6': Fix more suggestion window asymmetry bug in N7.
| * | | | | | | Fix more suggestion window asymmetry bug in N7.Tom Ouyang2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7711822 Change-Id: I63ba13b1c160cf55b8820a08e6e28fa666dd2580
* | | | | | | | am 1f4f404e: Merge "Refactor more keys menu framework (part 2)"Tom Ouyang2012-12-137-297/+192
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f4f404e1f753db5cbe675e0088064e3c64e0953': Refactor more keys menu framework (part 2)
| * | | | | | | Merge "Refactor more keys menu framework (part 2)"Tom Ouyang2012-12-137-297/+192
| |\ \ \ \ \ \ \
| | * | | | | | | Refactor more keys menu framework (part 2)Tom Ouyang2012-12-137-297/+192
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Integrate pointer tracking between more keys menu, more suggestions menu, and main keyboard. - Adds multi-touch support for more keys menus. Long press with one finger and select keys with another finger. Bug: 7508007 Change-Id: I394f28cd79e342d6bcfea573af72aa33b9def00f
* | | | | | | | am e5a30683: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-12-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5a306831d9d8326fa4643540fdef9e839e2f4f1': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-12-1353-172/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79b5cd68250ee30f66803400420cd1bfa22642e7 Auto-generated-cl: translation import
* | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-12-1353-172/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58479b3df35b63d9552ad2a4d0d7fa7e56d52435 Auto-generated-cl: translation import
* | | | | | | | am 8eaf75aa: Fix label of switch to symbols key when symbols has shortcut keyTadashi G. Takaoka2012-12-137-94/+91
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8eaf75aa7bfa471e17626b1741f63475353bf36b': Fix label of switch to symbols key when symbols has shortcut key
| * | | | | | | Fix label of switch to symbols key when symbols has shortcut keyTadashi G. Takaoka2012-12-137-94/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the labels of switch to symbols key and switch back from more symbols key when symbols layout has shortcut key. Change-Id: I3fbbef2d929486d0f0542f4d89cb086d9f5bad82
* | | | | | | | am ac3720ce: Fix layout switch keys\' label of no language subtype keyboardTadashi G. Takaoka2012-12-1319-364/+664
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac3720ce6d5d9a0084c9275d0e0f3e846c5b27c6': Fix layout switch keys' label of no language subtype keyboard
| * | | | | | | Fix layout switch keys' label of no language subtype keyboardTadashi G. Takaoka2012-12-1319-364/+664
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the following string from resources to KeyboardTextsSet. - label_to_alpha_key - label_to_symbols_key - label_to_symbols_with_microphone_key Bug: 7697799 Change-Id: Icf9b8848de4c70f792e336f2ae274dab12be79ee
* | | | | | | | am 0c2b8ad5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-12-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c2b8ad5982fec3d1db3ac9a6d1232eebc68161a': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf642f4e63ce4ecc97163c544ec6cb2b5a56eea7 Auto-generated-cl: translation import
* | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie8bd0ecea2eab760a88ca676c4c0465b751a3531 Auto-generated-cl: translation import
* | | | | | | | am e775073b: Merge "Fix typing incremental decoder"Satoshi Kataoka2012-12-122-5/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e775073b727e4348f9dd2d056a2e811d9dfeca73': Fix typing incremental decoder
| * | | | | | | Merge "Fix typing incremental decoder"Satoshi Kataoka2012-12-122-5/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Fix typing incremental decoderSatoshi Kataoka2012-12-122-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia55d5c0200738c81f93530b3680bc3f37c0b2e28
* | | | | | | | | am 692cd00e: Small cleanupsKen Wakasa2012-12-115-14/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '692cd00ea3178cfe2c9f331150682ec78d8e6cd1': Small cleanups
| * | | | | | | | Small cleanupsKen Wakasa2012-12-115-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29b4dee15d66f8f1372035738658234395001d41
* | | | | | | | | am dd8d2a89: Merge "Remove a useless member"Jean Chalard2012-12-112-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd8d2a89c55f099ddb66dff3daa36dce98ed9b32': Remove a useless member
| * | | | | | | | Merge "Remove a useless member"Jean Chalard2012-12-112-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Remove a useless memberJean Chalard2012-12-112-2/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id13e0aeec6ec3655d6bb0edc7f8f7821e7dc5a36
* | | | | | | | am 7ead070d: Merge "Calculate isContinuationPossible for typing"Satoshi Kataoka2012-12-103-12/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ead070db5ed717daf7ea482cc4340f2a17ae556': Calculate isContinuationPossible for typing
| * | | | | | | Merge "Calculate isContinuationPossible for typing"Satoshi Kataoka2012-12-103-12/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Calculate isContinuationPossible for typingSatoshi Kataoka2012-12-113-12/+23
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I11edb1e5155e5048a6c95f84b36e2ef34572178c
* | | | | | | | am e5147c05: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-12-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5147c055b24dcbf0732c699d1d1608d812558b3': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-12-1011-22/+16
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib94a9091267b18039cf8e1ff66107fb773ce1fed Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-12-1011-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I000b6d4bee0812dfca6728150d0aa5355317c40d Auto-generated-cl: translation import
* | | | | | | am 082507e1: Header clean upKen Wakasa2012-12-107-14/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '082507e1da56c6cefe575ec3d6a334e9b717e3fa': Header clean up
| * | | | | | Header clean upKen Wakasa2012-12-107-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9b2ea4ed8c1c4cf73463f0ac4bc63d4bb8cba42
* | | | | | | am fc799ba0: Clean up sign conversions in binary_format.h (done by ↵Ken Wakasa2012-12-101-12/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wsign-conversion) * commit 'fc799ba03c53869a62a46544c3c2524a66cda328': Clean up sign conversions in binary_format.h (done by -Wsign-conversion)
| * | | | | | Clean up sign conversions in binary_format.h (done by -Wsign-conversion)Ken Wakasa2012-12-101-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ca88c22ee5bbb66d50640e1d96021fbe71fc8ab
* | | | | | | am 203b2138: Fix build breakage.Satoshi Kataoka2012-12-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '203b2138136bc00219d371897237f6b0b1795b9c': Fix build breakage.
| * | | | | | Fix build breakage.Satoshi Kataoka2012-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01b00827a3099097c1181a4ae91498a6cd14c3ca