Commit graph

10070 commits

Author SHA1 Message Date
Ken Wakasa
7914e907b5 Add comments for meaningless lines
Change-Id: I20ebe246f6980fd3054c2c7e98b5150eaabbcc77
2012-09-07 08:55:16 +09:00
Satoshi Kataoka
2a5ad57707 am a6921d32: am 3051966b: Merge "The processNextKey becomes to use actual average duration." into jb-mr1-dev
* commit 'a6921d326a3fae8354ee904c43b837fbc59a00e5':
  The processNextKey becomes to use actual average duration.
2012-09-06 09:12:32 -07:00
Jean Chalard
59e20c987a am 3f31e963: am 3518ed60: Merge "Fix one-off bugs reported by Valgrind" into jb-mr1-dev
* commit '3f31e96362a38e090a822b36b1de788a1ee04ed2':
  Fix one-off bugs reported by Valgrind
2012-09-06 09:12:31 -07:00
Ken Wakasa
e0fef5067d am 23f8c24d: am 3069e226: Merge "Add tests for readDictionaryBinary with byte array." into jb-mr1-dev
* commit '23f8c24d795dec9634c6d2df4c2e7b4d8323d65d':
  Add tests for readDictionaryBinary with byte array.
2012-09-06 09:12:29 -07:00
Tadashi G. Takaoka
568cca5004 am f5639977: am a47a17a2: Merge "Revise gesture preview trail design" into jb-mr1-dev
* commit 'f56399772e11cc27a076357645cc98f59df2df97':
  Revise gesture preview trail design
2012-09-06 09:12:28 -07:00
Ken Wakasa
b3b78f8152 am 4a29e835: am fc9ea5be: Merge "Refactor BinaryDictIOTests." into jb-mr1-dev
* commit '4a29e83576bf41e3253cfb8d46dd58473556a123':
  Refactor BinaryDictIOTests.
2012-09-06 09:12:25 -07:00
Ken Wakasa
5303b5cc92 am ccf1f81c: am f76bb32b: Merge "Check shortcuts in checkDictionary." into jb-mr1-dev
* commit 'ccf1f81c13c78893bac4ab186b7ff69d66fc4256':
  Check shortcuts in checkDictionary.
2012-09-06 09:12:23 -07:00
Satoshi Kataoka
a6921d326a am 3051966b: Merge "The processNextKey becomes to use actual average duration." into jb-mr1-dev
* commit '3051966b8c10802b0ff6490c2ae85ec8553669f4':
  The processNextKey becomes to use actual average duration.
2012-09-06 08:23:45 -07:00
Jean Chalard
3f31e96362 am 3518ed60: Merge "Fix one-off bugs reported by Valgrind" into jb-mr1-dev
* commit '3518ed6031a1bcb9a501be4b9e1f5b82568185bd':
  Fix one-off bugs reported by Valgrind
2012-09-06 08:23:43 -07:00
Ken Wakasa
23f8c24d79 am 3069e226: Merge "Add tests for readDictionaryBinary with byte array." into jb-mr1-dev
* commit '3069e226104d71ec0ce92c62964f6f60efa48332':
  Add tests for readDictionaryBinary with byte array.
2012-09-06 08:23:41 -07:00
Tadashi G. Takaoka
f56399772e am a47a17a2: Merge "Revise gesture preview trail design" into jb-mr1-dev
* commit 'a47a17a216567e899d811abce3a66103eafbb14c':
  Revise gesture preview trail design
2012-09-06 08:23:39 -07:00
Ken Wakasa
4a29e83576 am fc9ea5be: Merge "Refactor BinaryDictIOTests." into jb-mr1-dev
* commit 'fc9ea5be47132d3e42fc310331ac89d2f42392c3':
  Refactor BinaryDictIOTests.
2012-09-06 08:23:38 -07:00
Ken Wakasa
ccf1f81c13 am f76bb32b: Merge "Check shortcuts in checkDictionary." into jb-mr1-dev
* commit 'f76bb32bd7916c75a655e516ac487cc96fa89b11':
  Check shortcuts in checkDictionary.
