aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | am b4b72d43: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-05-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4b72d438b76e10e7e609f0d2a493ccf09ebb9e4': Import translations. DO NOT MERGE
| * | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-05-291-0/+241
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-271-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f9b5cf9010256f04a132bb832c128174251d726 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-05-291-0/+241
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-271-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I20dce23d4e5b4a5a64877f4c8743070fb9ed2dc9 Auto-generated-cl: translation import
* | | | | | | | am 305509ed: Merge "Remove unused method"Kurt Partridge2013-05-281-19/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '305509ed2feffa5c57cd21bb7cc137e444df3390': Remove unused method
| * | | | | | | Merge "Remove unused method"Kurt Partridge2013-05-291-19/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove unused methodKurt Partridge2013-05-281-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The removed method was used in old versions of ALK, never in master. Change-Id: I607009d4fcca7c7c8493fee51ecd923e6a6b3890
* | | | | | | | | am 215fabff: Merge "Rename containsCorrection to containsUserDeletions"Kurt Partridge2013-05-282-14/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '215fabff523b1399b4aafaa09476747561d2127b': Rename containsCorrection to containsUserDeletions
| * | | | | | | | Merge "Rename containsCorrection to containsUserDeletions"Kurt Partridge2013-05-282-14/+14
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Rename containsCorrection to containsUserDeletionsKurt Partridge2013-05-282-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change renames containsCorrection to avoid confusion with CorrectionInfo, and to better clarify its meaning. Change-Id: I5d8f8e2b03133c15a60d4e8b0f395cda1fff5447
* | | | | | | | | am 94af6d9e: Merge "Make unit test independent from test device locale"Tadashi G. Takaoka2013-05-282-7/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94af6d9e7f779fad4886d70fcac26844ecdc0c15': Make unit test independent from test device locale
| * | | | | | | | Merge "Make unit test independent from test device locale"Tadashi G. Takaoka2013-05-282-7/+29
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make unit test independent from test device localeTadashi G. Takaoka2013-05-282-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9112465 Change-Id: I4fe39bebf130799397485dbe6d23199a29a8641e
* | | | | | | | | | am d99abf8c: Delete shared preference entry when user select default valueTadashi G. Takaoka2013-05-282-3/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd99abf8cb119ff2cb4e7d975001a939cc48d7112': Delete shared preference entry when user select default value
| * | | | | | | | | Delete shared preference entry when user select default valueTadashi G. Takaoka2013-05-282-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3fbafd9024c26a99d87376f5d5e359e03988a30f
* | | | | | | | | | am 58067bd9: Merge "Fix unit test assert helper method"Tadashi G. Takaoka2013-05-283-50/+70
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58067bd952a9c77b2deedd3b45bc1403c49b8c91': Fix unit test assert helper method
| * | | | | | | | | Merge "Fix unit test assert helper method"Tadashi G. Takaoka2013-05-283-50/+70
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix unit test assert helper methodTadashi G. Takaoka2013-05-283-50/+70
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id03bf0910708d07b45286dccf8f2bfc97a362ba0
* | | | | | | | | | am 39bd6ea0: Merge "Rename StringUtils.parseCsvString to ↵Tadashi G. Takaoka2013-05-286-77/+86
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeySpecParser.splitKeySpecs" * commit '39bd6ea0dce5b7f18c337a7299520b78caa92b9c': Rename StringUtils.parseCsvString to KeySpecParser.splitKeySpecs
| * | | | | | | | | Merge "Rename StringUtils.parseCsvString to KeySpecParser.splitKeySpecs"Tadashi G. Takaoka2013-05-286-77/+86
| |\| | | | | | | |
| | * | | | | | | | Rename StringUtils.parseCsvString to KeySpecParser.splitKeySpecsTadashi G. Takaoka2013-05-286-77/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16e3f3ebc43772cfd96c824afeddfd225404b857
* | | | | | | | | | am d69e4191: Merge "Refactor suggestion strip layout methods a bit"Tadashi G. Takaoka2013-05-281-65/+104
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd69e4191b748c475bf5056cf0d39e1ca191a5417': Refactor suggestion strip layout methods a bit
| * | | | | | | | | Merge "Refactor suggestion strip layout methods a bit"Tadashi G. Takaoka2013-05-281-65/+104
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Refactor suggestion strip layout methods a bitTadashi G. Takaoka2013-05-281-65/+104
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9059710 Change-Id: I8dc698c1d61ca51b65b232e6c586472588a4accb
* | | | | | | | | | am 4c2ac9ee: Merge "Rename commaConcatinatedText to commaSplittableText"Tadashi G. Takaoka2013-05-284-39/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c2ac9ee5f8a5814c3e9802f7ac3a3d4d4e0d66c': Rename commaConcatinatedText to commaSplittableText
| * | | | | | | | | Merge "Rename commaConcatinatedText to commaSplittableText"Tadashi G. Takaoka2013-05-284-39/+43
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Rename commaConcatinatedText to commaSplittableTextTadashi G. Takaoka2013-05-284-39/+43
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up of I5a32882a08. Change-Id: I9f0cda2167811f6bba2af042fbde0a821b4cfecd
* | | | | | | | | | am 68cf2cd9: Merge "Check all regexp patterns in ↵Tadashi G. Takaoka2013-05-283-61/+106
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResourceUtils.getDeviceOverrideValue" * commit '68cf2cd93101cf1531c77bbadf0b956d83b7cd76': Check all regexp patterns in ResourceUtils.getDeviceOverrideValue
| * | | | | | | | | Merge "Check all regexp patterns in ResourceUtils.getDeviceOverrideValue"Tadashi G. Takaoka2013-05-283-61/+106
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Check all regexp patterns in ResourceUtils.getDeviceOverrideValueTadashi G. Takaoka2013-05-283-61/+106
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also fixes a regexp error of Galaxy S III. Change-Id: I42a4780bbfd2b083f4e27e61ec513aa875907344
* | | | | | | | | | am e168a3c2: Merge "Adding additional feature settings."Keisuke Kuroyanagi2013-05-286-1/+88
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e168a3c2a5c9b3e1db13507521a3eb6d8a2579ee': Adding additional feature settings.
| * | | | | | | | | Merge "Adding additional feature settings."Keisuke Kuroyanagi2013-05-286-1/+88
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Adding additional feature settings.Keisuke Kuroyanagi2013-05-286-1/+88
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9fec0c03b7da9ce0305b494193f4cfe3fca144f3
* | | | | | | | | am 6d77ae9d: Merge "Remove KeyboardStart.isInMomentarySwitchState"Tadashi G. Takaoka2013-05-283-12/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d77ae9d815679eb653be986eb72d34ecc72d379': Remove KeyboardStart.isInMomentarySwitchState
| * | | | | | | | Merge "Remove KeyboardStart.isInMomentarySwitchState"Tadashi G. Takaoka2013-05-283-12/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove KeyboardStart.isInMomentarySwitchStateTadashi G. Takaoka2013-05-283-12/+2
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00f45d8dd7feb6c34c0a65a8545cddd2751796d0
* | | | | | | | | am 07e56e76: Merge "Implement KIND_OOV_CORRECTION"Satoshi Kataoka2013-05-282-4/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07e56e76a77ee4164201b7f48aa6f7c8d69a81b9': Implement KIND_OOV_CORRECTION
| * | | | | | | | Merge "Implement KIND_OOV_CORRECTION"Satoshi Kataoka2013-05-282-4/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Implement KIND_OOV_CORRECTIONSatoshi Kataoka2013-05-272-4/+9
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9127749 Change-Id: I96db15a3138e6b522c4c6ad16cc7faad577d3772
* | | | | | | | | am 1b467387: Rename "csv" in StringUtils to "commaConcatenatedText"Tadashi G. Takaoka2013-05-284-49/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b46738796eafa2dc062f4a93b0ea42023945737': Rename "csv" in StringUtils to "commaConcatenatedText"
| * | | | | | | | Rename "csv" in StringUtils to "commaConcatenatedText"Tadashi G. Takaoka2013-05-284-49/+74
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a32882a088e4ff5bfe973a86465d6ff839113d9
* | | | | | | | am a2d8d30f: Merge "Add smoothing utils / matrix libs"Satoshi Kataoka2013-05-274-0/+397
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a2d8d30f8eba001742099096da53e42e77dd367a': Add smoothing utils / matrix libs
| * | | | | | | Merge "Add smoothing utils / matrix libs"Satoshi Kataoka2013-05-284-0/+397
| |\ \ \ \ \ \ \
| | * | | | | | | Add smoothing utils / matrix libsSatoshi Kataoka2013-05-274-0/+397
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8556775 Change-Id: I7e0516b344937b84b7d57cc4e5009b7f88e7dc98
* | | | | | | | am 599d8778: Specify OOV for the OOV word correctionSatoshi Kataoka2013-05-271-0/+4
|\| | | | | | | | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | * commit '599d8778f475f5d2f4db9ae34ad9f963d7b5f261': Specify OOV for the OOV word correction
| * | | | | | Specify OOV for the OOV word correctionSatoshi Kataoka2013-05-271-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9127749 Change-Id: I9ff0590428888afe57a009a1cbf8f008011b1544
* | | | | | am 2115f63c: Merge "Add contentDescription attribute to setup wizard video ↵Tadashi G. Takaoka2013-05-241-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and image" * commit '2115f63cbaf74b828375d65aee3e93b097aaba5d': Add contentDescription attribute to setup wizard video and image
| * | | | | Merge "Add contentDescription attribute to setup wizard video and image"Tadashi G. Takaoka2013-05-241-2/+4
| |\ \ \ \ \
| | * | | | | Add contentDescription attribute to setup wizard video and imageTadashi G. Takaoka2013-05-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9112276 Change-Id: I028371770bacd6d975dee5648230abc19f51f542