Jean Chalard
3d951c1eff
Wait for an event before actually realizing it
...
This would wrongly emit a 'timeout' log entry when switching
between two instances of the same language.
Change-Id: I56e5de121b87f3e762b58f0b2a77e9abc784036e
2014-07-28 19:33:49 +09:00
Keisuke Kuroyanagi
6c627db6b6
am 862fa431: am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '862fa431df2174f2d45045353cdcf29e508dbd15':
Add BufferWithExtendablebufferTest
2014-07-25 02:03:59 +00:00
Keisuke Kuroyanagi
e127672661
am 917f8002: am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit '917f8002c0eb310da517ec97b235fada60978996':
Add BufferWithExtendableBuffer::extend()
2014-07-25 02:03:58 +00:00
Keisuke Kuroyanagi
6bd15b8662
am e32cb6f8: am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit 'e32cb6f8f267ce044c2880106e5a5a309ec9dc33':
Refactoring checkAndPrepareWriting.
2014-07-25 02:03:56 +00:00
Keisuke Kuroyanagi
862fa431df
am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '370ffb424f4d03143c7e5d8186206e58e6fb4021':
Add BufferWithExtendablebufferTest
2014-07-24 23:59:07 +00:00
Keisuke Kuroyanagi
917f8002c0
am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit '90ac50ee433d7ecb1a89da242d0d99b882169d17':
Add BufferWithExtendableBuffer::extend()
2014-07-24 23:59:06 +00:00
Keisuke Kuroyanagi
e32cb6f8f2
am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit '16665da28091f977e92dd0382eb3adefc8478f36':
Refactoring checkAndPrepareWriting.
2014-07-24 23:59:05 +00:00
Keisuke Kuroyanagi
370ffb424f
am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '825243bfdd6fb63c2ef8bf99024bb06e6f52e946':
Add BufferWithExtendablebufferTest
2014-07-24 23:37:03 +00:00
Keisuke Kuroyanagi
90ac50ee43
am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit 'dfbe2a8ca80ef73a0bc1364cf5964db2141a2a86':
Add BufferWithExtendableBuffer::extend()
2014-07-24 23:36:16 +00:00
Keisuke Kuroyanagi
16665da280
am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit 'f78eb27c7e563d0bbe10239ec7d9941fd170e597':
Refactoring checkAndPrepareWriting.
2014-07-24 23:35:45 +00:00
Tim Murray
5d44dfe005
am ea3bc5ca: am da9cc773: resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
* commit 'ea3bc5caac38ccfd59c4fba957b4102e049e8f9f':
Use default compiler flags for dicttool.
2014-07-24 21:27:56 +00:00
Tim Murray
ea3bc5caac
am da9cc773: resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9':
Use default compiler flags for dicttool.
2014-07-24 21:25:56 +00:00
Tim Murray
da9cc77339
resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
2014-07-24 14:21:52 -07:00
Baligh Uddin
2dc3a51001
Merge "Import translations. DO NOT MERGE"
2014-07-24 20:48:02 +00:00
Stephen Hines
ed40eac86a
am 578c6311: am 5a289ed2: Revert "Revert "Revert "Use mclinker"""
...
* commit '578c6311548e3f85e6b8c8800a66eb252e6b42f7':
Revert "Revert "Revert "Use mclinker"""
2014-07-24 20:08:29 +00:00
Tadashi G. Takaoka
9a3905beca
am 456cc996: am a270ac4a: Remove unnecessary DebugSettingsActivity, use fragment directly
...
* commit '456cc9967831337c759ae2ba9c6a5621ef776110':
Remove unnecessary DebugSettingsActivity, use fragment directly
2014-07-24 20:08:27 +00:00
Stephen Hines
578c631154
am 5a289ed2: Revert "Revert "Revert "Use mclinker"""
...
* commit '5a289ed29345e545742bc33728d7010b5e2c1e65':
Revert "Revert "Revert "Use mclinker"""
2014-07-24 20:01:01 +00:00
Tadashi G. Takaoka
456cc99678
am a270ac4a: Remove unnecessary DebugSettingsActivity, use fragment directly
...
* commit 'a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7':
Remove unnecessary DebugSettingsActivity, use fragment directly
2014-07-24 20:01:00 +00:00
Baligh Uddin
9ac0f0838b
Import translations. DO NOT MERGE
...
Change-Id: Id8eadce808d946a7674f41826ab4aa086ac818e7
Auto-generated-cl: translation import
2014-07-24 09:40:19 -07:00
Tadashi G. Takaoka
8ca3eb67d2
Merge "Update Material icons and backgrounds" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
e14c680078
Update Material icons and backgrounds
...
Bug: 16143083
Change-Id: I6396f725b30e9ef6fa7964a0c9d7eb6d1d97e376
2014-07-29 11:32:04 +09:00
Keisuke Kuroyanagi
6850ea0ee5
Merge "Add boundary check for ver2 bigram reading." into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
1e491d90f9
Merge "Use fragment for advanced preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
9bdcb13160
Use fragment for advanced preference screen
...
Bug: 16522808
Change-Id: If4a2ad7a7dfecc7019bf78ad37d93fa8f37cf21e
2014-07-28 19:24:41 +09:00
Keisuke Kuroyanagi
fb15b768dd
Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
79ff803cb0
Fix NPE when context.getFilesDir() returns null.
...
Bug: 16416948
Change-Id: I0fac5ab26d6efbadbd688d033a79f6705e0161a5
2014-07-28 19:25:07 +09:00
Tadashi G. Takaoka
9ba854133c
Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
99295c8c5f
Refactor Debug settings to use SubScreenFragment
...
Bug: 16522808
Change-Id: I741e2fbc5f0a62c7d4ae00e603eef52cc2a6d086
2014-07-28 19:16:42 +09:00
Tadashi G. Takaoka
00b49cad9c
Use fragment for text correction preference screen
...
Bug: 16522808
Change-Id: Ia8ce83b0e69cc8157f7b8cefcfeb863eb85ee4b4
2014-07-28 17:48:49 +09:00
Tadashi G. Takaoka
3c8a075a58
Use fragment for gesture typing preference screen
...
Bug: 16522808
Change-Id: Ib8c2997466bb006c6b5d4e980344507b822d0023
2014-07-28 17:45:41 +09:00
Tadashi G. Takaoka
6b71530017
Use fragment for multi lingual preference screen
...
Bug: 16522808
Change-Id: I0bfac43513e1fb85b5d4c07f56dd4c5b82f75ed1
2014-07-28 17:20:16 +09:00
Tadashi G. Takaoka
633f1a5e6e
Merge "Use fragment for text correction preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
a484dc84d9
Merge "Use fragment for gesture typing preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
1da4385493
Merge "Use fragment for multi lingual preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Jean Chalard
6d7a08107c
Merge "Fix a verifier error on ICS." into lmp-dev
2014-07-24 16:04:26 +00:00
Jean Chalard
da70b90aa7
Fix a verifier error on ICS.
...
Bug: 16530557
Change-Id: I271c5884995a1d5f8a1cb7aee6f52d17fabb9e72
2014-07-28 17:33:52 +09:00
Keisuke Kuroyanagi
825243bfdd
Merge "Add BufferWithExtendablebufferTest" into lmp-dev
2014-07-24 15:37:54 +00:00
Keisuke Kuroyanagi
d4c9d50ef0
Add BufferWithExtendablebufferTest
...
Bug: 13754552
Change-Id: Ib9c330dc85bdb5d4d3d5bc15cc3ce5f28faa0b12
2014-07-25 07:02:10 +09:00
Keisuke Kuroyanagi
ff6ca09905
Add BufferWithExtendableBuffer::extend()
...
Bug: 14425059
Change-Id: I13dd8412ba4d16a1325ac2210b3852d580e71ad3
2014-07-25 07:02:05 +09:00
Keisuke Kuroyanagi
dfbe2a8ca8
Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
2014-07-24 15:35:58 +00:00
Keisuke Kuroyanagi
f78eb27c7e
Merge "Refactoring checkAndPrepareWriting." into lmp-dev
2014-07-24 15:35:58 +00:00
Stephen Hines
5a289ed293
Revert "Revert "Revert "Use mclinker"""
...
This reverts commit b48c93b3fc
.
MCLinker is not a valid option for clang 3.5.
2014-07-23 19:58:17 -07:00
Keisuke Kuroyanagi
6810e8df1e
Refactoring checkAndPrepareWriting.
...
Bug: 14425059
Change-Id: I98940f3841a6c61b0482440b4da21f415dc843f6
2014-07-24 10:24:42 +09:00
Tadashi G. Takaoka
a270ac4a61
Remove unnecessary DebugSettingsActivity, use fragment directly
...
This CL must be checked in together with I1db2e848ab.
Bug: 16522808
Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
2014-07-23 17:09:46 -07:00
Tim Murray
159474f2ae
Merge "Use default compiler flags for dicttool."
2014-07-23 18:45:08 +00:00
Tim Murray
dd28478f5c
Use default compiler flags for dicttool.
...
Not using this causes the triple to not be passed to clang, breaking Darwin.
bug 16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-23 21:44:25 -07:00
Baligh Uddin
ba8f6e0bcb
am 129f0586: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '129f05867fc881aca96c21ae2b8aac7ae0440c42':
Import translations. DO NOT MERGE
2014-07-22 17:48:27 +00:00
Baligh Uddin
3e8d3e85ea
am 9f147c13: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '9f147c1337feaf0d3903381c4ccd0ce8995ac201':
Import translations. DO NOT MERGE
2014-07-22 17:48:26 +00:00
Baligh Uddin
47e39a8e61
am f1e3f9df: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'f1e3f9df51157435e9fa87b4fe243fac3a71ab42':
Import translations. DO NOT MERGE
2014-07-22 17:48:25 +00:00
Baligh Uddin
816b238ade
am 05a2e8de: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '05a2e8dea5cc839473e116bcd328370e9a02e54f':
Import translations. DO NOT MERGE
2014-07-22 17:48:23 +00:00