aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-03-260-0/+0
|\ | | | | | | | | | | | | lmp-mr1-dev * commit 'cad0777a4bade34d6bedd096eae712e29df99fc1': Import translations. DO NOT MERGE
| * Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2015-01-2965-17/+47675
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-01-2865-17/+47675
| | | | | | | | | | | | | | | Change-Id: Ib3c761dfca6acc7b2ca23838e777ed702f49f7e8 Auto-generated-cl: translation import
* | | am 31d085ff: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-260-0/+0
|\| | | | | | | | | | | | | | * commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEGeoff Mendal2015-01-282-2/+2
| |/ | | | | | | | | Change-Id: Ib4a377f96214ed7292cb0ff3e2815f1c864cc1bb Auto-generated-cl: translation import
* | am 943db315: (DO NOT MERGE) Fix Greek accented upper case lettersTadashi G. Takaoka2014-11-214-9/+219
|\| | | | | | | | | * commit '943db315f55db7ef86dc0f78b6354238422039d8': (DO NOT MERGE) Fix Greek accented upper case letters
| * (DO NOT MERGE) Fix Greek accented upper case lettersTadashi G. Takaoka2014-11-214-9/+219
| | | | | | | | | | | | | | | | Cherry-picked 6fc92899d82f4d3cb30f7bb2c57133154f0babd2 from ub-latinimegoogle-edamame-mr1-release. Bug: 18418991 Change-Id: Id4dff41ba488635ff9af899be6d4f84ab00a96c8
* | Fix restore from keyboardSandeep Siddhartha2014-11-071-1/+0
|\| | | | | | | | | | | | | automerge: e551539 * commit 'e5515395f11ce3f6ba5ddebb1fc029c51f51b8b3': Fix restore from keyboard
| * Fix restore from keyboardSandeep Siddhartha2014-11-071-1/+0
| | | | | | | | | | | | | | | | | | The keyboard starts up before the restore process and the default shared preferences are cached and used even after the restore. Bug: 17837918 Change-Id: I2669e377b6e95813657fd6a80fbff4472330e3aa (cherry picked from commit e9d814674b9c94d61b474f58633a75afb7d2a616)
* | am d25f8443: (-s ours) am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge ↵Baligh Uddin2014-10-190-0/+0
|\| | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit 'd25f8443ebf3ec5adb28ae6e24c3d17f6a0bdf7b': Import translations. DO NOT MERGE
| * am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-10-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-dev * commit '6a8871058f857d12390a8887faac4fd2b08bd34c': Import translations. DO NOT MERGE
| | * am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-10-190-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit 'c04edfc31c8e1538630fe3bff06928669d1e3869': Import translations. DO NOT MERGE
| | | * Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-10-192-6/+6
| | | |\
| | | | * Import translations. DO NOT MERGEBaligh Uddin2014-10-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2c146260b359f187a1d1e5d9f60db4bdc041592 Auto-generated-cl: translation import
* | | | | am 93d67f65: (-s ours) am 6949eb15: (-s ours) am 815b31f9: (-s ours) Merge ↵Baligh Uddin2014-10-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit '93d67f65ac2d154a29dc7afdc6ae039b98fd07fd': Import translations. DO NOT MERGE
| * | | | am 6949eb15: (-s ours) am 815b31f9: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-10-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-dev * commit '6949eb15668dd099958fe7e00afcba448bb09aa1': Import translations. DO NOT MERGE
| | * | | am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-10-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '815b31f9034dfe56b41852edcb87414db1d1d177': Import translations. DO NOT MERGE
| | | * | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-10-191-1/+1
| | | |\ \
| | | | * | Import translations. DO NOT MERGEBaligh Uddin2014-10-191-1/+1
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: I98a9c7c9942f726ec44bf7dcf651513ab2f6396b Auto-generated-cl: translation import
* | | | | am ffd0f4d5: (-s ours) am 6f1de7e5: (-s ours) am cf1c95ec: (-s ours) Merge ↵Baligh Uddin2014-10-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit 'ffd0f4d5e753c936455a7bedd6c6d83912ce6ae0': Import translations. DO NOT MERGE
| * | | | am 6f1de7e5: (-s ours) am cf1c95ec: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-10-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-dev * commit '6f1de7e5f1a1d75f85eb5c08186d4a9707ba16f1': Import translations. DO NOT MERGE
| | * | | am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-10-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'cf1c95ec2264a4dd08365ff6cdf97e92976c390c': Import translations. DO NOT MERGE
| | | * | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-10-198-19/+19
| | | |\ \
| | | | * | Import translations. DO NOT MERGEBaligh Uddin2014-10-198-19/+19
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Iab03b9dbbfc33fc9e3b4c533b2a14b38e9ab4536 Auto-generated-cl: translation import
* | | | | am 3b793b9b: (-s ours) am d541cacf: (-s ours) am be25b245: (-s ours) Import ↵Baligh Uddin2014-10-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '3b793b9b5294f606cfb3533c0734026ee9e4890a': Import translations. DO NOT MERGE
| * | | | am d541cacf: (-s ours) am be25b245: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd541cacff68f5b009a264721e3e2878d70aa65e2': Import translations. DO NOT MERGE
| | * | | am be25b245: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'be25b245f6320ed16fc77c5a09e15a7d15511702': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEBaligh Uddin2014-10-192-2/+2
| | | |/ | | | | | | | | | | | | | | | | Change-Id: Id60ee51f6e56aadd047d93e8098751256ce7daf3 Auto-generated-cl: translation import
* | | | am d9c04a6b: am 6456af0e: am ecea8551: Fix a bug with no suggestions flagJean Chalard2014-10-152-4/+7
|\| | | | | | | | | | | | | | | | | | | * commit 'd9c04a6b65f1eba95b87a00b90f8685108d48b2e': Fix a bug with no suggestions flag
| * | | am 6456af0e: am ecea8551: Fix a bug with no suggestions flagJean Chalard2014-10-152-4/+7
| |\| | | | | | | | | | | | | | | | | | * commit '6456af0e1ce1044bf89bd8768849365aa3a21413': Fix a bug with no suggestions flag
| | * | am ecea8551: Fix a bug with no suggestions flagJean Chalard2014-10-152-4/+7
| | |\| | | | | | | | | | | | | | | | | * commit 'ecea8551c39a497e036be5c010d7ddb6b51a36bc': Fix a bug with no suggestions flag
| | | * Fix a bug with no suggestions flagJean Chalard2014-10-152-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should reset the composition state when moving the cursor inside the word after a gesture when the text field specifies no suggestions. Bug: 17959921 Change-Id: I977fea775f7b7e145e343636f0fb94266a40953a
* | | | am 6d23337f: am 2da73365: am ae3ad8eb: (DO NOT MERGE) Fix checking a11y ↵Tadashi G. Takaoka2014-10-154-9/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | status just before calling an a11y method * commit '6d23337f6d022e7bcdc91f63a2d4f5edfc3d6590': (DO NOT MERGE) Fix checking a11y status just before calling an a11y method
| * | | am 2da73365: am ae3ad8eb: (DO NOT MERGE) Fix checking a11y status just ↵Tadashi G. Takaoka2014-10-154-9/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | before calling an a11y method * commit '2da7336536a8e72f6e7d138d7b2580c077176345': (DO NOT MERGE) Fix checking a11y status just before calling an a11y method
| | * | am ae3ad8eb: (DO NOT MERGE) Fix checking a11y status just before calling an ↵Tadashi G. Takaoka2014-10-154-9/+15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | a11y method * commit 'ae3ad8ebdd1a3239e17fd14e50a8e9670cb5b61a': (DO NOT MERGE) Fix checking a11y status just before calling an a11y method
| | | * (DO NOT MERGE) Fix checking a11y status just before calling an a11y methodTadashi G. Takaoka2014-10-144-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | Cherry picked from Master, commit 04cd8794e04b14c2b7e7eed036b83075792134a1 Bug: 17035860 Change-Id: I9627d525a570ced085281b4db93fe6896081e818
* | | | am 946d7388: (-s ours) am 3e3b91dc: (-s ours) am d218ba4b: (-s ours) Import ↵Geoff Mendal2014-10-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '946d7388c7afa8043379eb30176fbf848d74e926': Import translations. DO NOT MERGE
| * | | am 3e3b91dc: (-s ours) am d218ba4b: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-070-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '3e3b91dc9b78e031c7e84219315fc9d5282f91c7': Import translations. DO NOT MERGE
| | * | am d218ba4b: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-070-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit 'd218ba4b518b38ee2ab144e16c9b60a91eacdf95': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2014-10-062-13/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: I542174a860f968289c76095dd059ee595b790409 Auto-generated-cl: translation import
* | | | am 5c451d58: (-s ours) am 4d9e4399: (-s ours) am 4f4ef946: (-s ours) Import ↵Baligh Uddin2014-10-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '5c451d58935b68d64574764f6253a6737b524966': Import translations. DO NOT MERGE
| * | | am 4d9e4399: (-s ours) am 4f4ef946: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-050-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '4d9e439985dc684237aa8a7b5a2f7cee2bb6faf7': Import translations. DO NOT MERGE
| | * | am 4f4ef946: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-050-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit '4f4ef946adf06aa89f4738de9b60832938c70012': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEBaligh Uddin2014-10-052-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie3bd15488ad9d5594a95dd2734eab17189740b35 Auto-generated-cl: translation import
* | | | am 1bf3bb5d: (-s ours) am abc95f78: (-s ours) am d3a5b55b: (-s ours) Import ↵Baligh Uddin2014-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '1bf3bb5de371b3f9d9e3709f5df32009c9c18348': Import translations. DO NOT MERGE
| * | | am abc95f78: (-s ours) am d3a5b55b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'abc95f78159bbd696df8822294e2294add3a073c': Import translations. DO NOT MERGE
| | * | am d3a5b55b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-010-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit 'd3a5b55ba7ef368f2de25d03d3d51c98146a80ce': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEBaligh Uddin2014-09-302-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id3f3a910f5503eb21582d5f8eb376948ac753470 Auto-generated-cl: translation import
* | | | am 31838876: am 9baaa4b5: am 6ad437ed: Merge "Fix NPE due to the lack of ↵Yohei Yukawa2014-10-012-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | null-check" into lmp-dev * commit '318388767d7f6d651f05f4ab9022233c0543b259': Fix NPE due to the lack of null-check
| * | | am 9baaa4b5: am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into ↵Yohei Yukawa2014-10-012-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '9baaa4b5c7bb9688a9a97e99bdeda9574a890fca': Fix NPE due to the lack of null-check