aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | | Merge "Don't restrict reset composing state to non-identical setText" into ↵Jean Chalard2012-11-121-14/+10
| | | | |\ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | jb-mr1.1-dev
| | | | | * | | | | Don't restrict reset composing state to non-identical setTextJean Chalard2012-11-121-14/+10
| | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7497063 Change-Id: Ifbd5c37408131867458fd921bdef46ef90d81478
| * | | | | | / / Resolve conflicts for merge of 3a9ba17f to master"Jean Chalard2012-11-131-5/+10
| |\| | | | | | | | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49
| | * | | | | | am a13a8a58: am 0e84041b: Refactor all phantom-space-inserted spaces in one ↵Jean Chalard2012-11-121-5/+10
| | |\| | | | | | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | place * commit 'a13a8a58e05ecd3f9eccdc47ceca972a814d247e': Refactor all phantom-space-inserted spaces in one place
| | | * | | | am 0e84041b: Refactor all phantom-space-inserted spaces in one placeJean Chalard2012-11-121-5/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e84041bf740590230198fa845d8c45acd4cb586': Refactor all phantom-space-inserted spaces in one place
| | | | * | | Refactor all phantom-space-inserted spaces in one placeJean Chalard2012-11-131-5/+10
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7164981 Change-Id: If1635c212b2d5d9cf51f5fb074f3b20dd7ec7b2a
| * | | | / Use hexadecimal constants for subtypeIdTadashi G. Takaoka2012-11-131-55/+55
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: I5ee7981f1d1d142c4d21d0257879e8e126860fa6
* | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-1211-319/+313
|\| | | |
| * | | | Merge "Enhance ImfUtils to InputMethodManagerWrapper class"Tadashi G. Takaoka2012-11-1110-318/+313
| |\ \ \ \
| | * | | | Enhance ImfUtils to InputMethodManagerWrapper classTadashi G. Takaoka2012-11-1210-318/+313
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6ff86ee819a446dd3ed5f9c3400d23564027b020
| * | | | | Remove backup agent from AOSP Android KeyboardSatoshi Kataoka2012-11-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4590284 Change-Id: I22f0e42cb898d20dfc2c4506493bf48170ce7b04
* | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-105-200/+181
|\| | | | |
| * | | | | Cleanup basechars.cppKen Wakasa2012-11-103-195/+177
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b88876f60720182910fab97ef79f3d04fbd81f0
| * | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-11-091-3/+3
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf5dc194560d09cc1945c5478197b9170c176492 Auto-generated-cl: translation import
| * | | | | | am 21177c1a: Remove gesture typing settings when disabled by configurationTadashi G. Takaoka2012-11-090-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | * commit '21177c1afed4c04f436acbd1116568051167c899': Remove gesture typing settings when disabled by configuration
| | * | | | Remove gesture typing settings when disabled by configurationTadashi G. Takaoka2012-11-091-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7506408 Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
| * | | | | Fix a logic flaw.Jean Chalard2012-11-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test is seriously wrong : although we do have a method that does exactly the right thing, this looks at a very specific, unrelated variable state in hope it happens to be set only in the relevant cases by the play of logic. I don't think this changes anything concretely, as the assumption was probably true in the practice ; still, this code is very hard to read and prone to unexpected breakage. Change-Id: I77ab576f90762429fcc752df31ed30e1c81871dc
* | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageKen Wakasa2012-11-097-27/+74
|\| | | | |
| * | | | | Suppress dictionary pack support when IS_EXPERIMENTAL is trueKen Wakasa2012-11-093-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8813cb989c1fa8744a3bf36e8514ced3c8f46a3
| * | | | | Remove gesture typing settings when disabled by configurationTadashi G. Takaoka2012-11-091-10/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 7506408 Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
| * | | | am 9185a6c2: (-s ours) am a8ec322b: am bc43e3f2: Reconcile with ↵The Android Open Source Project2012-11-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '9185a6c2c315a8db537edc5d1bf582199d157bb2':
| | * | | am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-080-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit 'a8ec322b1a24111aa3e7e533d00586536212ff7b':
| | | * | am bc43e3f2: Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-070-0/+0
| | | |\| | | | | | | | | | | | | | | | * commit 'bc43e3f29060252d2a08b4e976bdb2ca50438623':
| | | | * Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-070-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I105d8e6a795dd5b38d42051196581896e7ea4f30
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-060-0/+0
| | | | | |\
| * | | | | | am 4eef5101: am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if ↵Ken Wakasa2012-11-083-0/+35
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requested by the app. * commit '4eef51016adc4e103fa65d944a0ab31527ddced8': Reset the IME if requested by the app.
| | * | | | | am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.Ken Wakasa2012-11-083-0/+35
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa5d6fe05ce45e36b732a3abc849508cd8279257': Reset the IME if requested by the app.
| | | * | | | am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.Ken Wakasa2012-11-063-0/+35
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9cc22c45ec04f3b1772631e1ef18103dc55c2a0b': Reset the IME if requested by the app.
| | | | * | | am 5d2556b9: Reset the IME if requested by the app.Ken Wakasa2012-11-063-0/+35
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d2556b93286f5f1d7d829b586b84a8b7ae55743': Reset the IME if requested by the app.
| | | | | * | Reset the IME if requested by the app.Ken Wakasa2012-11-073-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, reset the KeyboardState to the main Alphabet layout in LatinIME.onStartInputViewInternal() if a keyboard layout set doesn't get reloaded in the method. Please note TextView.setText() calls up resetInput(), then the IME should reset with it. bug: 7482086 Note that bug: 6851364 needs to be revisited. Change-Id: I5d448c10963d3dd952dd13cb587085ec7b014e69
| * | | | | | Fix a bug in the diff toolJean Chalard2012-11-081-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reporting of removed attributes multiple times instead of just one in some cases. Also, report the frequency of the removed bigram in the same cases. Change-Id: I1455fa7553fcebc3005c222bf5aa9afcf1678c31
| * | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-11-071-2/+2
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I97ceec5680a8ba9f27d5f62a7573555590268376 Auto-generated-cl: translation import
* | | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageSatoshi Kataoka2012-11-071-2/+5
|\| | | | | | |
| * | | | | | | Fix a build error in x86 buildsKen Wakasa2012-11-071-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64a7c35d01540eb63f09cacddaab03f95729ed02
| * | | | | | | am ef51f33e: (-s ours) am 4d095547: am 202c3a5f: Reconcile with ↵The Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | | | | | | | | | | | | | | jb-mr1-factory-release jb-mr1-release - do not merge * commit 'ef51f33e544577c8fbc802a5623bef87d97473b8':
| | * | | | | am 4d095547: am 202c3a5f: Reconcile with jb-mr1-factory-release ↵The Android Open Source Project2012-11-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '4d09554794ace67b01a6674c36edd5495b32cc38':
| | | * | | | am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '202c3a5f32e20939a3dff24b7e2f047e47b29e17': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Build LatinIME with NDK r8
| | | | | \ \
| | | | | \ \
| | | | *-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | / | | | | | | |/ Change-Id: I355e91c06f0958f1baec5923324dcbcdf408d3f2
* | | | | | | Resolve merge conflictSatoshi Kataoka2012-11-061-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96c87f7a4e4d34357d3d4c772eb3782c171bb4c0
* | | | | | | Add missing res dirSatoshi Kataoka2012-11-061626-0/+66438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50e79bbb1f2eab33c7e5a76086bbe41f7e757ada
* | | | | | | Merge remote-tracking branch 'goog/master' into mergescriptpackageSatoshi Kataoka2012-11-061033-2221395/+6806
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: java/res/values-ca/strings.xml java/res/values-cs/strings.xml java/res/values-de/strings.xml java/res/values-es/strings.xml java/res/values-hr/strings.xml java/res/values-hu/strings.xml java/res/values-it/strings.xml java/res/values-lv/strings.xml java/res/values-nb/strings.xml java/res/values-nl/strings.xml java/res/values-pl/strings.xml java/res/values-pt/strings.xml java/res/values-ro/strings.xml java/res/values-ru/strings.xml java/res/values-sv/strings.xml java/res/values-sw/strings.xml java/res/values-tr/strings.xml java/res/values-uk/strings.xml java/res/values-zh-rCN/strings.xml java/res/values-zh-rTW/strings.xml java/src/com/android/inputmethod/latin/RichInputConnection.java Change-Id: Iba00dd5b86cb16d72968bc7e40d75853845b6dcb
| * | | | | | Tidy up visibility of members of BinaryFormat.Ken Wakasa2012-11-051-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I38a00076b82de8e1a19209c67954fe01585f7943
| * | | | | | Adjust compiler warning options with the offdevice MakefileKen Wakasa2012-11-0513-38/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of AK_FORCE_INLINE for -Winline and better performance Change-Id: If0016e2ef61c1fe007c83bb1a5133a6b6bde568e
| * | | | | | Follow up to Ic6af0c596374d936d2b9b31e626fb62bd265ce64Ken Wakasa2012-11-035-140/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tidy up inline functions with AK_FORCE_INLINE. Moved back some inline methods to header files. Change-Id: Ibd37b595666ebddda198d9237f19f6712653a8e8
| * | | | | | Add more compiler warning flagsKen Wakasa2012-11-029-153/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6af0c596374d936d2b9b31e626fb62bd265ce64
| * | | | | | A small code cleanup in geometry_utils.hKen Wakasa2012-11-022-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9ff77c661693a1e21d0aa4cfc079bfbf3171f49
| * | | | | | Merge "Cleanup logging code"Tadashi G. Takaoka2012-11-011-40/+41
| |\ \ \ \ \ \
| | * | | | | | Cleanup logging codeTadashi G. Takaoka2012-11-011-40/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia604a4fcebfc5179bdbeaa982e052f7d3882ac6e