aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 7f226b4f: Merge "Fix an NPE on ICS factory rom."Jean Chalard2014-10-011-2/+4
|\ | | | | | | | | * commit '7f226b4f9db15105b10fdc04249db433772e87b4': Fix an NPE on ICS factory rom.
| * Merge "Fix an NPE on ICS factory rom."Jean Chalard2014-10-011-2/+4
| |\
| | * Fix an NPE on ICS factory rom.Jean Chalard2014-10-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ICS factory rom and MR0, there was a bug where calling the constructor for SuggestionSpan that doesn't take a context as an argument would always return in a crash. Don't call it, and pass an explicit context instead. Bug: 13552505 Change-Id: I5c919499b9d086c2cf283795b2af5b91cb425933
* | | am 31c16d41: Add Uzbek keyboardTadashi G. Takaoka2014-10-0115-241/+788
|\| | | | | | | | | | | | | | * commit '31c16d41bc67fa9def9290bb72594d35833b48f6': Add Uzbek keyboard
| * | Add Uzbek keyboardTadashi G. Takaoka2014-10-0115-241/+788
| | | | | | | | | | | | | | | Bug: 13222403 Change-Id: I9a4cf447a8ab0c26c4dc7f7794c57390024660cc
* | | am 79d992cc: Merge "Use Devanagari Danda letter as full stop on Hindi keyboard"Tadashi G. Takaoka2014-10-0111-206/+247
|\| | | | | | | | | | | | | | * commit '79d992ccba3f4f02e8ebd5d2b776d4abc4a9bc57': Use Devanagari Danda letter as full stop on Hindi keyboard
| * | Merge "Use Devanagari Danda letter as full stop on Hindi keyboard"Tadashi G. Takaoka2014-10-0111-206/+247
| |\ \
| | * | Use Devanagari Danda letter as full stop on Hindi keyboardTadashi G. Takaoka2014-10-0111-206/+247
| | | | | | | | | | | | | | | | | | | | Bug: 17418371 Change-Id: I22bb2913015a83604301576e68095974c38b7c9a
* | | | am bcb439e7: Merge "Add jni method to update entries for a word efficiently."Keisuke Kuroyanagi2014-10-012-0/+21
|\| | | | | | | | | | | | | | | | | | | * commit 'bcb439e702081a54c9a96d3b6bf466e11bd69375': Add jni method to update entries for a word efficiently.
| * | | Merge "Add jni method to update entries for a word efficiently."Keisuke Kuroyanagi2014-10-012-0/+21
| |\ \ \
| | * | | Add jni method to update entries for a word efficiently.Keisuke Kuroyanagi2014-10-012-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Ic628939ea68cdee17573409883a8403c73b78905
* | | | | am 841aa0b6: Merge "Move HistoricalInfo to property and use it in *Property."Keisuke Kuroyanagi2014-10-0121-89/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '841aa0b6f8e969cb18f35fc80728190b0fda1c01': Move HistoricalInfo to property and use it in *Property.
| * | | | Merge "Move HistoricalInfo to property and use it in *Property."Keisuke Kuroyanagi2014-10-0121-89/+64
| |\| | | | | |/ / | |/| |
| | * | Move HistoricalInfo to property and use it in *Property.Keisuke Kuroyanagi2014-10-0121-89/+64
| | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Icccccabad98fb543c6a6be2844cfc0086d80b739
* | | | am d368975c: Merge "Add Akkhor Layout for Bengali Bangladesh"Tadashi G. Takaoka2014-10-0117-193/+1463
|\| | | | | | | | | | | | | | | | | | | * commit 'd368975cdb53c075ec39141406b03bdedf266265': Add Akkhor Layout for Bengali Bangladesh
| * | | Merge "Add Akkhor Layout for Bengali Bangladesh"Tadashi G. Takaoka2014-10-0117-193/+1463
| |\ \ \
| | * | | Add Akkhor Layout for Bengali BangladeshTadashi G. Takaoka2014-09-2617-193/+1463
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16143057 Change-Id: I0b4a3d0d1125f9af25a98ee7a1852129ae1c1d2c
* | | | | am f41c11a5: Merge "Fix when to show more suggestions dot hint"Tadashi G. Takaoka2014-10-011-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f41c11a5c0ee1ec56e6f048314e71ec2d5604736': Fix when to show more suggestions dot hint
| * | | | Merge "Fix when to show more suggestions dot hint"Tadashi G. Takaoka2014-10-011-3/+7
| |\ \ \ \
| | * | | | Fix when to show more suggestions dot hintTadashi G. Takaoka2014-10-011-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17742406 Change-Id: Ifdf5d196778da2bb9bb9e3ca9250d23857d90bab
* | | | | | am 0487290f: Merge "Fix NPE in KeyboardParams"Tadashi G. Takaoka2014-10-011-3/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0487290f0f474ed64b93ad7e305792547669c665': Fix NPE in KeyboardParams
| * | | | | Merge "Fix NPE in KeyboardParams"Tadashi G. Takaoka2014-10-011-3/+9
| |\ \ \ \ \
| | * | | | | Fix NPE in KeyboardParamsTadashi G. Takaoka2014-10-011-3/+9
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17707885 Change-Id: Ie6a54ac5ab60f5d11363ac8da8eef850d65dba7c
* | | | | | am 108dad14: Merge "Introduce NgramProperty in Java side."Keisuke Kuroyanagi2014-10-0112-43/+105
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '108dad1491d44bf381fdb5d4f0767fb251f28522': Introduce NgramProperty in Java side.
| * | | | | Merge "Introduce NgramProperty in Java side."Keisuke Kuroyanagi2014-10-0112-43/+105
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Introduce NgramProperty in Java side.Keisuke Kuroyanagi2014-10-0112-43/+105
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: I8b3458ad22730b3dccbe0caea2c5930f5276dc82
* | | | | am 7b673c72: am 5139c4fd: am 702a736e: am 31838876: am 9baaa4b5: am ↵Yohei Yukawa2014-10-012-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-dev * commit '7b673c72651aa7dbfc3fc87fe2190d8cffb320c1': Fix NPE due to the lack of null-check
| * | | | am 5139c4fd: am 702a736e: am 31838876: am 9baaa4b5: am 6ad437ed: Merge "Fix ↵Yohei Yukawa2014-10-012-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NPE due to the lack of null-check" into lmp-dev * commit '5139c4fd28d1a34981d590f2fbec9b407481ea52': Fix NPE due to the lack of null-check
| | * \ \ \ am 702a736e: am 31838876: am 9baaa4b5: am 6ad437ed: Merge "Fix NPE due to ↵Yohei Yukawa2014-10-012-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the lack of null-check" into lmp-dev * commit '702a736ede853074993eb286085dd244161c8f29': Fix NPE due to the lack of null-check
| | | * \ \ \ 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
| | | | | * \ \ \ am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-devYohei Yukawa2014-10-012-4/+4
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ad437edd93382ce872c42fc8a2126e34dbf98d9': Fix NPE due to the lack of null-check
| | | | | | * \ \ \ Merge "Fix NPE due to the lack of null-check" into lmp-devYohei Yukawa2014-09-302-4/+4
| | | | | | |\ \ \ \
| | | | | | | * | | | Fix NPE due to the lack of null-checkYohei Yukawa2014-09-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The case that was not coverted well is that CursorAnchorInfoCompatWrapper could be instantiated with null object. In such situations, we should do nothing. BUG: 17682582 Change-Id: I6625a2f0ed8c5580ed9edfe4728f342da77a8e40
* | | | | | | | | | | am a850cda0: (-s ours) am 7eff88e2: (-s ours) am 304bca81: (-s ours) am ↵Baligh Uddin2014-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca87a6c9: (-s ours) am ab4963b8: (-s ours) am 5dd9e4ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'a850cda0e76325a26d326f4a4c019edee11ecd9a': Import translations. DO NOT MERGE
| * | | | | | | | | | am 7eff88e2: (-s ours) am 304bca81: (-s ours) am ca87a6c9: (-s ours) am ↵Baligh Uddin2014-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab4963b8: (-s ours) am 5dd9e4ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7eff88e2ea354685affabca75373872e565b3d99': Import translations. DO NOT MERGE
| | * | | | | | | | | am 304bca81: (-s ours) am ca87a6c9: (-s ours) am ab4963b8: (-s ours) am ↵Baligh Uddin2014-10-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dd9e4ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '304bca817237e050ebd530dd5db990329f3f7235': Import translations. DO NOT MERGE
| | | * | | | | | | | am ca87a6c9: (-s ours) am ab4963b8: (-s ours) am 5dd9e4ae: (-s ours) Merge ↵Baligh Uddin2014-09-290-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit 'ca87a6c90aa3efe3d4429bcd772bee49843aebe1': Import translations. DO NOT MERGE
| | | | * | | | | | | am ab4963b8: (-s ours) am 5dd9e4ae: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-09-290-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-dev * commit 'ab4963b882356c333bb6871969cde38e5735dfa6': Import translations. DO NOT MERGE
| | | | | * | | | | | am 5dd9e4ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-290-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5dd9e4ae154c1ab9c37311e0ae5b5f5eeae5ae29': Import translations. DO NOT MERGE
| | | | | | * | | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-291-2/+2
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-291-2/+2
| | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2865485fc1e9c76ecdc2f138f04bae77691e8d3f Auto-generated-cl: translation import
* | | | | | | | | | | am e0d64acb: (-s ours) am 01eec403: (-s ours) am 66832afa: (-s ours) am ↵Baligh Uddin2014-10-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4a7e6b0: (-s ours) am 929b6b4f: (-s ours) am 1222cac5: (-s ours) Import translations. DO NOT MERGE * commit 'e0d64acb53e5e18f242feadd6416999b819bb09a': Import translations. DO NOT MERGE
| * | | | | | | | | | am 01eec403: (-s ours) am 66832afa: (-s ours) am f4a7e6b0: (-s ours) am ↵Baligh Uddin2014-10-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 929b6b4f: (-s ours) am 1222cac5: (-s ours) Import translations. DO NOT MERGE * commit '01eec403726db8aced447e9d6780889753c0f149': Import translations. DO NOT MERGE
| | * | | | | | | | | am 66832afa: (-s ours) am f4a7e6b0: (-s ours) am 929b6b4f: (-s ours) am ↵Baligh Uddin2014-10-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1222cac5: (-s ours) Import translations. DO NOT MERGE * commit '66832afafa85c6afba8db293f6a1d6b333be79f1': Import translations. DO NOT MERGE
| | | * | | | | | | | am f4a7e6b0: (-s ours) am 929b6b4f: (-s ours) am 1222cac5: (-s ours) Import ↵Baligh Uddin2014-09-290-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'f4a7e6b0c9d7268657099d141026be7d9f0a8e1c': Import translations. DO NOT MERGE
| | | | * | | | | | | am 929b6b4f: (-s ours) am 1222cac5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-290-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '929b6b4f36d245381dae08d864ea7d6b6fb23591': Import translations. DO NOT MERGE
| | | | | * | | | | | am 1222cac5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-290-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1222cac5a353ae1373cb65f2cb696b8d5a9e9c56': Import translations. DO NOT MERGE
| | | | | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-292-3/+3
| | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaee29fb909327ab892f1b5c88cac0f9f0bd62ea3 Auto-generated-cl: translation import
* | | | | | | | | | am 0187db39: Merge "Add StatsUtils#onLoadSettings for when settings are changed"Jatin Matani2014-10-012-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0187db39b537fb9edc68758686b197d8c89f8a33': Add StatsUtils#onLoadSettings for when settings are changed