Commit graph

32356 commits

Author SHA1 Message Date
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
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
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
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
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
Keisuke Kuroyanagi
df11f9b8e6 Merge "Add LanguageModelDictContent." into lmp-dev 2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
dc3856d758 Add LanguageModelDictContent.
This class will replace BigramDictContent and
ProbabilityDictContent.

Bug: 14425059
Change-Id: I3d15c833957e27b2f5999386db042188272bbb4b
2014-08-01 12:45:00 +09:00
Keisuke Kuroyanagi
90b7c1729f Remove DictContent.
Bug: 14425059
Change-Id: I74fa4b6ba4605447c1c87427371e4be5eb8e7ae6
2014-08-01 12:06:21 +09:00
Keisuke Kuroyanagi
e7c9415688 Merge "Remove DictContent." into lmp-dev 2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
211370a3da Merge "Add memory view class for int and uint8_t." into lmp-dev 2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
75d8c20d03 Add memory view class for int and uint8_t.
Bug: 16691311
Change-Id: I32eb692cdb758861e24b772fdcda57642b95ae1b
2014-08-01 12:39:31 +09:00
Keisuke Kuroyanagi
3437032a91 Merge "Add TrieMap.save()." into lmp-dev 2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
60ae3e0be5 Add TrieMap.save().
Bug: 14425059
Change-Id: Ie0b4fe8b9a157da0401bb277c703ab084d5bf9cc
2014-07-31 06:01:52 +00:00
Keisuke Kuroyanagi
5c1decfbb9 Add entry iteration method to TrieMap.
Bug: 14425059
Change-Id: I79420b755f29f651d8eed61e7e48b6eb001d8dd2
2014-07-30 19:04:07 +09:00
Keisuke Kuroyanagi
5a7b634aaf Merge "Add entry iteration method to TrieMap." into lmp-dev 2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
f40adc97cb Merge "Add a method to iterate ngram entries." into lmp-dev 2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
f4a3fd4893 Merge "Disptach hover events when sliding suggestion mode" into lmp-dev 2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
da232a70a8 Disptach hover events when sliding suggestion mode
Bug: 15687702
Change-Id: I7ace1fbbba724c6e422230a3d88f8cc9ffa8efc2
2014-07-30 14:55:53 +09: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