Jean Chalard
738807fdc5
am d3e78fc5: Merge "Fix a bug where changing auto-shift would cancel autorepeat."
...
* commit 'd3e78fc5ce8be694bd97e6580d761f3e4ec6e519':
Fix a bug where changing auto-shift would cancel autorepeat.
2014-01-08 20:56:20 -08:00
Jean Chalard
d3e78fc5ce
Merge "Fix a bug where changing auto-shift would cancel autorepeat."
2014-01-09 04:53:34 +00:00
Baligh Uddin
0b3ed3b43e
am 941a4540: (-s ours) Import translations. DO NOT MERGE
...
* commit '941a4540bc648f329d3dd8e357d33ccd80694679':
Import translations. DO NOT MERGE
2014-01-08 20:21:24 -08:00
Jean Chalard
5cbda70956
Fix a bug where changing auto-shift would cancel autorepeat.
...
Bug: 12453966
Change-Id: Idd65f732e2de0a7309e08315893c28cca63732c5
2014-01-09 12:57:10 +09:00
Baligh Uddin
941a4540bc
Import translations. DO NOT MERGE
...
Change-Id: Ia2d0f4528529df463307e1706cd4d7265b3958c1
Auto-generated-cl: translation import
2014-01-08 13:45:51 -08:00
Baligh Uddin
87e0a5c89e
Import translations. DO NOT MERGE
...
Change-Id: I5a8ed486c75c319212cfa5d831ccbca3f10acd26
Auto-generated-cl: translation import
2014-01-08 13:44:53 -08:00
Keisuke Kuroyanagi
00183a8a05
am 5742a415: Merge "Make reloadMainDict() private."
...
* commit '5742a415f37a3f3d4ddba4c7cc0b47385db7ecc7':
Make reloadMainDict() private.
2014-01-08 03:05:10 -08:00
Keisuke Kuroyanagi
5742a415f3
Merge "Make reloadMainDict() private."
2014-01-08 11:03:02 +00:00
Keisuke Kuroyanagi
9f1fe87580
Make reloadMainDict() private.
...
Bug: 8187060
Change-Id: I852a751d748f39512e62c9cd69748dfbe87b2151
2014-01-08 18:59:43 +09:00
Jean Chalard
cb617344a7
am b90fa0fb: Revert "Revert "Separate spacing and punctuation related settings values""
...
* commit 'b90fa0fb2ce195cfaec878dea9702261290176c2':
Revert "Revert "Separate spacing and punctuation related settings values""
2014-01-08 01:43:07 -08:00
Jean Chalard
3d38accd1f
am e5cdcaff: Fix a race condition, take 2.
...
* commit 'e5cdcaff658f5366621115a728cb683eab5fda0a':
Fix a race condition, take 2.
2014-01-08 01:43:00 -08:00
Jean Chalard
efd575919b
am 1e7f2809: Merge "Revert "Separate spacing and punctuation related settings values""
...
* commit '1e7f2809d2ec544b07956bdbe89c905c981b75fc':
Revert "Separate spacing and punctuation related settings values"
2014-01-08 01:42:52 -08:00
Jean Chalard
3cabb6dac1
am d4843c25: Merge "Revert "Fix a race condition, take 2.""
...
* commit 'd4843c25e2b9f7e7c7c972af0cb22aac89e15d7d':
Revert "Fix a race condition, take 2."
2014-01-08 01:42:42 -08:00
Jean Chalard
b90fa0fb2c
Revert "Revert "Separate spacing and punctuation related settings values""
...
This reverts commit 8bc427799a
.
Change-Id: I34f509998afdb1a7c120fbfdb9f0a1b188224a4d
2014-01-08 18:08:01 +09:00
Jean Chalard
e5cdcaff65
Fix a race condition, take 2.
...
Don't use absolute cursor positions when making edits,
this leads to race conditions.
This is a bit ugly and will need to be fixed soon. Plans are
underway to clean this up.
Bug: 12390573
Change-Id: I69c09fc41b979880d0800c55a710e39373287cff
2014-01-08 18:04:44 +09:00
Jean Chalard
1e7f2809d2
Merge "Revert "Separate spacing and punctuation related settings values""
2014-01-08 09:03:15 +00:00
Jean Chalard
8bc427799a
Revert "Separate spacing and punctuation related settings values"
...
This is conflicting with later changes. Temporary revert for cherry-pick.
This reverts commit 0b593ce858
.
Change-Id: Id53eadb023a950cfcca496c0cfbfe583c7ec7b8c
2014-01-08 09:00:45 +00:00
Jean Chalard
d4843c25e2
Merge "Revert "Fix a race condition, take 2.""
2014-01-08 09:00:18 +00:00
Jean Chalard
a247264dc6
Revert "Fix a race condition, take 2."
...
Conflicts prevent this to be cherry-picked.
This reverts commit dd3d697a6e
.
Change-Id: Ib97fae2234633b4bb27d611f48a79060db9ab16f
2014-01-08 08:59:26 +00:00
Jean Chalard
83d761456a
am ff7103d3: Merge "Fix a race condition, take 2."
...
* commit 'ff7103d356819952bf040ab851f96a30ed0d3abc':
Fix a race condition, take 2.
2014-01-08 00:37:15 -08:00
Jean Chalard
614bec1551
am 0a0a3cda: Merge "Revert "Revert "Fix a race condition."""
...
* commit '0a0a3cdad83ae0923c503c394ebdefafff2a217b':
Revert "Revert "Fix a race condition.""
2014-01-08 00:37:07 -08:00
Jean Chalard
ff7103d356
Merge "Fix a race condition, take 2."
2014-01-08 08:35:24 +00:00
Jean Chalard
0a0a3cdad8
Merge "Revert "Revert "Fix a race condition."""
2014-01-08 08:35:19 +00:00
Jean Chalard
dd3d697a6e
Fix a race condition, take 2.
...
Don't use absolute cursor positions when making edits,
this leads to race conditions.
This is a bit ugly and will need to be fixed soon. Plans are
underway to clean this up.
Bug: 12390573
Change-Id: Ib42d4149343c642b1b5c1937b424e8afdbd4cc1f
2014-01-08 17:19:29 +09:00
Tadashi G. Takaoka
e1dfbbe886
am ad78058a: Rename InputPointers.addPointer and ResizableIntArray.add
...
* commit 'ad78058a93492d4f114c6a6eb56177be9231a9eb':
Rename InputPointers.addPointer and ResizableIntArray.add
2014-01-07 23:52:37 -08:00
Jean Chalard
f628629f69
Revert "Revert "Fix a race condition.""
...
This reverts commit 3840127244
.
Change-Id: I7f0d975ec9e18d94fe3505250360c2b79ccbe96d
2014-01-08 16:44:43 +09:00
Tadashi G. Takaoka
12f569ba95
am e13cc9d7: Fix ResizableIntArrayTests readability
...
* commit 'e13cc9d7e596c8c9db1b36a772b51e4960137671':
Fix ResizableIntArrayTests readability
2014-01-07 22:10:50 -08:00
Tadashi G. Takaoka
c215ea2f35
am 9b351f75: Merge "Fix InputPointersTests"
...
* commit '9b351f75943b50df9ebf2452dfe9c3a797547f1a':
Fix InputPointersTests
2014-01-07 21:32:23 -08:00
Tadashi G. Takaoka
ad78058a93
Rename InputPointers.addPointer and ResizableIntArray.add
...
Change-Id: I5580250c91b29f93ed886b080ce33845b3b67ace
2014-01-08 14:30:21 +09:00
Tadashi G. Takaoka
e13cc9d7e5
Fix ResizableIntArrayTests readability
...
Change-Id: I68862b98f228210f1d76fef4fd7454edbfd8e01d
2014-01-08 14:30:21 +09:00
Tadashi G. Takaoka
9b351f7594
Merge "Fix InputPointersTests"
2014-01-08 05:29:32 +00:00
Tadashi G. Takaoka
e7dc5302af
Fix InputPointersTests
...
InputPointers.getTime(int) has a validity check of time values. And
the check is enabled when LatinImeLogger.sDBG is on. Such situation
may occur while unit testing. This change ensure that time values are
monotonic while unit testing.
Change-Id: I9ff2cff2bcd253de0e8206dd3be964fe565170fa
2014-01-08 14:14:42 +09:00
Keisuke Kuroyanagi
c382d0f114
am b3c51630: Fix: NPE in LatinIME.loadSettnigs().
...
* commit 'b3c51630a6b8dc09c161c7720db7bae21b0cf27e':
Fix: NPE in LatinIME.loadSettnigs().
2014-01-07 19:57:02 -08:00
Keisuke Kuroyanagi
b3c51630a6
Fix: NPE in LatinIME.loadSettnigs().
...
Change-Id: Icae6c74401a7a8f4da6015737f09f557640c0cca
2014-01-08 12:43:58 +09:00
Tadashi G. Takaoka
277ed1fb47
am 38503155: Merge "Separate spacing and punctuation related settings values"
...
* commit '385031557b7885d739d77e79f9cfc321659cbecf':
Separate spacing and punctuation related settings values
2014-01-07 18:44:47 -08:00
Tadashi G. Takaoka
385031557b
Merge "Separate spacing and punctuation related settings values"
2014-01-08 02:41:51 +00:00
Keisuke Kuroyanagi
f61b53c7f2
am f86b8309: Merge "Prepare using dictionaryFacilitator for amanatto updates."
...
* commit 'f86b8309869b6bde9aff6a73510e415cbceb9d6e':
Prepare using dictionaryFacilitator for amanatto updates.
2014-01-07 18:12:47 -08:00
Keisuke Kuroyanagi
f86b830986
Merge "Prepare using dictionaryFacilitator for amanatto updates."
2014-01-08 02:09:47 +00:00
Tadashi G. Takaoka
0b593ce858
Separate spacing and punctuation related settings values
...
Bug: 12179576
Change-Id: Ibafd824a0ea2251843b388e95dcbd8f9bca92d5c
2014-01-08 10:02:37 +09:00
Ken Wakasa
356206178a
am 8bd65855: Merge "Revert "Fix a race condition.""
...
* commit '8bd658555d739ad0cb30a0805f2ec087a8a6930e':
Revert "Fix a race condition."
2014-01-07 15:59:47 -08:00
Ken Wakasa
8bd658555d
Merge "Revert "Fix a race condition.""
2014-01-07 23:57:07 +00:00
Victoria Lease
3840127244
Revert "Fix a race condition."
...
This reverts commit 42e83c7f06
.
Bug: 12434783
Change-Id: Id01b6d14906430b13e64f5fc4d7fb01572d0a960
2014-01-07 23:26:54 +00:00
Baligh Uddin
1521d87aa6
am 917bd259: (-s ours) am dd003a71: (-s ours) am 489fc1c5: (-s ours) am 17b06650: (-s ours) am bbba6d79: (-s ours) am 184e4d14: (-s ours) Import translations. DO NOT MERGE
...
* commit '917bd259250cb4ba7e2f827e72a6c26baf20f3c8':
Import translations. DO NOT MERGE
2014-01-07 11:25:23 -08:00
Baligh Uddin
917bd25925
am dd003a71: (-s ours) am 489fc1c5: (-s ours) am 17b06650: (-s ours) am bbba6d79: (-s ours) am 184e4d14: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dd003a71a710202279aa5d93b399f1e1d3a10898':
Import translations. DO NOT MERGE
2014-01-07 19:23:06 +00:00
Baligh Uddin
dd003a71a7
am 489fc1c5: (-s ours) am 17b06650: (-s ours) am bbba6d79: (-s ours) am 184e4d14: (-s ours) Import translations. DO NOT MERGE
...
* commit '489fc1c58a696247b8d7525cd0869be9224e5412':
Import translations. DO NOT MERGE
2014-01-07 18:24:56 +00:00
Baligh Uddin
489fc1c58a
am 17b06650: (-s ours) am bbba6d79: (-s ours) am 184e4d14: (-s ours) Import translations. DO NOT MERGE
...
* commit '17b06650f17f674bb039e8937737a76cafa32e61':
Import translations. DO NOT MERGE
2014-01-07 18:21:50 +00:00
Baligh Uddin
17b06650f1
am bbba6d79: (-s ours) am 184e4d14: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bbba6d79b6eda0dc1ad05c679fc9e7f9df313bf6':
Import translations. DO NOT MERGE
2014-01-07 10:18:50 -08:00
Baligh Uddin
bbba6d79b6
am 184e4d14: (-s ours) Import translations. DO NOT MERGE
...
* commit '184e4d14643e802e49ebbf6f533047d7cf27f2d5':
Import translations. DO NOT MERGE
2014-01-07 10:15:45 -08:00
Baligh Uddin
e72f7c391e
am f2f06408: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'f2f0640800410cb68268c1546a3bf747d4060fb8':
Import translations. DO NOT MERGE
2014-01-07 10:14:55 -08:00
Baligh Uddin
f2f0640800
Merge "Import translations. DO NOT MERGE"
2014-01-07 18:11:29 +00:00