aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | am 284e73bd: Merge "Show emoji key on PC layout"Satoshi Kataoka2013-09-182-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '284e73bd419779608e6b8c91dd0edde151d75a4d': Show emoji key on PC layout
| * | | | Merge "Show emoji key on PC layout"Satoshi Kataoka2013-09-192-6/+6
| |\ \ \ \
| | * | | | Show emoji key on PC layoutSatoshi Kataoka2013-09-192-6/+6
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 10812167 Change-Id: Ie1e22a1651f8ec40e4078c01d161d6c113de582e
* | | | | am 142d68cf: Disable Nepali layouts temporarily per product callKen Wakasa2013-09-181-2/+4
|\| | | | | |_|_|/ |/| | | | | | | | | | | * commit '142d68cfd034d452c8119c014b55d199efdeae52': Disable Nepali layouts temporarily per product call
| * | | Disable Nepali layouts temporarily per product callKen Wakasa2013-09-191-2/+4
| |/ / | | | | | | | | | | | | | | | bug: 6910787 bug: 9833890 Change-Id: Id58cdf117d145c03c96f8737a12bb1b11bd4e636
* | | am 7635ada2: Merge "Fix test in SubtypeLocaleUtilsTests"Satoshi Kataoka2013-09-181-21/+21
|\| | | | | | | | | | | | | | * commit '7635ada2463730ab9e356922bb21cf5cf2a2716e': Fix test in SubtypeLocaleUtilsTests
| * | Merge "Fix test in SubtypeLocaleUtilsTests"Satoshi Kataoka2013-09-191-21/+21
| |\ \ | | |/ | |/|
| | * Fix test in SubtypeLocaleUtilsTestsSatoshi Kataoka2013-09-191-21/+21
| | | | | | | | | | | | Change-Id: I4f7bf70ec7a0a67ad5d2129afed314b1b1a93a6c
* | | am 86780628: Merge "Fix an NPE."Jean Chalard2013-09-181-1/+2
|\| | | | | | | | | | | | | | * commit '8678062853291f46ea0b994375b251b6604c42a6': Fix an NPE.
| * | Merge "Fix an NPE."Jean Chalard2013-09-181-1/+2
| |\ \
| | * | Fix an NPE.Jean Chalard2013-09-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, it is possible that File#getPath() returns null. In this case, we'll have a null AssetFileAddress and an NPE later down the road. Bug: 9944824 Change-Id: Id6ceac1cb55439660f9811cf0fe3b574200d5a20
* | | | am 08bc97f8: Merge "Allow double-space-to-period after a plus char"Jean Chalard2013-09-182-4/+3
|\| | | | | | | | | | | | | | | | | | | * commit '08bc97f86fd82b51a59e1d0c6532b093c54dd3b5': Allow double-space-to-period after a plus char
| * | | Merge "Allow double-space-to-period after a plus char"Jean Chalard2013-09-182-4/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Allow double-space-to-period after a plus charJean Chalard2013-09-182-4/+3
| | |/ | | | | | | | | | | | | Bug: 10704936 Change-Id: I30fdaea648605ef7e7fea6c093581ed5c6de03f3
* | | am 957a2337: Merge "Set EmojiCapable"Satoshi Kataoka2013-09-184-71/+81
|\| | | | | | | | | | | | | | * commit '957a2337eee3a075957d6c397396996febd78982': Set EmojiCapable
| * | Merge "Set EmojiCapable"Satoshi Kataoka2013-09-184-71/+81
| |\ \
| | * | Set EmojiCapableSatoshi Kataoka2013-09-184-71/+81
| | | | | | | | | | | | | | | | | | | | Bug: 10240645 Change-Id: I891309c2a82f8d10f8fdb0872403a7a235e27b5f
* | | | am 8837deab: Merge "Fix Emoji recents"Satoshi Kataoka2013-09-185-23/+122
|\| | | | | | | | | | | | | | | | | | | * commit '8837deab730658c67e64c92548168e4aaab1ebc2': Fix Emoji recents
| * | | Merge "Fix Emoji recents"Satoshi Kataoka2013-09-185-23/+122
| |\ \ \
| | * | | Fix Emoji recentsSatoshi Kataoka2013-09-185-23/+122
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 10538430 Change-Id: Ia2e423eb1843195b3c3218afc79a5820b8cd729b
* | | | am 256937b4: Merge "Fix getChildrenPosition."Ken Wakasa2013-09-181-2/+9
|\| | | | | | | | | | | | | | | | | | | * commit '256937b475a8183ac8bfa7964188071497d4fe7d': Fix getChildrenPosition.
| * | | Merge "Fix getChildrenPosition."Ken Wakasa2013-09-181-2/+9
| |\ \ \
| | * | | Fix getChildrenPosition.Yuichiro Hanada2013-09-181-2/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic39592dbf0d4e6d2e4879cdb1a95b65d46a57e92
* | | | | am 59418672: Merge "Don\'t resume suggestion on digits."Jean Chalard2013-09-181-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '59418672a140db38b9f17fee6d7df399897fbb39': Don't resume suggestion on digits.
| * | | | Merge "Don't resume suggestion on digits."Jean Chalard2013-09-181-0/+8
| |\ \ \ \
| | * | | | Don't resume suggestion on digits.Jean Chalard2013-09-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10780016 Change-Id: I94fad06e4c71eddc96bdda1765925f98bed160f3
* | | | | | am 4ad4b9d9: Merge "Fix contacts/user dictionary writing."Keisuke Kuroyanagi2013-09-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ad4b9d976c4d269a4cce8373b284279b851c90c': Fix contacts/user dictionary writing.
| * | | | | Merge "Fix contacts/user dictionary writing."Keisuke Kuroyanagi2013-09-181-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix contacts/user dictionary writing.Keisuke Kuroyanagi2013-09-181-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 10743878 Change-Id: I5d61b7955ef69a635f994f01cc575fb23fdf942b
* | | | | am 9465819c: Merge "Add BinaryDictionary.getBigramProbabilityNative()."Keisuke Kuroyanagi2013-09-171-5/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '9465819cf6f2e6c2074daaae60c5efc0c170185e': Add BinaryDictionary.getBigramProbabilityNative().
| * | | | Merge "Add BinaryDictionary.getBigramProbabilityNative()."Keisuke Kuroyanagi2013-09-181-5/+17
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add BinaryDictionary.getBigramProbabilityNative().Keisuke Kuroyanagi2013-09-181-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10197478 Change-Id: Id16e3ee22a17679c46cc7a0199a9e28065177aa3
* | | | | am 9b78241d: Merge "Improve trailing quotes processing"Jean Chalard2013-09-171-2/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '9b78241dff6b785408ae19512f6875e63771b349': Improve trailing quotes processing
| * | | | Improve trailing quotes processingJean Chalard2013-09-171-2/+7
| | |/ / | |/| | | | | | | | | | | | | | Bug: 10445496 Change-Id: Ib7bd05aea59ae6c9b8ce31299ef2235521b0e350
* | | | am 060917ed: [AC9] Resize an arrayJean Chalard2013-09-171-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '060917ed9abff0e777e6b99e43cc4b826d1ac0c8': [AC9] Resize an array
| * | | [AC9] Resize an arrayJean Chalard2013-09-171-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | It's not easy for native code to only output the first result, so let's supply enough room for it to output all. Bug: 9059617 Change-Id: Ie93b7e54284c8c5d01fdc15846cf52d3442287b6
* | | am 5cab0eb7: Merge "[AC8] Restrict the suggestion strip to the correct part"Jean Chalard2013-09-172-0/+21
|\| | | | | | | | | | | | | | * commit '5cab0eb75b430fe15f59f7af828416b6b087dbe8': [AC8] Restrict the suggestion strip to the correct part
| * | Merge "[AC8] Restrict the suggestion strip to the correct part"Jean Chalard2013-09-172-0/+21
| |\ \
| | * | [AC8] Restrict the suggestion strip to the correct partJean Chalard2013-09-172-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...for phrase gesture. Bug: 9059617 Change-Id: Ic5c0616f28af4ba45ca72a5721d1926029adc1c5
* | | | am ac7e005e: Merge "Prepare dictionary saving in native code."Keisuke Kuroyanagi2013-09-171-0/+24
|\| | | | | | | | | | | | | | | | | | | * commit 'ac7e005ef0013fdd9af173e7bce968e26100949d': Prepare dictionary saving in native code.
| * | | Prepare dictionary saving in native code.Keisuke Kuroyanagi2013-09-171-0/+24
| |/ / | | | | | | | | | | | | | | | Bug: 6669677 Change-Id: I0787f66409e2b183c6328fa05805945520e1e93a
* | | am 7e51989b: Merge "[AC7] Actually auto-commit."Jean Chalard2013-09-174-7/+46
|\| | | | | | | | | | | | | | * commit '7e51989b3fba9b3cc25e48ca5640d569a2195fab': [AC7] Actually auto-commit.
| * | Merge "[AC7] Actually auto-commit."Jean Chalard2013-09-174-7/+46
| |\ \ | | |/ | |/|
| | * [AC7] Actually auto-commit.Keisuke Kuroyanagi2013-09-174-7/+46
| | | | | | | | | | | | | | | Bug: 9059617 Change-Id: I7e5d89a9037b9181a0a6456c12043b4bfda8fe4b
* | | am d2cafb03: Merge "Temporary disable saving keys of emoticons to recents"Satoshi Kataoka2013-09-171-1/+4
|\| | | | | | | | | | | | | | * commit 'd2cafb03050dfd6239e56f5e4a844931aa0faa79': Temporary disable saving keys of emoticons to recents
| * | Merge "Temporary disable saving keys of emoticons to recents"Satoshi Kataoka2013-09-171-1/+4
| |\ \
| | * | Temporary disable saving keys of emoticons to recentsSatoshi Kataoka2013-09-171-1/+4
| | |/ | | | | | | | | | | | | Bug: 10538430 Change-Id: I4c3d0d692eecdd3bb5e780bdaca46f3310065471
* | | am f1f0b325: Fix Emoji key pressed backgroundSatoshi Kataoka2013-09-176-0/+6
|\| | | | | | | | | | | | | | * commit 'f1f0b3254960527aa805ac1e3f92723b88353f04': Fix Emoji key pressed background
| * | Fix Emoji key pressed backgroundSatoshi Kataoka2013-09-176-0/+6
| |/ | | | | | | | | Bug: 10538430 Change-Id: I933f075c5e84b637c4d171a7dcc685f0dc8a88df
* | am 7bcb1513: Merge "Support multiple screen size of Emoji keyboard"Satoshi Kataoka2013-09-164-0/+28
|\| | | | | | | | | * commit '7bcb1513426c0be400f9e86efd6702e06db3dda3': Support multiple screen size of Emoji keyboard