Commit graph

34327 commits

Author SHA1 Message Date
Ken Wakasa
2ce8799fa8 Merge "Revert "[HW8] Pull up the processed event."" into lmp-dev 2014-07-24 16:04:26 +00:00
Ken Wakasa
76fc4914b3 Revert "[HW8] Pull up the processed event."
This reverts commit ebdd641d58.

Reverting due to a few critical bugs and unit test failures.

Change-Id: Ie7958d749dc813c1752d03aec7f14f5586225ff7
2014-07-30 00:31:57 +00:00
Ken Wakasa
dc0c3e1e2a Merge "Revert "[HW9] Pull the processed event further."" into lmp-dev 2014-07-24 16:04:26 +00:00
Ken Wakasa
e2397e54c6 Revert "[HW9] Pull the processed event further."
This reverts commit a8d80ec012.

Reverting due to a few critical bugs and unit test failures.

Change-Id: I3f49b54f34d875e8986d6ddc2523ab0b706dc6f2
2014-07-30 00:31:12 +00:00
Ken Wakasa
666f1b384f Merge "Revert "[HW7.5] Introduce the @Nonnull annotation"" into lmp-dev 2014-07-24 16:04:26 +00:00
Ken Wakasa
8aa74da98d Revert "[HW7.5] Introduce the @Nonnull annotation"
This reverts commit 60a2cd8ac4.

Reverting due to build breakage under the unbundled branch.

Change-Id: Iab2988c53884166f62c95da920ac7a7079a0e5a0
2014-07-29 15:43:59 +00:00
Jean Chalard
3c7cb5234f Merge "[HW7.5] Introduce the @Nonnull annotation" into lmp-dev 2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
2e32e83b6e Merge "Get n-gram probability in structure policy." into lmp-dev 2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
1229879e7c Get n-gram probability in structure policy.
Bug: 14425059
Change-Id: Id955a2e07dbdfb90ae55720f0c92597e0594c0d9
2014-07-29 12:01:18 +09: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
Baligh Uddin
5ccc7c664f am f9efaad4: (-s ours) Import translations. DO NOT MERGE
* commit 'f9efaad468c72df362f79bb3fc542b64aeb4d0bc':
  Import translations. DO NOT MERGE
2014-07-22 17:48:22 +00:00
Baligh Uddin
f9efaad468 Import translations. DO NOT MERGE
Change-Id: I2f8c16e0dcaf894d2c0acb70c5804969ac618500
Auto-generated-cl: translation import
2014-07-22 17:44:19 +00:00
Baligh Uddin
58ad6c4805 Import translations. DO NOT MERGE
Change-Id: Ic1191118d6f8d9dc2bcc6c293c4ffa0f86be34c6
Auto-generated-cl: translation import
2014-07-22 17:39:41 +00:00
Baligh Uddin
f1e3f9df51 Merge "Import translations. DO NOT MERGE" 2014-07-22 16:29:55 +00:00
Baligh Uddin
c1d2124a3e Import translations. DO NOT MERGE
Change-Id: I8ffb44bf95c317dca14df03e5627bd9870acccb5
Auto-generated-cl: translation import
2014-07-22 17:44:08 +00:00
Baligh Uddin
129f05867f Merge "Import translations. DO NOT MERGE" 2014-07-22 16:21:19 +00:00
Baligh Uddin
8fc6b5a820 Import translations. DO NOT MERGE
Change-Id: I8916526987bd2008b85222124bf465114e4d592c
Auto-generated-cl: translation import
2014-07-22 17:43:50 +00:00
Baligh Uddin
9f147c1337 Merge "Import translations. DO NOT MERGE" 2014-07-22 16:21:19 +00:00
Baligh Uddin
e13e675cdc Import translations. DO NOT MERGE
Change-Id: I95653f0874ab89771a1aa60cb3a01cb3cfedf01a
Auto-generated-cl: translation import
2014-07-22 17:44:02 +00:00
Baligh Uddin
05a2e8dea5 Merge "Import translations. DO NOT MERGE" 2014-07-22 16:21:19 +00:00