aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 6c88544f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-02-030-0/+0
|\ | | | | | | | | * commit '6c88544f95a73caaffa1451ae4670601b8231836': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEGeoff Mendal2014-02-0357-0/+1425
| | | | | | | | | | Change-Id: I7b3358893fca57f1ddc457c74daff9b3b2eb2ee4 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2014-02-0357-0/+1425
| | | | | | | | | | Change-Id: I6b376f39198a05ff070f3abc81addb69924096d2 Auto-generated-cl: translation import
* | am b06e4557: Clear important notice stripTadashi G. Takaoka2014-02-031-0/+1
|\| | | | | | | | | * commit 'b06e455797c0229fa068cfb2809c95c775ec695c': Clear important notice strip
| * Clear important notice stripTadashi G. Takaoka2014-02-031-0/+1
| | | | | | | | | | Bug: 10587358 Change-Id: Ic90e5825200a1d424aac4ba263b252187a203241
* | am 4d539f2c: Merge "Fix important notice strip text layout"Tadashi G. Takaoka2014-02-033-6/+13
|\| | | | | | | | | * commit '4d539f2c1e6120651aafce5104e15f2b484af033': Fix important notice strip text layout
| * Merge "Fix important notice strip text layout"Tadashi G. Takaoka2014-02-033-6/+13
| |\
| | * Fix important notice strip text layoutTadashi G. Takaoka2014-02-033-6/+13
| | | | | | | | | | | | | | | Bug: 10587358 Change-Id: I9cbdd3b450e05d6d0611a16b6b7fad945918dd5f
* | | am a2d83dfd: Merge "Show important notice dialog"Tadashi G. Takaoka2014-02-031-5/+20
|\| | | | | | | | | | | | | | * commit 'a2d83dfdc7ae8d1dfa51a9f00d600347e7c053ee': Show important notice dialog
| * | Merge "Show important notice dialog"Tadashi G. Takaoka2014-02-031-5/+20
| |\ \
| | * | Show important notice dialogTadashi G. Takaoka2014-02-031-5/+20
| | |/ | | | | | | | | | | | | Bug: 10587358 Change-Id: I3b4282a1bb183aa901110a4a2fc1b6ed72818aae
* | | am 80fa64e6: Merge "Don\'t resume suggestions if suggestions are not requested."Jean Chalard2014-02-031-0/+2
|\| | | | | | | | | | | | | | * commit '80fa64e66bd6ecfff783aee3e49df326f352c264': Don't resume suggestions if suggestions are not requested.
| * | Merge "Don't resume suggestions if suggestions are not requested."Jean Chalard2014-02-031-0/+2
| |\ \
| | * | Don't resume suggestions if suggestions are not requested.Jean Chalard2014-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: 12832614 Change-Id: I6a9b6d128d7e0324ba59a43cf153a3b54e1d35bf
* | | | am 5d9be803: Merge "Have empty suggestions go through setNeutralSuggestions."Jean Chalard2014-02-031-2/+4
|\| | | | | | | | | | | | | | | | | | | * commit '5d9be8039cf2321f42c3206594921430c06f7642': Have empty suggestions go through setNeutralSuggestions.
| * | | Merge "Have empty suggestions go through setNeutralSuggestions."Jean Chalard2014-02-031-2/+4
| |\ \ \
| | * | | Have empty suggestions go through setNeutralSuggestions.Jean Chalard2014-02-031-2/+4
| | |/ / | | | | | | | | | | | | | | | | Bug: 12865205 Change-Id: If17a390c445d0820325a9b16cc4f2f27a361187a
* | | | am 38f341a2: Add a jni method to iterate words in a dictionary.Keisuke Kuroyanagi2014-02-038-1/+83
|\| | | | | | | | | | | | | | | | | | | * commit '38f341a2a53a04ce4195a0cb99fcb6e71203dec0': Add a jni method to iterate words in a dictionary.
| * | | Add a jni method to iterate words in a dictionary.Keisuke Kuroyanagi2014-02-038-1/+83
| | |/ | |/| | | | | | | | | | Bug: 12810574 Change-Id: I87b13559765f0262dfd06c2ba40d43af6437ea7f
* | | am 9221772a: Get bigram information via getWordProperty().Keisuke Kuroyanagi2014-02-023-12/+107
|\| | | | | | | | | | | | | | * commit '9221772ab7f112f6ef9136a69d0502befbdc544e': Get bigram information via getWordProperty().
| * | Get bigram information via getWordProperty().Keisuke Kuroyanagi2014-02-033-12/+107
| | | | | | | | | | | | | | | Bug: 12810574 Change-Id: I2750a5659ccbc3e31307c28e35dd9a1dbdffbeee
* | | am 08d72c52: Merge "Introduce a delay for key-press feedback on the Emoji ↵Yohei Yukawa2014-02-021-10/+42
|\| | | | | | | | | | | | | | | | | | | | palette" * commit '08d72c52f9f543968224e23758b8ac81bfba4115': Introduce a delay for key-press feedback on the Emoji palette
| * | Merge "Introduce a delay for key-press feedback on the Emoji palette"Yohei Yukawa2014-02-031-10/+42
| |\ \
| | * | Introduce a delay for key-press feedback on the Emoji paletteYohei Yukawa2014-01-311-10/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently key-press effect such as highlight and vibration occur even when a user want to scroll the Emoji palette. To mitigate this situation, this patch introduces a short delay for key-press feedback on the Emoji palette. This is not an ideal solution but should be better than now. BUG: 11103083 Change-Id: I1fa4514d742eb37f36fef60e6beabbc5eaa1653a
* | | | am 5ecf74b1: Merge "Extend jni interface to get bigrams in WordProperty."Keisuke Kuroyanagi2014-01-316-77/+110
|\| | | | | | | | | | | | | | | | | | | * commit '5ecf74b14820b5b97dd0ac0a3fa51108bed1a7f0': Extend jni interface to get bigrams in WordProperty.
| * | | Merge "Extend jni interface to get bigrams in WordProperty."Keisuke Kuroyanagi2014-01-316-77/+110
| |\ \ \
| | * | | Extend jni interface to get bigrams in WordProperty.Keisuke Kuroyanagi2014-01-316-77/+110
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12810574 Change-Id: Ia4b88d02ea8790a5c47d32376cc0b84c3e071ddd
* | | | | am 25e71fdc: Merge "Fetch bigram information in getWordProperty()."Keisuke Kuroyanagi2014-01-311-1/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '25e71fdc821283cb236db9a01fddb55901e4c4be': Fetch bigram information in getWordProperty().
| * | | | Merge "Fetch bigram information in getWordProperty()."Keisuke Kuroyanagi2014-01-311-1/+35
| |\| | |
| | * | | Fetch bigram information in getWordProperty().Keisuke Kuroyanagi2014-01-311-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12810574 Change-Id: Ic67e964b01c2753f2eec82b079dc0e5650f340bb
* | | | | am 2abe1ced: Merge "Add important notice strip"Tadashi G. Takaoka2014-01-3113-5/+72
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '2abe1cedc87768a5639bfef83c4217addd877f92': Add important notice strip
| * | | | Merge "Add important notice strip"Tadashi G. Takaoka2014-01-3113-5/+72
| |\ \ \ \
| | * | | | Add important notice stripTadashi G. Takaoka2014-01-3113-5/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a groundwork to show important notice. Bug: 10587358 Change-Id: I80aa70d30e2a529b37798f0df2183b41df3ac38a
* | | | | | am 2ae7e53c: Merge "Move some methods to MoreKeySpec class"Tadashi G. Takaoka2014-01-3112-298/+322
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ae7e53c77108cf597c9aeeae494a53d5f339117': Move some methods to MoreKeySpec class
| * | | | | Merge "Move some methods to MoreKeySpec class"Tadashi G. Takaoka2014-01-3112-298/+322
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Move some methods to MoreKeySpec classTadashi G. Takaoka2014-01-3112-298/+322
| | | |_|/ | | |/| | | | | | | | | | | | Change-Id: I025ed15e36ac3113db6a5fccefa0c87f016703fa
* | | | | am 35ff07c7: Merge "Fix BinaryDictDecoderEncoderTests."Keisuke Kuroyanagi2014-01-311-0/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '35ff07c70badbbc25dcc130cc92f043a66da1a00': Fix BinaryDictDecoderEncoderTests.
| * | | | Merge "Fix BinaryDictDecoderEncoderTests."Keisuke Kuroyanagi2014-01-311-0/+13
| |\ \ \ \
| | * | | | Fix BinaryDictDecoderEncoderTests.Keisuke Kuroyanagi2014-01-311-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12809791 Change-Id: I04313df78692b01e153a34c932a37f079a924105
* | | | | | am c29ab24b: Merge "Add BigramProperty and ShortcutProperty in WordProperty."Keisuke Kuroyanagi2014-01-313-19/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c29ab24b2f7b32bd1e32536a7f39fc2e6ae29749': Add BigramProperty and ShortcutProperty in WordProperty.
| * | | | | Merge "Add BigramProperty and ShortcutProperty in WordProperty."Keisuke Kuroyanagi2014-01-313-19/+50
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add BigramProperty and ShortcutProperty in WordProperty.Keisuke Kuroyanagi2014-01-313-19/+50
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 12810574 Change-Id: Ia9e497c49bb2cf10897bae3a79317113325db819
* | | | | am 4e6f72cb: Merge "[HD03] Straighten out attribute key names in Java."Jean Chalard2014-01-3110-45/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '4e6f72cb801df273ec649f56d6a5c0182063b332': [HD03] Straighten out attribute key names in Java.
| * | | | Merge "[HD03] Straighten out attribute key names in Java."Jean Chalard2014-01-3110-45/+47
| |\ \ \ \
| | * | | | [HD03] Straighten out attribute key names in Java.Jean Chalard2014-01-3110-45/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11281748 Change-Id: I1d813bdacd45bcfd9c4cc73ac1d67c5c89854e86
* | | | | | am e6ae5a83: Merge "Fix dicttool_aosp build."Keisuke Kuroyanagi2014-01-311-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6ae5a839699c23f6accbc93249a119dc9a69320': Fix dicttool_aosp build.
| * | | | | Merge "Fix dicttool_aosp build."Keisuke Kuroyanagi2014-01-311-1/+1
| |\ \ \ \ \
| | * | | | | Fix dicttool_aosp build.Keisuke Kuroyanagi2014-01-311-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | Change-Id: I52918fea02425b628045443d63d178e289ac4fb7
* | | | | | am 7914a97b: Merge "Move some prefix strings to relevant classes"Tadashi G. Takaoka2014-01-316-12/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7914a97b7386e6aa7ddb133b6c5ead1b195592b8': Move some prefix strings to relevant classes
| * | | | | Merge "Move some prefix strings to relevant classes"Tadashi G. Takaoka2014-01-316-12/+15
| |\ \ \ \ \