2012-09-06 08:23:36 -07:00
The Android Automerger
3ef13f7b93 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-06 06:34:46 -07:00
Satoshi Kataoka
3051966b8c Merge "The processNextKey becomes to use actual average duration." into jb-mr1-dev 2012-09-06 05:33:56 -07:00
Keisuke Kuroyanagi
3811a28ddc The processNextKey becomes to use actual average duration.
Change-Id: I35d8915eb113e513ce8c9f979dbdb8b0b013db50
2012-09-06 20:55:45 +09:00
Jean Chalard
3518ed6031 Merge "Fix one-off bugs reported by Valgrind" into jb-mr1-dev 2012-09-06 04:49:45 -07:00
Ken Wakasa
3069e22610 Merge "Add tests for readDictionaryBinary with byte array." into jb-mr1-dev 2012-09-06 04:40:41 -07:00
Jean Chalard
18ebba3a66 Fix one-off bugs reported by Valgrind
Bug: 7108990
Change-Id: I40ba30f50a26b65bcac905fc005ad6bb9cb034cc
2012-09-06 20:37:55 +09:00
Yuichiro Hanada
be5db53a09 Add tests for readDictionaryBinary with byte array.
Change-Id: I2c2815e9d4867687fb3f5b0c661e6162b88c0a0c
2012-09-06 20:35:33 +09:00
Tadashi G. Takaoka
a47a17a216 Merge "Revise gesture preview trail design" into jb-mr1-dev 2012-09-06 04:11:50 -07:00
Tadashi G. Takaoka
c1780c16a7 Revise gesture preview trail design
Bug: 7042741
Change-Id: I99e3b3a6fc52afaee3cc5daf371131c3afebb3ae
2012-09-06 20:09:12 +09:00
Ken Wakasa
fc9ea5be47 Merge "Refactor BinaryDictIOTests." into jb-mr1-dev 2012-09-06 03:54:08 -07:00
Ken Wakasa
f76bb32bd7 Merge "Check shortcuts in checkDictionary." into jb-mr1-dev 2012-09-06 03:53:50 -07:00
Yuichiro Hanada
13b85c4167 Refactor BinaryDictIOTests.
Change-Id: I6eef88ab436f478a9255cc20ea59a24cd472807e
2012-09-06 18:06:14 +09:00
Yuichiro Hanada
6e422af881 Check shortcuts in checkDictionary.
Change-Id: I150913833e586bf7d3f0b9b2e796a61f89fa4f83
2012-09-06 16:32:54 +09:00
Tadashi G. Takaoka
2d1cb69aa3 am 90832e92: am 15496ec4: Merge "Revise gesture floating preview design" into jb-mr1-dev
* commit '90832e92c2d7e6d71256ad02d745ae1cf942aa71':
  Revise gesture floating preview design
2012-09-05 20:38:59 -07:00
Tadashi G. Takaoka
90832e92c2 am 15496ec4: Merge "Revise gesture floating preview design" into jb-mr1-dev
* commit '15496ec4d7ea2b780fbc66f2debda0b8dcc3d3c8':
  Revise gesture floating preview design
2012-09-05 20:37:25 -07:00
Tadashi G. Takaoka
15496ec4d7 Merge "Revise gesture floating preview design" into jb-mr1-dev 2012-09-05 20:35:40 -07:00
Tadashi G. Takaoka
71e2e8152f Revise gesture floating preview design
Bug: 7043127
Change-Id: Ibf9a6d57279263d9b60753e0eb734b658eeda9f2
2012-09-06 12:29:57 +09:00
Ken Wakasa
f9870f605d am 7d4fe9a6: am aa7cc7be: Merge "Cosmetic cleanup" into jb-mr1-dev
* commit '7d4fe9a6727d2af1aee5cc698bb267c3bd1ecdfd':
  Cosmetic cleanup
2012-09-05 19:12:56 -07:00
Ken Wakasa
7d4fe9a672 am aa7cc7be: Merge "Cosmetic cleanup" into jb-mr1-dev
* commit 'aa7cc7beed43beab8c85654ff4989000ea1133a4':
  Cosmetic cleanup
2012-09-05 19:10:19 -07:00
Ken Wakasa
aa7cc7beed Merge "Cosmetic cleanup" into jb-mr1-dev 2012-09-05 19:07:45 -07:00
Kurt Partridge
8df19d7de3 am 73f22e9b: am 6fbb8ed2: Merge "add logging code" into jb-mr1-dev
* commit '73f22e9b3caa4cd66a55e988b150318d0d79fe29':
  add logging code
