aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | am 87bcd655: (-s ours) am 0ebddf36: Import translations. DO NOT MERGEEric Fischer2012-06-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '87bcd65507129883cdfdeb62b881530520a78200': Import translations. DO NOT MERGE
| * | | | am 0ebddf36: Import translations. DO NOT MERGEEric Fischer2012-06-0249-2/+100
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '0ebddf366950beca5fd447d68422530345cffc31': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEEric Fischer2012-06-0149-2/+100
| | | | | | | | | | | | | | | | | | | | Change-Id: I08348cabf4793607183c40fd658e74e172633791
* | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0149-2/+100
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie481f0958f930eeadfd160ff3725cec70c9a452c
* | | | | am e6560252: am 72cd8466: Merge "Fix NPE in user history bigram dictionary" ↵satok2012-05-311-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'e656025282c0da28ed80b2604949092dbc5fb72e': Fix NPE in user history bigram dictionary
| * | | | am 72cd8466: Merge "Fix NPE in user history bigram dictionary" into jb-devsatok2012-05-311-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '72cd84665c01494de36a78555a6bdf9c6cdf0662': Fix NPE in user history bigram dictionary
| | * | | Merge "Fix NPE in user history bigram dictionary" into jb-devsatok2012-05-311-0/+7
| | |\ \ \
| | | * | | Fix NPE in user history bigram dictionarysatok2012-06-011-0/+7
| | | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 6584882 Change-Id: Id0162bffc4f0f36239cdc68383f8a47d7a957397
* | | | | am d30cfee5: am 40e5f403: Merge "Add special case for speaking ACTION_ENTER ↵Charles Chen2012-05-312-0/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keys." into jb-dev * commit 'd30cfee577228873902a16791cd8c3ad3fad4a4c': Add special case for speaking ACTION_ENTER keys.
| * | | | am 40e5f403: Merge "Add special case for speaking ACTION_ENTER keys." into ↵Charles Chen2012-05-312-0/+53
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '40e5f403af49d8da1f25d9368d18541390e05c38': Add special case for speaking ACTION_ENTER keys.
| | * | | Merge "Add special case for speaking ACTION_ENTER keys." into jb-devCharles Chen2012-05-312-0/+53
| | |\ \ \
| | | * | | Add special case for speaking ACTION_ENTER keys.alanv2012-05-312-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6576058 Change-Id: If9a4fc2ddd5bcbac5f610d705441aa379c499a6f
* | | | | | Merge "Include version number in log output."Kurt Partridge2012-05-311-4/+3
|\ \ \ \ \ \
| * | | | | | Include version number in log output.Kurt Partridge2012-05-311-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6188932 Change-Id: I1039a3ad317d207599f30fe578bdf814c80d6852
* | | | | | | am c7206510: (-s ours) am ca8c001f: Merge "Import translations. DO NOT ↵Eric Fischer2012-05-310-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-dev * commit 'c720651001117d67f4aca62350979b2854a88de5': Import translations. DO NOT MERGE
| * | | | | | am ca8c001f: Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-312-3/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'ca8c001f62e55f3060625eade926cee148df55bc': Import translations. DO NOT MERGE
| | * | | | | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-312-3/+3
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEEric Fischer2012-05-312-3/+3
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | Change-Id: Ic7fe11c9f60a61f611840373bf0cea8efb1f213c
* | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-05-312-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEEric Fischer2012-05-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic419b50be5c1f4be3db5a0b34fae75018ffedf91
* | | | | | | | am c764fd80: am b99788c3: Merge "Update keyboard view used by node provider. ↵Charles Chen2012-05-312-16/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Remove global layout listener." into jb-dev * commit 'c764fd80b56663eb44f52c7b76527b048d282efb': Update keyboard view used by node provider. Remove global layout listener.
| * | | | | | am b99788c3: Merge "Update keyboard view used by node provider. Remove ↵Charles Chen2012-05-312-16/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | global layout listener." into jb-dev * commit 'b99788c3b8382d81dfa4353312c3c4828ac30557': Update keyboard view used by node provider. Remove global layout listener.
| | * | | | | Merge "Update keyboard view used by node provider. Remove global layout ↵Charles Chen2012-05-312-16/+20
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | listener." into jb-dev
| | | * | | | Update keyboard view used by node provider. Remove global layout listener.alanv2012-05-302-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6582130 Change-Id: I2976e37e921a3e2c151486a919b0a93a908c3384
* | | | | | | am bb104678: am 6f0cd9ba: Fix a possible NPE.Jean Chalard2012-05-311-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bb10467863ff531c5cbee8ffd72845a91e487e72': Fix a possible NPE.
| * | | | | | am 6f0cd9ba: Fix a possible NPE.Jean Chalard2012-05-311-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f0cd9ba6df3f254d4f5bfc5ac11e354e858b713': Fix a possible NPE.
| | * | | | | Fix a possible NPE.Jean Chalard2012-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This NPE's at least in unit tests. Change-Id: I255ac5fec9502e4e5bd18cba1211cdf46c6cafc8
* | | | | | | am b62adc43: am 38a24ba8: Merge "Add a whitelist entry" into jb-devJean Chalard2012-05-311-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b62adc436ce064aff4b824bc71b7d73dabb8439b': Add a whitelist entry
| * | | | | | am 38a24ba8: Merge "Add a whitelist entry" into jb-devJean Chalard2012-05-311-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38a24ba82df4c9c95a4ec71dec6d4b6e82f374c6': Add a whitelist entry
| | * | | | | Merge "Add a whitelist entry" into jb-devJean Chalard2012-05-311-0/+4
| | |\ \ \ \ \
| | | * | | | | Add a whitelist entryJean Chalard2012-05-311-0/+4
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6394369 Change-Id: I2308ca85f7deea73186742baff1499eb0aa35a77
* | | | | | | am 38e73564: am 73e417b5: Merge "Improvements to the English dicts" into jb-devJean Chalard2012-05-314-3277/+3107
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38e7356493250b427d2307bd6cfcf0b61c09daa9': Improvements to the English dicts
| * | | | | | am 73e417b5: Merge "Improvements to the English dicts" into jb-devJean Chalard2012-05-314-3277/+3107
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73e417b57bad25b8f1ddf3c5e7dc099f7d002b91': Improvements to the English dicts
| | * | | | | Merge "Improvements to the English dicts" into jb-devJean Chalard2012-05-314-3277/+3107
| | |\ \ \ \ \
| | | * | | | | Improvements to the English dictsJean Chalard2012-05-314-3277/+3107
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6394369 Change-Id: I7a4747386adef44e6d1a0c9fec52d09611f1ce10
* | | | | | | am dfafcc43: am 260ba38d: Merge "Add a few entries to the whitelist for ↵Jean Chalard2012-05-311-0/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | English." into jb-dev * commit 'dfafcc4375daff66312e8ee867294df97d7a4261': Add a few entries to the whitelist for English.
| * | | | | | am 260ba38d: Merge "Add a few entries to the whitelist for English." into jb-devJean Chalard2012-05-311-0/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '260ba38d535cdec2557ff77da17bb7ad06f81302': Add a few entries to the whitelist for English.
| | * | | | | Merge "Add a few entries to the whitelist for English." into jb-devJean Chalard2012-05-311-0/+16
| | |\ \ \ \ \
| | | * | | | | Add a few entries to the whitelist for English.Jean Chalard2012-05-311-0/+16
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6394369 Change-Id: I8fab241580d13cc881741085559611b99df34c53
* | | | | | | am 02963c40: am fb3fdf15: Merge "Enhance the safety net in multiple word ↵Satoshi Kataoka2012-05-312-5/+45
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestions" into jb-dev * commit '02963c40326af954f4ea351e4f00fc83e2356d68': Enhance the safety net in multiple word suggestions
| * | | | | | am fb3fdf15: Merge "Enhance the safety net in multiple word suggestions" ↵Satoshi Kataoka2012-05-312-5/+45
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'fb3fdf15040cb67c311047dea0144fa5aa071185': Enhance the safety net in multiple word suggestions
| | * | | | | Merge "Enhance the safety net in multiple word suggestions" into jb-devSatoshi Kataoka2012-05-312-5/+45
| | |\ \ \ \ \
| | | * | | | | Enhance the safety net in multiple word suggestionsSatoshi Kataoka2012-05-312-5/+45
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6576793 Change-Id: I97100b482d3cf4e1b417c197b5d1e971a72b998d
* | | | | | | am 8f542d17: am 8fe16c4d: Merge "Add word lists for Czech, Norwegian Bokmål ↵Jean Chalard2012-05-303-0/+561004
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and EU Portuguese" into jb-dev * commit '8f542d17efa4f4dda23be18d09d81c2f57114d27': Add word lists for Czech, Norwegian Bokmål and EU Portuguese
| * | | | | | am 8fe16c4d: Merge "Add word lists for Czech, Norwegian Bokmål and EU ↵Jean Chalard2012-05-303-0/+561004
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portuguese" into jb-dev * commit '8fe16c4dcb41500203ae85f52cfd3ba29817eca5': Add word lists for Czech, Norwegian Bokmål and EU Portuguese
| | * | | | | Merge "Add word lists for Czech, Norwegian Bokmål and EU Portuguese" into ↵Jean Chalard2012-05-303-0/+561004
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-dev
| | | * | | | | Add word lists for Czech, Norwegian Bokmål and EU PortugueseJean Chalard2012-05-313-0/+561004
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5779153 Bug: 5587752 Change-Id: I0b91c99097bdc644bb21eea3f3a1e3385281471f
* | | | | | | am c6791d67: am 60ee192b: Utilize Rect\'s methodTadashi G. Takaoka2012-05-301-6/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6791d6773f34990e9aac8f7219be82fa91ab92e': Utilize Rect's method
| * | | | | | am 60ee192b: Utilize Rect\'s methodTadashi G. Takaoka2012-05-301-6/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '60ee192b07a9725e97b3105acfc1eea5f5f25b9f': Utilize Rect's method
| | * | | | | Utilize Rect's methodTadashi G. Takaoka2012-05-311-6/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Ia3df1baae4b92eca828c53c17f68ff26b25e525c