aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | am 929bfdd0: Merge "Update shift state only when input field is restarted" ↵Tadashi G. Takaoka2012-11-141-10/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-dev * commit '929bfdd059df5bb0340a3b22a3feff211f03798e': Update shift state only when input field is restarted
| | | * | | | Merge "Update shift state only when input field is restarted" into jb-mr1.1-devTadashi G. Takaoka2012-11-141-10/+5
| | | |\ \ \ \
| | | | * | | | Update shift state only when input field is restartedTadashi G. Takaoka2012-11-141-10/+5
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7482766 Change-Id: Ifdfa110c44b95acfbcd3e0aa34f675c70b7d7285
* | | | | | | am dda024cf: (-s ours) am 428d1b64: am 4826c3ff: Merge "Fix language switch ↵Tadashi G. Takaoka2012-11-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key behavior (DO NOT MERGE)" into jb-mr1.1-dev * commit 'dda024cf300cfc69125a8812d565df4f512e64f5': Fix language switch key behavior (DO NOT MERGE)
| * | | | | | am 428d1b64: am 4826c3ff: Merge "Fix language switch key behavior (DO NOT ↵Tadashi G. Takaoka2012-11-142-16/+39
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE)" into jb-mr1.1-dev * commit '428d1b6469b5bc9041c35a7e1ee1476d5aacedd7': Fix language switch key behavior (DO NOT MERGE)
| | * | | | | am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MERGE)" into ↵Tadashi G. Takaoka2012-11-142-16/+39
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev * commit '4826c3ff7ec8640d2a982e9362577b2900614080': Fix language switch key behavior (DO NOT MERGE)
| | | * | | | Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-devTadashi G. Takaoka2012-11-142-16/+39
| | | |\ \ \ \
| | | | * | | | Fix language switch key behavior (DO NOT MERGE)Tadashi G. Takaoka2012-11-142-16/+39
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7075923 Change-Id: If139411db4aa65eed64337bf2a79387cfcd04496
* | | | | | | am f83e6404: (-s ours) am 36c6e293: am aef0acdb: DO NOT MERGE - Fix an error ↵Ken Wakasa2012-11-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the base char table for LETTER L WITH STROKE * commit 'f83e640419b7917af938deba654238c21653ee1d': DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
| * | | | | | am 36c6e293: am aef0acdb: DO NOT MERGE - Fix an error in the base char table ↵Ken Wakasa2012-11-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for LETTER L WITH STROKE * commit '36c6e2933f1e25013b5d04d651cab8938e7f1090': DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
| | * | | | | am aef0acdb: DO NOT MERGE - Fix an error in the base char table for LETTER L ↵Ken Wakasa2012-11-141-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITH STROKE * commit 'aef0acdbe078fe83ed834ffe986e9cb7b4b8df7d': DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
| | | * | | | DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKEKen Wakasa2012-11-151-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherrypick of I67a431d8 bug: 7539944 Change-Id: I0d1f9649f30c36b8e464944a5b881c2cb9c05ccf
* | | | | | Merge "Fix an error in the base char table for LETTER L WITH STROKE"Ken Wakasa2012-11-141-1/+1
|\ \ \ \ \ \
| * | | | | | Fix an error in the base char table for LETTER L WITH STROKEKen Wakasa2012-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 7539944 Change-Id: I67a431d8d60f3236fb7d616504c5d0cf2166f486
* | | | | | | Merge "Add Mongolian keyboard"Tadashi G. Takaoka2012-11-149-0/+452
|\ \ \ \ \ \ \
| * | | | | | | Add Mongolian keyboardTadashi G. Takaoka2012-11-139-0/+452
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7455289 Change-Id: Ifdf6f38a07f75fb2154a17899e6be5f89082638f
* | | | | | | | Merge "Fix language switch key behavior"Tadashi G. Takaoka2012-11-142-18/+35
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix language switch key behaviorTadashi G. Takaoka2012-11-142-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7075923 Change-Id: I306e1ff5d9f873541e84e1fafb64b9473947f623
* | | | | | | | Merge "Correct a wrong base character in Russian"Jean Chalard2012-11-141-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct a wrong base character in RussianJean Chalard2012-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the master counterpart of I80cee4b2 Bug: 7516306 Change-Id: I1db4362bf12a98542c5f6fca3ae8010f16bd61a9
* | | | | | | | | Merge "Swap single and double quotation marks in Spanish tablet keyboard"Tadashi G. Takaoka2012-11-132-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Swap single and double quotation marks in Spanish tablet keyboardTadashi G. Takaoka2012-11-142-0/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6672279 Change-Id: I120613e36ba6a690e54447fa6c9c90e131f2a155
* / / / / / / / / Hide statustics logging optionSatoshi Kataoka2012-11-141-0/+8
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0
* | | | | | | | am 18ff5612: am f592270a: am 7648b37d: Merge "Make sure all FDs are ↵Jean Chalard2012-11-131-11/+19
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly closed." into jb-mr1.1-dev * commit '18ff56125345746e288118d177fcabf3c079ead3': Make sure all FDs are correctly closed.
| * | | | | | | am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." ↵Jean Chalard2012-11-131-11/+19
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-dev * commit 'f592270a0f092c5ef52bbb0f24c8873f46e75503': Make sure all FDs are correctly closed.
| | * | | | | | am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-devJean Chalard2012-11-131-11/+19
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '7648b37d1e4cf3799288f85cc9c5f67b515e24c4': Make sure all FDs are correctly closed.
| | | * | | | | Merge "Make sure all FDs are correctly closed." into jb-mr1.1-devJean Chalard2012-11-131-11/+19
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | Make sure all FDs are correctly closed.Jean Chalard2012-11-131-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this kind of series of calls, it's possible that an outer call to a constructor fails, but the inner succeeded. Example: try { is = new A(new B()); } finally { if (null != is) is.close(); } In this case, if new B() succeeds but new A() throws an exception, is stays null and the intermediate object is never closed. This is what was happening in this instance. Bug: 7377336 Change-Id: I3fae9fec1135244982fcf5098c76d93f3e0f2add
* | | | | | | | am d2116eb2: am 7d34763e: am fac619a3: Merge "Don\'t restrict reset ↵Jean Chalard2012-11-121-14/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | composing state to non-identical setText" into jb-mr1.1-dev * commit 'd2116eb2ea7d08e81b7efe5e342772ffcd8a7efc': Don't restrict reset composing state to non-identical setText
| * | | | | | | am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to ↵Jean Chalard2012-11-121-14/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-identical setText" into jb-mr1.1-dev * commit '7d34763e23cb49c8c96dbf9b4c613e17098dd919': Don't restrict reset composing state to non-identical setText
| | * | | | | | am fac619a3: Merge "Don\'t restrict reset composing state to non-identical ↵Jean Chalard2012-11-121-14/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setText" into jb-mr1.1-dev * commit 'fac619a34c8101cac504db500d74114dc8768372': Don't restrict reset composing state to non-identical setText
| | | * | | | | 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 "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
* | | | | 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
* | | | | 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':