aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | am f33f1cab: [FileEncap9] Extract ResearchLogDirectory classKurt Partridge2013-03-145-82/+153
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f33f1cab2fd57fe39955593e68902554ed57a053': [FileEncap9] Extract ResearchLogDirectory class
| * | | | [FileEncap9] Extract ResearchLogDirectory classKurt Partridge2013-03-145-82/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously used a monotonically increasing int. Now uses uuid and nanoseconds. squashed in: [FileEncap11] Read preference from ResearchSettings Change-Id: Ic779e0a69db6b16e92c6f4b63dbe7b7add566ab6 [FileEncap12] Simplify directory cleanup invocation Change-Id: I688047409c0343d32b11447fb625dfb726c731ec [FileEncap14] Change log filename syntax Change-Id: I9243b20b2eb392f81ab8c5c3d19315211240e0bc Change-Id: I5c9d70e0cb7b0965158e17dd71dfab796bd9a440
* | | | | am 7faa2caa: Merge "[Lazy4] Remove useless debug code"Kurt Partridge2013-03-141-33/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '7faa2caa80ea3b07ab317a5aa92bd048b574af27': [Lazy4] Remove useless debug code
| * | | | Merge "[Lazy4] Remove useless debug code"Kurt Partridge2013-03-141-33/+0
| |\ \ \ \
| | * | | | [Lazy4] Remove useless debug codeJean Chalard2013-03-081-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is cluttering readability and getting in the way of future updates. Future updates will make it much easier to debug and to test this code, so this needs to disappear. Change-Id: I32e28ec608587b6b7c07250a2692b13e8fc98465
* | | | | | am 95e09ea7: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-03-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '95e09ea7b80c30139919d7b8fb6f38c90e6e081c': Import translations. DO NOT MERGE
| * | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-03-1449-3/+553
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-1249-3/+553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16ec93523721a344e1a09b5242400fe719d07516 Auto-generated-cl: translation import
* | | | | | | am e563e585: (-s ours) am 620be98f: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-03-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into jb-mr2-dev * commit 'e563e585d13c3f23518e73c1af5ca42de6f31778': Import translations. DO NOT MERGE
| * | | | | | am 620be98f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-03-140-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '620be98feb47f7dd66ce70cbdba2128737621fa3': Import translations. DO NOT MERGE
| | * | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-03-1449-3/+553
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-1249-3/+553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I478c5e0ec19d0d1f1835826606f7736059e7795c Auto-generated-cl: translation import
* | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-03-1449-3/+553
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-1249-3/+553
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf34e25ce4d5c162955b70c53c105f87486a7ff6 Auto-generated-cl: translation import
* | | | | | | | am fb606c62: am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" ↵Tadashi G. Takaoka2013-03-131-7/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'fb606c6277fdf7385bf8ce876102bda016465e8f': Clean up StaticInnerHandlerWrapper a bit
| * | | | | | | am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-devTadashi G. Takaoka2013-03-141-7/+7
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'f0864b1d95411ce9886a5ade13f42cb17f578828': Clean up StaticInnerHandlerWrapper a bit
| | * | | | | | Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-devTadashi G. Takaoka2013-03-141-7/+7
| | |\ \ \ \ \ \
| | | * | | | | | Clean up StaticInnerHandlerWrapper a bitTadashi G. Takaoka2013-03-141-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib07efe6da1eb2f0fd9ef68ca71502c98f7e19f4b
* | | | | | | | | am 1ab33383: am 0d5f214a: Fix NPE found in monkey testTadashi G. Takaoka2013-03-131-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1ab33383f983082621084a65a168101e5fb526e0': Fix NPE found in monkey test
| * | | | | | | | am 0d5f214a: Fix NPE found in monkey testTadashi G. Takaoka2013-03-141-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d5f214aa774ab0ab7c17521984caae11c9f4c2b': Fix NPE found in monkey test
| | * | | | | | | Fix NPE found in monkey testTadashi G. Takaoka2013-03-141-0/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8383127 Change-Id: Ifd70acabe118b477f103937c7f1e99e38e210833
* | | | | | | | am 3f46e8a8: am a38e14fd: Merge "Refactor skippable code point" into jb-mr2-devSatoshi Kataoka2013-03-132-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f46e8a887a0ff6c59642d3ff68791a07574ea5c': Refactor skippable code point
| * | | | | | | am a38e14fd: Merge "Refactor skippable code point" into jb-mr2-devSatoshi Kataoka2013-03-142-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a38e14fd5597e9e483e7cf322c5b1490db45a754': Refactor skippable code point
| | * | | | | | Merge "Refactor skippable code point" into jb-mr2-devSatoshi Kataoka2013-03-132-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Refactor skippable code pointSatoshi Kataoka2013-03-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5477b6e5d29d1f0b9c2fd5a495be77cf5f2fbaee
* | | | | | | | | am 68e9f78b: (-s ours) am 8067b769: (-s ours) Merge "[DO NOT MERGE] ↵Jean Chalard2013-03-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deactivate H/W keyboard handling" into jb-mr2-dev * commit '68e9f78b560b61a50e0e850c03e492730e51ed28': [DO NOT MERGE] Deactivate H/W keyboard handling
| * | | | | | | | am 8067b769: (-s ours) Merge "[DO NOT MERGE] Deactivate H/W keyboard ↵Jean Chalard2013-03-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling" into jb-mr2-dev * commit '8067b769f1229e447872f8b03df44b228a662561': [DO NOT MERGE] Deactivate H/W keyboard handling
| | * | | | | | | Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-devJean Chalard2013-03-131-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | [DO NOT MERGE] Deactivate H/W keyboard handlingJean Chalard2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For MR2, LatinIME should not be handling hardware keyboard events. The feature is still work in progress. Change-Id: I56ff18bff84ba6b5a6bc3f8829b42eaf33b72554
* | | | | | | | | am f5caf5be: am 601a8582: Merge "Move checking non-persistent checkbox to ↵Tadashi G. Takaoka2013-03-131-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onResume" into jb-mr2-dev * commit 'f5caf5be994f8b7885f4e434e25019fd847ca927': Move checking non-persistent checkbox to onResume
| * | | | | | | | am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into ↵Tadashi G. Takaoka2013-03-141-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '601a8582d0f761a85b6eb16e7a6b78402f6f2599': Move checking non-persistent checkbox to onResume
| | * | | | | | | Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-devTadashi G. Takaoka2013-03-131-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Move checking non-persistent checkbox to onResumeTadashi G. Takaoka2013-03-131-4/+4
| | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8336068 Change-Id: I07e67a6aee24a239a21e6fc69eb2ec741b9a5b2b
* | | | | | | | | am 0b251201: am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-devSatoshi Kataoka2013-03-135-16/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b2512017edb0161d51643560cd41dac9b1a1559': Make isInternal mutable
| * | | | | | | | am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-devSatoshi Kataoka2013-03-135-16/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ab44b21bd6ef5e9fde329b25dfd84f6ca5c0825': Make isInternal mutable
| | * | | | | | | Merge "Make isInternal mutable" into jb-mr2-devSatoshi Kataoka2013-03-135-16/+22
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Make isInternal mutableSatoshi Kataoka2013-03-135-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib81ceba801be0ac7ef65c4eadd1ec8599e80dacc
* | | | | | | | | am 64b95965: Merge "[Lazy2] Pass a runnable to abort"Kurt Partridge2013-03-131-4/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '64b9596544acbeec1a416185e9472cfbd49cde60': [Lazy2] Pass a runnable to abort
| * | | | | | | | Merge "[Lazy2] Pass a runnable to abort"Kurt Partridge2013-03-131-4/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [Lazy2] Pass a runnable to abortJean Chalard2013-03-121-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I721afbf426099753aa876a55323eb806b08c24d6
* | | | | | | | | | am 5e75e15a: Merge "[Lazy1] Switch to blocking log closures"Kurt Partridge2013-03-122-42/+45
|\| | | | | | | | | | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e75e15a95185a56c0bdd19d3efbe9de9e5775f9': [Lazy1] Switch to blocking log closures
| * | | | | | | | Merge "[Lazy1] Switch to blocking log closures"Kurt Partridge2013-03-132-42/+45
| |\| | | | | | | | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | [Lazy1] Switch to blocking log closuresJean Chalard2013-03-122-42/+45
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Change-Id: I4daec20b7b47b0d71c5aab6e17cd660015e19e71
* | | | | | | am dbfd2825: am 2bbd3065: Language dependent single/doule quotation more keysTadashi G. Takaoka2013-03-1131-587/+668
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbfd2825c8bc46d64ac2752aa04c23ab385fbbac': Language dependent single/doule quotation more keys
| * | | | | | am 2bbd3065: Language dependent single/doule quotation more keysTadashi G. Takaoka2013-03-1231-587/+668
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '2bbd3065d3bd9785ad1638c65f8c73f11bf21922': Language dependent single/doule quotation more keys
| | * | | | | Language dependent single/doule quotation more keysTadashi G. Takaoka2013-03-1231-587/+668
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The natural way of marking quoted text vary from language to language. This change introduces the following variations. * LEFT and RIGHT quotations (English etc.) * LOW-9 and LEFT quotations (German etc.) * LOW-9 and RIGHT quotations (Dutch etc.) * RIGHT and RIGHT quotations (Swedish etc.) * LEFT ANGLE and RIGHT ANGLE quotations (French etc.) * RIGHT ANGLE and LEFT ANGLE quotations Bug: 8356419 Change-Id: I75726ab7ed783d02f189b46236c9d5079737bcff
* | | | | | am fd40dd97: (-s ours) am 998a1748: (-s ours) am c3f789fd: am 7b52eac4: am ↵Jean-Baptiste Queru2013-03-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'fd40dd977d785aafbe781c918dc94dedbc59eacd':
| * | | | | am 998a1748: (-s ours) am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: ↵Jean-Baptiste Queru2013-03-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '998a1748b68838ee2b1465c9e53de65453b0a047':
| | * | | | am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: ↵Jean-Baptiste Queru2013-03-110-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c3f789fd917ba413be8b6f73f87e49a8773bea41':
| | | * \ \ \ am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) ↵Jean-Baptiste Queru2013-03-110-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not merge * commit '7b52eac491e6a97c6ef87cbcb08e5f902c10c9e3':