Commit Graph

33904 Commits (dbe2b683c7ad4b7520a3bfed2d58957d0145c885)

Author SHA1 Message Date
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
Jean Chalard 0304c77750 Merge "[SD10] Add script checks for Lao and Khmer" into lmp-dev 2014-07-24 16:04:26 +00:00
Jean Chalard a9c12692ed [SD10] Add script checks for Lao and Khmer
Bug: 15840116
Change-Id: Id72b739e73cb3e72f56e1872ad9d60469555e193
2014-07-30 12:02:37 +09:00
Jean Chalard 0f6807bfb4 Merge "[HW7] Introduce consumed events" into lmp-dev 2014-07-24 16:04:26 +00:00
Jean Chalard 8e38b12e9c [HW7] Introduce consumed events
Change-Id: I692c35b8e701d5a84500b949884472545b1f424d
2014-07-30 11:37:19 +09:00
Jean Chalard 7196566d4f [HW6] Split processing and applying the event.
...take 2

Change-Id: I9d13b6d51e13ce2e76ae3febebfb8c310eba509d
2014-07-30 11:06:43 +09:00
Jean Chalard bf2a321005 Merge "[HW6] Split processing and applying the event." into lmp-dev 2014-07-24 16:04:26 +00:00
Ken Wakasa c4f6fc1e48 Merge "Revert "[HW6] Split processing and applying the event."" into lmp-dev 2014-07-24 16:04:26 +00:00
Ken Wakasa 4399849dea Revert "[HW6] Split processing and applying the event."
This reverts commit 1db3d860ca.

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

Change-Id: I5e2d02300320438ef9c29577ec5b0860ea91d822
2014-07-30 00:55:49 +00:00
Ken Wakasa 9fbeeb609f Merge "Revert "[HW7] Introduce consumed events"" into lmp-dev 2014-07-24 16:04:26 +00:00
Ken Wakasa bfa6f9533c Revert "[HW7] Introduce consumed events"
This reverts commit 99aff0af98.

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

Change-Id: Id41d802981d079f17134a03cc30ab36a3cdd4ac1
2014-07-30 00:53:24 +00:00
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