aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-05-2957-57/+171
|\ \
| * | Import translations. DO NOT MERGEGeoff Mendal2014-05-2857-57/+171
| | | | | | | | | | | | | | | Change-Id: Ifd7419b2fda706b5035060348ed63d894f843a2e Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-05-291-9/+9
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-05-281-9/+9
| |/ / | | | | | | | | | | | | Change-Id: Ib6d03976824f13a9932473c440b476f950f92ef7 Auto-generated-cl: translation import
* / / Import translations. DO NOT MERGEGeoff Mendal2014-05-285-198/+198
|/ / | | | | | | | | Change-Id: If37d804345c2a1611af5019c36b0cf6c21e04c0e Auto-generated-cl: translation import
* | Merge "Stop directly checking SuggestedWordInfo.mKind"Keisuke Kuroyanagi2014-05-288-31/+44
|\ \
| * | Stop directly checking SuggestedWordInfo.mKindKeisuke Kuroyanagi2014-05-288-31/+44
| | | | | | | | | | | | | | | | | | Bug: 15298959 Change-Id: Iba6eeb7981634e7ddb896404978b30f6efd6e72f
* | | Add length check for attaching a BoS marker.Keisuke Kuroyanagi2014-05-281-1/+4
| | | | | | | | | | | | | | | Bug: 15297872 Change-Id: I7b0a27409b81b76561d19c6caa18a5011d3e90f6
* | | Merge "Run test only on KitKat devices"Jean Chalard2014-05-281-10/+19
|\ \ \
| * | | Run test only on KitKat devicesJean Chalard2014-05-281-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This won't work on < KK because it needs the armenian locale to be present on the device. I don't know why, but when under test, apps don't seem to be able to resolve resources for locales not supported by the system. Change-Id: Ie0f4fc30954978061cae751024bab5569a2ab2eb
* | | | am 342eca74: Merge "Update shift, next, and previous icon of LXX_Dark" into ↵Tadashi G. Takaoka2014-05-2817-2/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | lmp-preview-dev * commit '342eca7444e40d98310b61cc52b648cc7a3a98a9': Update shift, next, and previous icon of LXX_Dark
| * | | Merge "Update shift, next, and previous icon of LXX_Dark" into lmp-preview-devTadashi G. Takaoka2014-05-2817-2/+2
| |\ \ \
| | * | | Update shift, next, and previous icon of LXX_DarkTadashi G. Takaoka2014-05-2817-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15298065 Change-Id: Id5cd6c989ac1e64389f060f692b578a2ceec0db8
* | | | | am 4f28e16c: Update enter icon of LXX_DarkTadashi G. Takaoka2014-05-284-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '4f28e16ce52080c3411a4ab10fa6628260fd5740': Update enter icon of LXX_Dark
| * | | | Update enter icon of LXX_DarkTadashi G. Takaoka2014-05-284-0/+0
| |/ / / | | | | | | | | | | | | | | | | Bug: 15295910 Change-Id: I37d8c184ab500f4b4ffa57a6abe5516cb671ce29
* | | | am 91e69980: Use action key background for enter keyTadashi G. Takaoka2014-05-283-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit '91e69980bebc37a37f5d176450d952ba394cb303': Use action key background for enter key
| * | | Use action key background for enter keyTadashi G. Takaoka2014-05-283-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL also use an action key background for the emoji key only on phone becase the emoji key share the same position with other action keys. The emoji key on tablet keeps using the functional key background. Bug: 15296851 Change-Id: I7b8550c61f19548f463a782342bdc0f496433a2a
* | | | am 770626e0: merge in master-release history after reset to ↵The Android Automerger2014-05-280-0/+0
|\| | | | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc1e70b379415531aa4344bceca299f9ca662444 * commit '770626e07460b90c377b980abc8e3e3365bfa9f1': Revert "Use PrevWordsInfo for get/add/remove n-gram(bigram) entry." Fix a NPE in DistracterFilter.isDistracterToWordsInDictionaries() Fix NPE Fix: NPE after onDestroy(). Fix a null object reference crash on Emoji Palette Fix an NPE. Revert "Fix a race condition."
| * | merge in master-release history after reset to ↵The Android Automerger2014-05-220-0/+0
| |\ \ | | | | | | | | | | | | dc1e70b379415531aa4344bceca299f9ca662444
| | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-220-0/+0
| | |\ \ | | | | | | | | | | | | | | | ea09e6bddba6b968fbf1ee0264aa18bd7bbe7e80
| | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-210-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | 17f326b7458c2bde2569e283a96e703755485328
| | | | * | Revert "Use PrevWordsInfo for get/add/remove n-gram(bigram) entry."Ken Wakasa2014-05-2015-247/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ff50b39176370ab80a33bfdcf9979603c08a88b3. Bug: 14119293 Bug: 14425059 Bug: 15102610 Change-Id: If278b4ab236e38d20d8cdc0761b0438911bd4ff9
| | | | * | merge in master-release history after reset to ↵The Android Automerger2014-05-200-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | 305778b53a5e7c865cae4010e657d00bb9bf5075
| | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-190-0/+0
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | d7bef2bee16b6e529d55b505764a79821fe3c825
| | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-180-0/+0
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 23246ed18d9b26d8a7673140c00e060022be935b
| | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-170-0/+0
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96013c9605218bac83c614961b8e35608e9eca5d
| | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-150-0/+0
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d94567d9637aae33905fc7f292a615996df6d3c9
| | | | | | | | | * | Fix a NPE in DistracterFilter.isDistracterToWordsInDictionaries()Xiaojun Bi2014-05-141-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14904706 Change-Id: I3b52bb01b9c59cbba2eba0bd1d91dffb4419c019
| | | | | | | | | * | merge in master-release history after reset to ↵The Android Automerger2014-05-140-0/+0
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | babde55bf843c2262d84580c0139ed6b040bef7e
| | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-130-0/+0
| | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fc93fadd6bfd03ba3d2f535e4e412b09df33016
| | | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-120-0/+0
| | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61ddac28de56861aa77a7f06e5607ddec7ce8ccd
| | | | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-110-0/+0
| | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b74f516dcfb7b6c8008054490db117341e5332b
| | | | | | | | | | | | | * | merge in master-release history after reset to ↵The Android Automerger2014-05-100-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b74f516dcfb7b6c8008054490db117341e5332b
| | | | | | | | | | | | | * | merge in master-release history after reset to ↵The Android Automerger2014-05-080-0/+0
| | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf09cb2390962b18f6014320290431f79ec77dc1
| | | | | | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-070-0/+0
| | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35acf309b7ecbe6741782ee635d6048b10dd4308
| | | | | | | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-070-0/+0
| | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04348c3637253956109a0e75b4d61713c2830390
| | | | | | | | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-05-060-0/+0
| | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0de529b4cac458b2d561060d3ae2c7f7f82b676d
| | | | | | | | | | | | | | | | | * | merge in master-release history after reset to ↵The Android Automerger2014-05-050-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0de529b4cac458b2d561060d3ae2c7f7f82b676d
| | | | | | | | | | | | | | | | | * | merge in master-release history after reset to ↵The Android Automerger2014-05-040-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0de529b4cac458b2d561060d3ae2c7f7f82b676d
| | | | | | | | | | | | | | | | | * | merge in master-release history after reset to ↵The Android Automerger2014-05-030-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0de529b4cac458b2d561060d3ae2c7f7f82b676d
| | | | | | | | | | | | | | | | | * | Fix NPEKen Wakasa2014-05-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to I2b0ec091a11aa8a495794d633efecb6d8b818f42 bug: 14488351 Change-Id: Ic88adbd6775910f35338d798dc0d5493715708e4
| | | | | | | | | | | | | | | | | * | merge in master-release history after reset to ↵The Android Automerger2014-05-010-0/+0
| | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c005c1dc565bd02cb1a24d5349a8078ed49dbae9
| | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-04-300-0/+0
| | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d54f9f53cf7a82a0745b0c575cf11d63ec20746
| | | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-04-290-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0d754397e49bb39da8313e015731e43adf02586
| | | | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-04-280-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2367f8f602f8f40dbffc2daeae06443c1f28d996
| | | | | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to ↵The Android Automerger2014-04-270-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cc7c3321d9e1dea462cbcd78a6ee1a99985b73b
| | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to ↵The Android Automerger2014-04-260-0/+0
| | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cc7c3321d9e1dea462cbcd78a6ee1a99985b73b
| | | | | | | | | | | | | | | | | | | | | | * | merge in master-release history after reset to ↵The Android Automerger2014-04-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9e0b99765b81e098ac1fc70a1f1a4f4d18ed214
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to masterThe Android Automerger2014-04-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in master-release history after reset to masterThe Android Automerger2014-04-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \