aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 9e5d7abe: am eab27c1e: Merge "Add account e-mail addresses to the user ↵Satoshi Kataoka2013-05-152-0/+66
|\ | | | | | | | | | | | | dictionary" * commit '9e5d7abe33fcf68ef74fde6851ea6dd99beb5141': Add account e-mail addresses to the user dictionary
| * am eab27c1e: Merge "Add account e-mail addresses to the user dictionary"Satoshi Kataoka2013-05-082-0/+66
| |\ | | | | | | | | | | | | * commit 'eab27c1ef607f0370b87742e5fe216f7dab9499c': Add account e-mail addresses to the user dictionary
| | * Merge "Add account e-mail addresses to the user dictionary"Satoshi Kataoka2013-05-082-0/+66
| | |\
| | | * Add account e-mail addresses to the user dictionarySatoshi Kataoka2013-05-082-0/+66
| | | | | | | | | | | | | | | | | | | | Bug: 8683365 Change-Id: Id72540c515e61c3dd854892599645dd6d22b496d
* | | | am c6143574: am 5b8b76ba: Merge "Move gesture preview trail parameters to ↵Tadashi G. Takaoka2013-05-155-33/+85
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | resource" * commit 'c614357468c496db420c7b1d0a8a119f86620f8a': Move gesture preview trail parameters to resource
| * | | am 5b8b76ba: Merge "Move gesture preview trail parameters to resource"Tadashi G. Takaoka2013-05-085-33/+85
| |\| | | | | | | | | | | | | | | | | | * commit '5b8b76baa304b7cbea647bac0ded7a32a6fcb77c': Move gesture preview trail parameters to resource
| | * | Merge "Move gesture preview trail parameters to resource"Tadashi G. Takaoka2013-05-085-33/+85
| | |\ \ | | | |/ | | |/|
| | | * Move gesture preview trail parameters to resourceTadashi G. Takaoka2013-05-085-33/+85
| | | | | | | | | | | | | | | | | | | | Bug: 7167303 Change-Id: I22b56588dc5a1c9d5eaec3a39b5f32c9e5a8a5b4
* | | | am eecf34a9: am faa94a2d: Merge "Add owner\'s info to the dictionary"Satoshi Kataoka2013-05-151-3/+14
|\| | | | | | | | | | | | | | | | | | | * commit 'eecf34a9be6ffb20635d0807f16f9fe131cf7f63': Add owner's info to the dictionary
| * | | am faa94a2d: Merge "Add owner\'s info to the dictionary"Satoshi Kataoka2013-05-081-3/+14
| |\| | | | | | | | | | | | | | | | | | * commit 'faa94a2d0abfc8e0f03799dd5f0f2125e44b0bfd': Add owner's info to the dictionary
| | * | Merge "Add owner's info to the dictionary"Satoshi Kataoka2013-05-081-3/+14
| | |\ \
| | | * | Add owner's info to the dictionarySatoshi Kataoka2013-05-081-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8683365 Change-Id: I1c30eac128b4172526423ebeeb45bc6cee7fb67b
* | | | | am 873f9b90: am 6435c800: Merge "Fix an issue on the transition between the ↵Satoshi Kataoka2013-05-151-8/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup and the settings" * commit '873f9b90f78857b13328a4a518d1aa8fa4b4f4eb': Fix an issue on the transition between the setup and the settings
| * | | | am 6435c800: Merge "Fix an issue on the transition between the setup and the ↵Satoshi Kataoka2013-05-081-8/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings" * commit '6435c80087b1c698e025b7be809d6236fcdd9e64': Fix an issue on the transition between the setup and the settings
| | * | | Merge "Fix an issue on the transition between the setup and the settings"Satoshi Kataoka2013-05-081-8/+9
| | |\ \ \
| | | * | | Fix an issue on the transition between the setup and the settingsTadashi G. Takaoka2013-05-081-8/+9
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8853220 Change-Id: I99b6c46d900e9391f77986d1ae6e3edeaeff01e5
* | | | | am fe856be8: am f59c4f68: Fix labels in the personal dictionary settingsSatoshi Kataoka2013-05-152-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe856be87573cd2641c6cf71e9b5a03e8b5e2491': Fix labels in the personal dictionary settings
| * | | | am f59c4f68: Fix labels in the personal dictionary settingsSatoshi Kataoka2013-05-072-4/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f59c4f6840f82892397752b558251eb71f125d3a': Fix labels in the personal dictionary settings
| | * | | Fix labels in the personal dictionary settingsSatoshi Kataoka2013-05-082-4/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 8855738 Bug: 8853764 Change-Id: I03383bb5d6d72645f511cc6175dec747eb13a840
* | | | am 778eabfe: am 244a24e3: Consolidate dummy proximity info to the spell ↵Satoshi Kataoka2013-05-159-544/+142
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | checker info * commit '778eabfe7476b64aaef614c6649d6798b2bbc3bf': Consolidate dummy proximity info to the spell checker info
| * | | am 244a24e3: Consolidate dummy proximity info to the spell checker infoSatoshi Kataoka2013-05-079-544/+142
| |\| | | | | | | | | | | | | | | | | | * commit '244a24e3685f3fc1d0cbfaf375ad137f917740c2': Consolidate dummy proximity info to the spell checker info
| | * | Consolidate dummy proximity info to the spell checker infoSatoshi Kataoka2013-05-089-544/+142
| | |/ | | | | | | | | | | | | | | | Bug: 8783170 Change-Id: I067486e5ec1ae7cdef8e2121392464ba71ee8add
* | | am 9b5965d4: am 1eb1af75: Merge "Fix looping logic bugs."Kurt Partridge2013-05-152-24/+30
|\| | | | | | | | | | | | | | * commit '9b5965d452d55fd271dc14f2328b44da08c3cb67': Fix looping logic bugs.
| * | am 1eb1af75: Merge "Fix looping logic bugs."Kurt Partridge2013-05-072-24/+30
| |\| | | | | | | | | | | | | * commit '1eb1af75a7f19ea3b544205d42a3890781021a0b': Fix looping logic bugs.
| | * Merge "Fix looping logic bugs."Kurt Partridge2013-05-072-24/+30
| | |\
| | | * Fix looping logic bugs.Kurt Partridge2013-05-072-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | shiftOut() is getting called once too often through these for loops. Change-Id: I9a68b49e6cc1469bcddd673ab1567e238cf192b8
* | | | am f7937a94: am 542bcbea: (-s ours) am 71778d25: (-s ours) am 34a0dc5a: ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE * commit 'f7937a944095eb1dedd502fe4ea360198df861e6':
| * | | am 542bcbea: (-s ours) am 71778d25: (-s ours) am 34a0dc5a: Import ↵Baligh Uddin2013-05-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '542bcbeaca5cec7f302058c6c5936c3d81b6bcb8': Import translations. DO NOT MERGE
| | * | am 71778d25: (-s ours) am 34a0dc5a: Import translations. DO NOT MERGEBaligh Uddin2013-05-070-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | * commit '71778d2551c6c5ae98b34c5fbbfa00d96362617f': Import translations. DO NOT MERGE
* | | | am d2dbbc41: am 104bb70c: Merge "Avoid drawing too long gesture preview trails"Tadashi G. Takaoka2013-05-151-6/+17
|\| | | | | | | | | | | | | | | | | | | * commit 'd2dbbc417484d3f5ef0f4617e037473c75926d4e': Avoid drawing too long gesture preview trails
| * | | am 104bb70c: Merge "Avoid drawing too long gesture preview trails"Tadashi G. Takaoka2013-05-071-6/+17
| |\| | | | | | | | | | | | | | | | | | * commit '104bb70c65bb06702654f72cf2d12a2da547dc93': Avoid drawing too long gesture preview trails
| | * | Merge "Avoid drawing too long gesture preview trails"Tadashi G. Takaoka2013-05-071-6/+17
| | |\ \
| | | * | Avoid drawing too long gesture preview trailsTadashi G. Takaoka2013-05-071-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7167303 Change-Id: I63c2e8fb60f76e80346b67fd44399fa91930f2f0
* | | | | am 0633a208: am 2afe88b8: Merge "Unify space-adding on gestures."Jean Chalard2013-05-151-15/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '0633a208bcb66afdb32de5b36329c4d559008881': Unify space-adding on gestures.
| * | | | am 2afe88b8: Merge "Unify space-adding on gestures."Jean Chalard2013-05-071-15/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '2afe88b8d76eb148e533d416a1893e5645813392': Unify space-adding on gestures.
| | * | | Merge "Unify space-adding on gestures."Jean Chalard2013-05-071-15/+7
| | |\ \ \
| | | * | | Unify space-adding on gestures.Jean Chalard2013-05-071-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is much simpler, and more correct. Bug: 8808497 Change-Id: I7a56bf9d6d9fb481f898b7a9f5898a86c11b34c0
* | | | | | am 86af3e9f: am b90a86b3: Merge "Checking key edit distance of candidate ↵Keisuke Kuroynagi2013-05-154-42/+197
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | words for gesture scoring." * commit '86af3e9fe46d3bae17ba8ce0adf748d741226c01': Checking key edit distance of candidate words for gesture scoring.
| * | | | | am b90a86b3: Merge "Checking key edit distance of candidate words for ↵Keisuke Kuroynagi2013-05-074-42/+197
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gesture scoring." * commit 'b90a86b362fe135d473dc3daf61203a9235ff2d7': Checking key edit distance of candidate words for gesture scoring.
| | * | | | Merge "Checking key edit distance of candidate words for gesture scoring."Keisuke Kuroynagi2013-05-074-42/+197
| | |\ \ \ \
| | | * | | | Checking key edit distance of candidate words for gesture scoring.Keisuke Kuroynagi2013-05-074-42/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 8616704 Change-Id: I98c3248877b1e3e722a6c00a2851e543e5fcbe11
* | | | | | | am 1e7c0677: am a9dd74cf: refactor spell checkerSatoshi Kataoka2013-05-151-14/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e7c067770b6406c762974406013db24561c2416': refactor spell checker
| * | | | | | am a9dd74cf: refactor spell checkerSatoshi Kataoka2013-05-071-14/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9dd74cf3f47f55a6fe33ef7d54c0ac7cb2ae4c7': refactor spell checker
| | * | | | | refactor spell checkerSatoshi Kataoka2013-05-071-14/+14
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Change-Id: Ie7bea23f2ac54f03572e77c31ba7cb3d5e8f8d2f
* | | | | | am 7b6b30df: am 9d71a6c9: Remove unused device form factor valuesTadashi G. Takaoka2013-05-156-32/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b6b30dffcf027f50198f9588eaa4918b4e1cda2': Remove unused device form factor values
| * | | | | am 9d71a6c9: Remove unused device form factor valuesTadashi G. Takaoka2013-05-076-32/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d71a6c968434a95b5a195846ef5276920da6203': Remove unused device form factor values
| | * | | | Remove unused device form factor valuesTadashi G. Takaoka2013-05-076-32/+5
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I1ed88b842a3d45e5460dd387bfad4276c844096a
* | | | | am d192dd94: am 84ac8f31: Move empty listner to KeyboardActionListener.AdapterTadashi G. Takaoka2013-05-152-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd192dd94ebfb08a6e432c0083ba74a5ea86dd7b1': Move empty listner to KeyboardActionListener.Adapter
| * | | | am 84ac8f31: Move empty listner to KeyboardActionListener.AdapterTadashi G. Takaoka2013-05-072-5/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '84ac8f31fbe30f03c14a85ffb8c827edb6e47ab0': Move empty listner to KeyboardActionListener.Adapter
| | * | | Move empty listner to KeyboardActionListener.AdapterTadashi G. Takaoka2013-05-072-5/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic7bad73c089de015746c667bbfb2c09bd429a9fc