aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f76264dc: Merge "Remove key preview backing view"Tadashi G. Takaoka2013-08-094-87/+52
|\ | | | | | | | | * commit 'f76264dcf4942a0e2685a9f816f7581b3d9d76fb': Remove key preview backing view
| * Merge "Remove key preview backing view"Tadashi G. Takaoka2013-08-094-87/+52
| |\
| | * Remove key preview backing viewTadashi G. Takaoka2013-08-094-87/+52
| | | | | | | | | | | | | | | | | | This change re-origanizes view hierarchy of IME's input view. Change-Id: I9d0a07692d0f41de3345d207366393bcd5424f7e
* | | am 14f5cec0: Merge "Move bigrams iteration methods to policy."Keisuke Kuroyanagi2013-08-0916-77/+190
|\| | | | | | | | | | | | | | * commit '14f5cec07b173a2de924f495b2929a795967a494': Move bigrams iteration methods to policy.
| * | Merge "Move bigrams iteration methods to policy."Keisuke Kuroyanagi2013-08-0916-77/+190
| |\ \ | | |/ | |/|
| | * Move bigrams iteration methods to policy.Keisuke Kuroyanagi2013-08-0916-77/+190
| | | | | | | | | | | | | | | | | | | | | To support various bigram format. Bug: 6669677 Change-Id: Ifc8c1a855b03cd5a39d97a6e10872ef8ef76475b
* | | am cfcf6660: Reinstate a call to UsabilityStudyLogUtils#writeChar()Ken Wakasa2013-08-091-0/+4
|\| | | | | | | | | | | | | | * commit 'cfcf6660fc369fefd4028451334a9c2eda9bc4e5': Reinstate a call to UsabilityStudyLogUtils#writeChar()
| * | Reinstate a call to UsabilityStudyLogUtils#writeChar()Ken Wakasa2013-08-091-0/+4
| | | | | | | | | | | | | | | | | | | | | The usability study mode has been broken. bug: 10251399 Change-Id: Iaa301241f102f412fa073f0d8b897a4c8b265a9c
* | | am 3cd72a35: am 6d2399c0: am 5c057b32: Merge "Fix unit tests."Satoshi Kataoka2013-08-090-0/+0
|\| | | | | | | | | | | * commit '3cd72a35e08b015f1e3d4c5ed692755b4a0060b9':
| * | am 6d2399c0: am 5c057b32: Merge "Fix unit tests."Satoshi Kataoka2013-08-090-0/+0
| |\ \ | | | | | | | | | | | | * commit '6d2399c003264581218913ef48d47732d6eb0a01':
| | * \ am 5c057b32: Merge "Fix unit tests."Satoshi Kataoka2013-08-081-0/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '5c057b32414fab5f5d8267f8fc8b4230b54d4cca': Fix unit tests.
* | | | | am 7d7b1fd8: am c31f7d79: am 96b444d4: Merge "Remove processMotionEvent from ↵Tadashi G. Takaoka2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | MoreKeysKeyboardView" * commit '7d7b1fd8fc63330a7f936077b99fea21c1525127':
| * | | | am c31f7d79: am 96b444d4: Merge "Remove processMotionEvent from ↵Tadashi G. Takaoka2013-08-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | MoreKeysKeyboardView" * commit 'c31f7d79beebfdcad1b75ff60f5da3b4a20c1dbe':
| | * | | am 96b444d4: Merge "Remove processMotionEvent from MoreKeysKeyboardView"Tadashi G. Takaoka2013-08-084-19/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '96b444d4292f0834c94b8d56ae124a6d6a947bd3': Remove processMotionEvent from MoreKeysKeyboardView
* | | | | | am 9fc69810: am 7cb1b82f: am 1181c5ac: Merge "Fix to follow the field naming ↵Satoshi Kataoka2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conventions." * commit '9fc69810837306c23096dc02a0ea3383083e333e':
| * | | | | am 7cb1b82f: am 1181c5ac: Merge "Fix to follow the field naming conventions."Satoshi Kataoka2013-08-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | * commit '7cb1b82fe5fcb0952b85c5f5f1a8f58b15a64d90':
| | * | | | am 1181c5ac: Merge "Fix to follow the field naming conventions."Satoshi Kataoka2013-08-082-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1181c5acbc6bd8834551d8fadca55d41c886a6d8': Fix to follow the field naming conventions.
* | | | | | | am 4c14665c: am 9f2ba37f: am d7b76727: Merge "Make user and contacts dict ↵Keisuke Kuroyanagi2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use ver3 format." * commit '4c14665c8dcb1042befd769af44a9f498a53cf2e':
| * | | | | | am 9f2ba37f: am d7b76727: Merge "Make user and contacts dict use ver3 format."Keisuke Kuroyanagi2013-08-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f2ba37fb9f082f99b11dff435440faa8e8624bf':
| | * | | | | am d7b76727: Merge "Make user and contacts dict use ver3 format."Keisuke Kuroyanagi2013-08-081-3/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7b76727b9411a003c66182af20617afd38edde5': Make user and contacts dict use ver3 format.
* | | | | | | | am b12ab7bd: am 5a9d8757: am f6b7c3a6: Merge "Fix parent position reading ↵Keisuke Kuroyanagi2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for ver3 dict." * commit 'b12ab7bd30267150ff1ae4a7ce6830cff582eef5':
| * | | | | | | am 5a9d8757: am f6b7c3a6: Merge "Fix parent position reading for ver3 dict."Keisuke Kuroyanagi2013-08-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a9d8757d678f855748d6c7a7c98164a921e6aa0':
| | * | | | | | am f6b7c3a6: Merge "Fix parent position reading for ver3 dict."Keisuke Kuroyanagi2013-08-083-4/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6b7c3a62f9d46a871e13a8e8818fb05f7fc0eb6': Fix parent position reading for ver3 dict.
* | | | | | | | | am e8ddd6c0: am 3cd6811e: am 769aefe0: Merge "Increase CHAR_LIMIT to 29 to ↵Jean Chalard2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accommodate German." * commit 'e8ddd6c01d1e6b3c9ed823ab1489d9ec7780be42':
| * | | | | | | | am 3cd6811e: am 769aefe0: Merge "Increase CHAR_LIMIT to 29 to accommodate ↵Jean Chalard2013-08-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | German." * commit '3cd6811e4bd55db2d8d539c37ee9f24179bea0ef':
| | * | | | | | | am 769aefe0: Merge "Increase CHAR_LIMIT to 29 to accommodate German."Jean Chalard2013-08-081-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '769aefe00eac18240c70ad37ffd5b6b4fde81390': Increase CHAR_LIMIT to 29 to accommodate German.
* | | | | | | | | | am 09c1880c: am 49051644: am 60eb2501: Support ver3 dict in native code.Keisuke Kuroyanagi2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09c1880c200242be1744bcf2ee13b22a73e927c8':
| * | | | | | | | | am 49051644: am 60eb2501: Support ver3 dict in native code.Keisuke Kuroyanagi2013-08-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4905164419cd2893ea950c2b78aa253cb5ee2201':
| | * | | | | | | | am 60eb2501: Support ver3 dict in native code.Keisuke Kuroyanagi2013-08-081-2/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '60eb250194f05a944447e8bdee94c35a01911870': Support ver3 dict in native code.
* | | | | | | | | | | am fe2476fd: am 1058753c: am b0ab71be: Merge "Implement ↵Keisuke Kuroynagi2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getTerminalNodePositionOfWord for ver3 dict." * commit 'fe2476fd8c224496950d1b81355cfe0c4acbd25a':
| * | | | | | | | | | am 1058753c: am b0ab71be: Merge "Implement getTerminalNodePositionOfWord for ↵Keisuke Kuroynagi2013-08-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ver3 dict." * commit '1058753c52abde1fb9bb1967549b188dfa505e8c':
| | * | | | | | | | | am b0ab71be: Merge "Implement getTerminalNodePositionOfWord for ver3 dict."Keisuke Kuroynagi2013-08-083-5/+100
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0ab71be7080504106b82a64741ddbcad65e56bc': Implement getTerminalNodePositionOfWord for ver3 dict.
* | | | | | | | | | | | am e7631e13: am ff083cac: am 7b8b6e4b: Adjust a test for a spec change.Jean Chalard2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e7631e13d7d3e4a7cfd92bbe44e2277bf9e9e8c9':
| * | | | | | | | | | | am ff083cac: am 7b8b6e4b: Adjust a test for a spec change.Jean Chalard2013-08-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff083cacdb3932693124f20cdd7c96820168f44e':
| | * | | | | | | | | | am 7b8b6e4b: Adjust a test for a spec change.Jean Chalard2013-08-081-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b8b6e4b42710a04dbda19a16b57f44a0c3caca9': Adjust a test for a spec change.
* | | | | | | | | | | | | am fddd3a74: am d7309ec4: am 4456d1a8: Merge "Have double-space-to-period ↵Jean Chalard2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cancel leave a single space" * commit 'fddd3a74de7ddf5171ebc734adf743e56cdf7088':
| * | | | | | | | | | | | am d7309ec4: am 4456d1a8: Merge "Have double-space-to-period cancel leave a ↵Jean Chalard2013-08-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | single space" * commit 'd7309ec469c9a8a2d594e51b5546c65c87a05a78':
| | * | | | | | | | | | | am 4456d1a8: Merge "Have double-space-to-period cancel leave a single space"Jean Chalard2013-08-081-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4456d1a8c18a4c674c8394570550f2977f5f117b': Have double-space-to-period cancel leave a single space
* | | | | | | | | | | | | | am 2e6ee87e: (-s ours) am 7b436eac: (-s ours) am f9456855: (-s ours) Merge ↵Baligh Uddin2013-08-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" * commit '2e6ee87e959ca0aea4366448518c41008fdf7fde':
| * | | | | | | | | | | | | am 7b436eac: (-s ours) am f9456855: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-08-090-0/+0
| |\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit '7b436eac3e26f4f84fc8ab9a5d9e3c49bbb4035f':
| | * | | | | | | | | | | am f9456855: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-08-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9456855e02521b2b91705b0a510b3789211b430': Import translations. DO NOT MERGE
* | | | | | | | | | | | | | am 7ec9db2c: Remove the code and comments about version 1 format.Yuichiro Hanada2013-08-093-55/+70
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ec9db2c34ee6bec2cbff6cf05cee9bf3c2f7122': Remove the code and comments about version 1 format.
| * | | | | | | | | | | | | Remove the code and comments about version 1 format.Yuichiro Hanada2013-08-093-55/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I827052f234eeaa4dbcfd37da69a99866896a158b
* | | | | | | | | | | | | | am 4571b0f6: Merge "Make DictionaryStructurePolicy have buffer info."Keisuke Kuroyanagi2013-08-0918-195/+202
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4571b0f682430d27785ff2e55f1376b4c8309104': Make DictionaryStructurePolicy have buffer info.
| * | | | | | | | | | | | | Merge "Make DictionaryStructurePolicy have buffer info."Keisuke Kuroyanagi2013-08-0918-195/+202
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Make DictionaryStructurePolicy have buffer info.Keisuke Kuroyanagi2013-08-0918-195/+202
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support various format dictionary, extendable buffers or multiple files. Bug: 6669677 Change-Id: I203a5a4adc049a6322cfba4eacb4cb6715f8dfc2
* | | | | | | | | | | | | | am 6ca0b371: Merge "Small clean up of KeyboardView.onMeasure"Tadashi G. Takaoka2013-08-091-5/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ca0b371de557b21dab5736802055cc367036f8d': Small clean up of KeyboardView.onMeasure
| * | | | | | | | | | | | | Merge "Small clean up of KeyboardView.onMeasure"Tadashi G. Takaoka2013-08-091-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Small clean up of KeyboardView.onMeasureTadashi G. Takaoka2013-08-081-5/+6
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I46830f8482b46c6999b80793c8b4ae860b46e429
* | | | | | | | | | | | | am 5c057b32: Merge "Fix unit tests."Satoshi Kataoka2013-08-081-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c057b32414fab5f5d8267f8fc8b4230b54d4cca': Fix unit tests.