2012-09-05 18:50:34 -07:00
Kurt Partridge
73f22e9b3c am 6fbb8ed2: Merge "add logging code" into jb-mr1-dev
* commit '6fbb8ed253049771a6059863d87848c9143cce3d':
  add logging code
2012-09-05 18:48:46 -07:00
Kurt Partridge
6fbb8ed253 Merge "add logging code" into jb-mr1-dev 2012-09-05 18:46:26 -07:00
Kurt Partridge
3f189e18fc am abb42d8b: am 1093952c: Merge "ResearchLogging do not even show basic data for password fields" into jb-mr1-dev
* commit 'abb42d8bd54667c8c178f206ab9a6ec54753e520':
  ResearchLogging do not even show basic data for password fields
2012-09-05 11:57:42 -07:00
Kurt Partridge
abb42d8bd5 am 1093952c: Merge "ResearchLogging do not even show basic data for password fields" into jb-mr1-dev
* commit '1093952cbbe4cb073343d7366280a0bfa562fb52':
  ResearchLogging do not even show basic data for password fields
2012-09-05 11:54:32 -07:00
Kurt Partridge
1093952cbb Merge "ResearchLogging do not even show basic data for password fields" into jb-mr1-dev 2012-09-05 11:53:07 -07:00
Kurt Partridge
58bc18ca75 am ae6f6e81: am 625cfe3d: Merge "ResearchLog uploadingService now waits for logging to finish" into jb-mr1-dev
* commit 'ae6f6e8109da26756d8ea10b45b3ad68698b021b':
  ResearchLog uploadingService now waits for logging to finish
2012-09-05 10:43:36 -07:00
Kurt Partridge
ae6f6e8109 am 625cfe3d: Merge "ResearchLog uploadingService now waits for logging to finish" into jb-mr1-dev
* commit '625cfe3d2119538b508c0d2eb82d1098579e467e':
  ResearchLog uploadingService now waits for logging to finish
2012-09-05 10:41:42 -07:00
Kurt Partridge
625cfe3d21 Merge "ResearchLog uploadingService now waits for logging to finish" into jb-mr1-dev 2012-09-05 10:39:03 -07:00
Ken Wakasa
d3a9b70307 Cosmetic cleanup
Change-Id: I5e95440019f58c606ac2e947c6e0cbd4d51f6522
2012-09-06 01:13:12 +09:00
The Android Automerger
6929a3a2eb merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-05 06:34:40 -07:00
Tadashi G. Takaoka
ac5f878c94 am cce64733: am 8a599c42: Merge "Utilize StateListDrawable for key preview background" into jb-mr1-dev
* commit 'cce6473393db513cde393f3606fe6b57e049ea7a':
  Utilize StateListDrawable for key preview background
2012-09-05 05:23:43 -07:00
Satoshi Kataoka
ea89c5e317 am 4bdbd254: am cde005c0: Fix apostrophe issue
* commit '4bdbd254bb9c25630af7549dfc27c1192f6b9e09':
  Fix apostrophe issue
2012-09-05 05:23:42 -07:00
Tadashi G. Takaoka
cce6473393 am 8a599c42: Merge "Utilize StateListDrawable for key preview background" into jb-mr1-dev
* commit '8a599c420ead9e653d9a47530e56105ff2f6a247':
  Utilize StateListDrawable for key preview background
2012-09-05 05:08:37 -07:00
Satoshi Kataoka
4bdbd254bb am cde005c0: Fix apostrophe issue
* commit 'cde005c05ec6b552ec26740b578be12c7d24013b':
  Fix apostrophe issue
2012-09-05 05:08:36 -07:00
Tadashi G. Takaoka
8a599c420e Merge "Utilize StateListDrawable for key preview background" into jb-mr1-dev 2012-09-05 04:42:52 -07:00
Tadashi G. Takaoka
e8c6d5a480 Utilize StateListDrawable for key preview background
Change-Id: I268550a185701caecefc27ebaec40fb2c940d883
2012-09-05 20:38:00 +09:00