Kurt Partridge
7faa2caa80
Merge "[Lazy4] Remove useless debug code"
2013-03-14 13:13:57 +00:00
Baligh Uddin
ba94873703
am 95e09ea7: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '95e09ea7b80c30139919d7b8fb6f38c90e6e081c':
Import translations. DO NOT MERGE
2013-03-13 22:21:14 -07:00
Baligh Uddin
afbc639053
am e563e585: (-s ours) am 620be98f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'e563e585d13c3f23518e73c1af5ca42de6f31778':
Import translations. DO NOT MERGE
2013-03-13 22:21:13 -07:00
Baligh Uddin
95e09ea7b8
Merge "Import translations. DO NOT MERGE"
2013-03-14 05:19:07 +00:00
Baligh Uddin
e563e585d1
am 620be98f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '620be98feb47f7dd66ce70cbdba2128737621fa3':
Import translations. DO NOT MERGE
2013-03-14 05:18:50 +00:00
Baligh Uddin
01f188a781
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-03-14 05:15:42 +00:00
Baligh Uddin
620be98feb
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-14 05:15:13 +00:00
Tadashi G. Takaoka
5e04234784
am fb606c62: am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev
...
* commit 'fb606c6277fdf7385bf8ce876102bda016465e8f':
Clean up StaticInnerHandlerWrapper a bit
2013-03-13 20:45:44 -07:00
Tadashi G. Takaoka
fb606c6277
am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev
...
* commit 'f0864b1d95411ce9886a5ade13f42cb17f578828':
Clean up StaticInnerHandlerWrapper a bit
2013-03-14 03:44:00 +00:00
Tadashi G. Takaoka
3153863f04
am 1ab33383: am 0d5f214a: Fix NPE found in monkey test
...
* commit '1ab33383f983082621084a65a168101e5fb526e0':
Fix NPE found in monkey test
2013-03-13 20:41:31 -07:00
Tadashi G. Takaoka
f0864b1d95
Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev
2013-03-14 03:41:01 +00:00
Tadashi G. Takaoka
1ab33383f9
am 0d5f214a: Fix NPE found in monkey test
...
* commit '0d5f214aa774ab0ab7c17521984caae11c9f4c2b':
Fix NPE found in monkey test
2013-03-14 03:39:38 +00:00
Tadashi G. Takaoka
41e60bf6dd
Clean up StaticInnerHandlerWrapper a bit
...
Change-Id: Ib07efe6da1eb2f0fd9ef68ca71502c98f7e19f4b
2013-03-14 12:35:47 +09:00
Tadashi G. Takaoka
0d5f214aa7
Fix NPE found in monkey test
...
Bug: 8383127
Change-Id: Ifd70acabe118b477f103937c7f1e99e38e210833
2013-03-14 12:19:10 +09:00
Satoshi Kataoka
5a84bd1b22
am 3f46e8a8: am a38e14fd: Merge "Refactor skippable code point" into jb-mr2-dev
...
* commit '3f46e8a887a0ff6c59642d3ff68791a07574ea5c':
Refactor skippable code point
2013-03-13 19:38:49 -07:00
Jean Chalard
9984d1c7df
am 68e9f78b: (-s ours) am 8067b769: (-s ours) Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev
...
* commit '68e9f78b560b61a50e0e850c03e492730e51ed28':
[DO NOT MERGE] Deactivate H/W keyboard handling
2013-03-13 19:38:48 -07:00
Tadashi G. Takaoka
fc00d2bfbe
am f5caf5be: am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev
...
* commit 'f5caf5be994f8b7885f4e434e25019fd847ca927':
Move checking non-persistent checkbox to onResume
2013-03-13 19:38:47 -07:00
Satoshi Kataoka
3f46e8a887
am a38e14fd: Merge "Refactor skippable code point" into jb-mr2-dev
...
* commit 'a38e14fd5597e9e483e7cf322c5b1490db45a754':
Refactor skippable code point
2013-03-14 02:33:33 +00:00
Jean Chalard
68e9f78b56
am 8067b769: (-s ours) Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev
...
* commit '8067b769f1229e447872f8b03df44b228a662561':
[DO NOT MERGE] Deactivate H/W keyboard handling
2013-03-14 02:33:29 +00:00
Tadashi G. Takaoka
f5caf5be99
am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev
...
* commit '601a8582d0f761a85b6eb16e7a6b78402f6f2599':
Move checking non-persistent checkbox to onResume
2013-03-14 02:33:28 +00:00
Satoshi Kataoka
cb8ed32be5
am 0b251201: am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-dev
...
* commit '0b2512017edb0161d51643560cd41dac9b1a1559':
Make isInternal mutable
2013-03-13 10:27:12 -07:00
Satoshi Kataoka
0b2512017e
am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-dev
...
* commit '0ab44b21bd6ef5e9fde329b25dfd84f6ca5c0825':
Make isInternal mutable
2013-03-13 17:24:49 +00:00
Kurt Partridge
f6d68ee385
am 64b95965: Merge "[Lazy2] Pass a runnable to abort"
...
* commit '64b9596544acbeec1a416185e9472cfbd49cde60':
[Lazy2] Pass a runnable to abort
2013-03-13 06:22:31 -07:00
Kurt Partridge
64b9596544
Merge "[Lazy2] Pass a runnable to abort"
2013-03-13 13:20:55 +00:00
Satoshi Kataoka
a38e14fd55
Merge "Refactor skippable code point" into jb-mr2-dev
2013-03-13 13:01:48 +00:00
Jean Chalard
8067b769f1
Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev
2013-03-13 10:55:04 +00:00
Satoshi Kataoka
cbb816d1b0
Refactor skippable code point
...
Change-Id: I5477b6e5d29d1f0b9c2fd5a495be77cf5f2fbaee
2013-03-13 19:04:16 +09:00
Tadashi G. Takaoka
601a8582d0
Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev
2013-03-13 07:52:35 +00:00
Satoshi Kataoka
0ab44b21bd
Merge "Make isInternal mutable" into jb-mr2-dev
2013-03-13 07:41:11 +00:00
Satoshi Kataoka
756791e6bf
Make isInternal mutable
...
Change-Id: Ib81ceba801be0ac7ef65c4eadd1ec8599e80dacc
2013-03-13 16:28:50 +09:00
Tadashi G. Takaoka
24cea7f1fb
Move checking non-persistent checkbox to onResume
...
Bug: 8336068
Change-Id: I07e67a6aee24a239a21e6fc69eb2ec741b9a5b2b
2013-03-13 15:54:33 +09:00
Jean Chalard
13a82d9530
[Lazy2] Pass a runnable to abort
...
Change-Id: I721afbf426099753aa876a55323eb806b08c24d6
2013-03-12 18:56:57 -07:00
Kurt Partridge
ee698210af
am 5e75e15a: Merge "[Lazy1] Switch to blocking log closures"
...
* commit '5e75e15a95185a56c0bdd19d3efbe9de9e5775f9':
[Lazy1] Switch to blocking log closures
2013-03-12 17:20:36 -07:00
Kurt Partridge
5e75e15a95
Merge "[Lazy1] Switch to blocking log closures"
2013-03-13 00:18:02 +00:00
Jean Chalard
7423005b96
[Lazy1] Switch to blocking log closures
...
Change-Id: I4daec20b7b47b0d71c5aab6e17cd660015e19e71
2013-03-12 17:09:08 -07:00
Baligh Uddin
df601fd0d1
Import translations. DO NOT MERGE
...
Change-Id: I16ec93523721a344e1a09b5242400fe719d07516
Auto-generated-cl: translation import
2013-03-12 13:14:01 -07:00
Baligh Uddin
ad642a2c82
Import translations. DO NOT MERGE
...
Change-Id: Iec0b99658d2bdbf7d6cd640733dcb9de3bc33ef0
Auto-generated-cl: translation import
2013-03-12 13:09:34 -07:00
Baligh Uddin
7f0aaaef7c
Import translations. DO NOT MERGE
...
Change-Id: Idf34e25ce4d5c162955b70c53c105f87486a7ff6
Auto-generated-cl: translation import
2013-03-12 13:08:49 -07:00
Baligh Uddin
e1720957b5
Import translations. DO NOT MERGE
...
Change-Id: I478c5e0ec19d0d1f1835826606f7736059e7795c
Auto-generated-cl: translation import
2013-03-12 13:07:57 -07:00
The Android Automerger
cfae847a63
keep history after reset
2013-03-12 14:34:58 +00:00
Tadashi G. Takaoka
1b985607cc
am dbfd2825: am 2bbd3065: Language dependent single/doule quotation more keys
...
* commit 'dbfd2825c8bc46d64ac2752aa04c23ab385fbbac':
Language dependent single/doule quotation more keys
2013-03-11 22:59:55 -07:00
Tadashi G. Takaoka
dbfd2825c8
am 2bbd3065: Language dependent single/doule quotation more keys
...
* commit '2bbd3065d3bd9785ad1638c65f8c73f11bf21922':
Language dependent single/doule quotation more keys
2013-03-12 05:57:30 +00:00
Tadashi G. Takaoka
2bbd3065d3
Language dependent single/doule quotation more keys
...
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
2013-03-12 14:43:34 +09:00
Jean Chalard
92eaa6fc7c
[DO NOT MERGE] Deactivate H/W keyboard handling
...
For MR2, LatinIME should not be handling hardware keyboard
events. The feature is still work in progress.
Change-Id: I56ff18bff84ba6b5a6bc3f8829b42eaf33b72554
2013-03-12 14:22:06 +09:00
Jean-Baptiste Queru
2d83a03ba3
am fd40dd97: (-s ours) am 998a1748: (-s ours) am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'fd40dd977d785aafbe781c918dc94dedbc59eacd':
2013-03-11 13:58:32 -07:00
Jean-Baptiste Queru
fd40dd977d
am 998a1748: (-s ours) am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '998a1748b68838ee2b1465c9e53de65453b0a047':
2013-03-11 20:56:09 +00:00
Jean-Baptiste Queru
998a1748b6
am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'c3f789fd917ba413be8b6f73f87e49a8773bea41':
2013-03-11 13:44:28 -07:00
Jean-Baptiste Queru
c3f789fd91
am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '7b52eac491e6a97c6ef87cbcb08e5f902c10c9e3':
2013-03-11 13:13:33 -07:00
Jean-Baptiste Queru
7b52eac491
am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '99a7231d50daaacbdb35513b327b475d4de44e3f':
2013-03-11 13:00:40 -07:00
Jean-Baptiste Queru
99a7231d50
am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '9708aa4e5e1d2909119eed2b47f06e932fc512a2':
2013-03-11 12:47:18 -07:00
