aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | Merge "Fix one-off bugs reported by Valgrind" into jb-mr1-devJean Chalard2012-09-062-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix one-off bugs reported by ValgrindJean Chalard2012-09-062-6/+6
| | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7108990 Change-Id: I40ba30f50a26b65bcac905fc005ad6bb9cb034cc
* | | | | | | | | | | | | | | | am 23f8c24d: am 3069e226: Merge "Add tests for readDictionaryBinary with ↵Ken Wakasa2012-09-062-57/+110
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | byte array." into jb-mr1-dev * commit '23f8c24d795dec9634c6d2df4c2e7b4d8323d65d': Add tests for readDictionaryBinary with byte array.
| * | | | | | | | | | | | | | | am 3069e226: Merge "Add tests for readDictionaryBinary with byte array." ↵Ken Wakasa2012-09-062-57/+110
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '3069e226104d71ec0ce92c62964f6f60efa48332': Add tests for readDictionaryBinary with byte array.
| | * | | | | | | | | | | | | | Merge "Add tests for readDictionaryBinary with byte array." into jb-mr1-devKen Wakasa2012-09-062-57/+110
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Add tests for readDictionaryBinary with byte array.Yuichiro Hanada2012-09-062-57/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c2815e9d4867687fb3f5b0c661e6162b88c0a0c
* | | | | | | | | | | | | | | | | am f5639977: am a47a17a2: Merge "Revise gesture preview trail design" into ↵Tadashi G. Takaoka2012-09-065-39/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'f56399772e11cc27a076357645cc98f59df2df97': Revise gesture preview trail design
| * | | | | | | | | | | | | | | | am a47a17a2: Merge "Revise gesture preview trail design" into jb-mr1-devTadashi G. Takaoka2012-09-065-39/+65
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a47a17a216567e899d811abce3a66103eafbb14c': Revise gesture preview trail design
| | * | | | | | | | | | | | | | | Merge "Revise gesture preview trail design" into jb-mr1-devTadashi G. Takaoka2012-09-065-39/+65
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Revise gesture preview trail designTadashi G. Takaoka2012-09-065-39/+65
| | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7042741 Change-Id: I99e3b3a6fc52afaee3cc5daf371131c3afebb3ae
* | | | | | | | | | | | | | | | am 4a29e835: am fc9ea5be: Merge "Refactor BinaryDictIOTests." into jb-mr1-devKen Wakasa2012-09-061-49/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a29e83576bf41e3253cfb8d46dd58473556a123': Refactor BinaryDictIOTests.
| * | | | | | | | | | | | | | | am fc9ea5be: Merge "Refactor BinaryDictIOTests." into jb-mr1-devKen Wakasa2012-09-061-49/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc9ea5be47132d3e42fc310331ac89d2f42392c3': Refactor BinaryDictIOTests.
| | * | | | | | | | | | | | | | Merge "Refactor BinaryDictIOTests." into jb-mr1-devKen Wakasa2012-09-061-49/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Refactor BinaryDictIOTests.Yuichiro Hanada2012-09-061-49/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6eef88ab436f478a9255cc20ea59a24cd472807e
* | | | | | | | | | | | | | | | | am ccf1f81c: am f76bb32b: Merge "Check shortcuts in checkDictionary." into ↵Ken Wakasa2012-09-061-18/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'ccf1f81c13c78893bac4ab186b7ff69d66fc4256': Check shortcuts in checkDictionary.
| * | | | | | | | | | | | | | | | am f76bb32b: Merge "Check shortcuts in checkDictionary." into jb-mr1-devKen Wakasa2012-09-061-18/+36
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f76bb32bd7916c75a655e516ac487cc96fa89b11': Check shortcuts in checkDictionary.
| | * | | | | | | | | | | | | | | Merge "Check shortcuts in checkDictionary." into jb-mr1-devKen Wakasa2012-09-061-18/+36
| | |\| | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Check shortcuts in checkDictionary.Yuichiro Hanada2012-09-061-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I150913833e586bf7d3f0b9b2e796a61f89fa4f83
* | | | | | | | | | | | | | | | am 90832e92: am 15496ec4: Merge "Revise gesture floating preview design" ↵Tadashi G. Takaoka2012-09-0510-88/+109
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '90832e92c2d7e6d71256ad02d745ae1cf942aa71': Revise gesture floating preview design
| * | | | | | | | | | | | | | | am 15496ec4: Merge "Revise gesture floating preview design" into jb-mr1-devTadashi G. Takaoka2012-09-0510-88/+109
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15496ec4d7ea2b780fbc66f2debda0b8dcc3d3c8': Revise gesture floating preview design
| | * | | | | | | | | | | | | | Merge "Revise gesture floating preview design" into jb-mr1-devTadashi G. Takaoka2012-09-0510-88/+109
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Revise gesture floating preview designTadashi G. Takaoka2012-09-0610-88/+109
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7043127 Change-Id: Ibf9a6d57279263d9b60753e0eb734b658eeda9f2
* | | | | | | | | | | | | | | am 7d4fe9a6: am aa7cc7be: Merge "Cosmetic cleanup" into jb-mr1-devKen Wakasa2012-09-058-79/+79
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d4fe9a6727d2af1aee5cc698bb267c3bd1ecdfd': Cosmetic cleanup
| * | | | | | | | | | | | | | am aa7cc7be: Merge "Cosmetic cleanup" into jb-mr1-devKen Wakasa2012-09-058-79/+79
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa7cc7beed43beab8c85654ff4989000ea1133a4': Cosmetic cleanup
| | * | | | | | | | | | | | | Merge "Cosmetic cleanup" into jb-mr1-devKen Wakasa2012-09-058-79/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Cosmetic cleanupKen Wakasa2012-09-068-79/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e95440019f58c606ac2e947c6e0cbd4d51f6522
* | | | | | | | | | | | | | | | am 73f22e9b: am 6fbb8ed2: Merge "add logging code" into jb-mr1-devKurt Partridge2012-09-052-0/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73f22e9b3caa4cd66a55e988b150318d0d79fe29': add logging code
| * | | | | | | | | | | | | | | am 6fbb8ed2: Merge "add logging code" into jb-mr1-devKurt Partridge2012-09-052-0/+30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6fbb8ed253049771a6059863d87848c9143cce3d': add logging code
| | * | | | | | | | | | | | | | Merge "add logging code" into jb-mr1-devKurt Partridge2012-09-052-0/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | add logging codeKurt Partridge2012-09-042-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0abb4a1ad67666162ab6703ffdb33c5e0675be93
* | | | | | | | | | | | | | | | | am abb42d8b: am 1093952c: Merge "ResearchLogging do not even show basic data ↵Kurt Partridge2012-09-051-19/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for password fields" into jb-mr1-dev * commit 'abb42d8bd54667c8c178f206ab9a6ec54753e520': ResearchLogging do not even show basic data for password fields
| * | | | | | | | | | | | | | | | am 1093952c: Merge "ResearchLogging do not even show basic data for password ↵Kurt Partridge2012-09-051-19/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fields" into jb-mr1-dev * commit '1093952cbbe4cb073343d7366280a0bfa562fb52': ResearchLogging do not even show basic data for password fields
| | * | | | | | | | | | | | | | | Merge "ResearchLogging do not even show basic data for password fields" into ↵Kurt Partridge2012-09-051-19/+19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| | | * | | | | | | | | | | | | | ResearchLogging do not even show basic data for password fieldsKurt Partridge2012-09-041-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5489bad95f238e2f4d43bdd65bcf2f752d7a63fe
* | | | | | | | | | | | | | | | | am ae6f6e81: am 625cfe3d: Merge "ResearchLog uploadingService now waits for ↵Kurt Partridge2012-09-052-5/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logging to finish" into jb-mr1-dev * commit 'ae6f6e8109da26756d8ea10b45b3ad68698b021b': ResearchLog uploadingService now waits for logging to finish
| * | | | | | | | | | | | | | | | am 625cfe3d: Merge "ResearchLog uploadingService now waits for logging to ↵Kurt Partridge2012-09-052-5/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | finish" into jb-mr1-dev * commit '625cfe3d2119538b508c0d2eb82d1098579e467e': ResearchLog uploadingService now waits for logging to finish
| | * | | | | | | | | | | | | | | Merge "ResearchLog uploadingService now waits for logging to finish" into ↵Kurt Partridge2012-09-052-5/+12
| | |\| | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| | | * | | | | | | | | | | | | ResearchLog uploadingService now waits for logging to finishKurt Partridge2012-09-042-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6188932 Change-Id: I31c0f380b334d9117990f2d92de8d385e4a52c7c
* | | | | | | | | | | | | | | | am cce64733: am 8a599c42: Merge "Utilize StateListDrawable for key preview ↵Tadashi G. Takaoka2012-09-0511-127/+127
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background" into jb-mr1-dev * commit 'cce6473393db513cde393f3606fe6b57e049ea7a': Utilize StateListDrawable for key preview background
| * | | | | | | | | | | | | | | am 8a599c42: Merge "Utilize StateListDrawable for key preview background" ↵Tadashi G. Takaoka2012-09-0511-127/+127
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '8a599c420ead9e653d9a47530e56105ff2f6a247': Utilize StateListDrawable for key preview background
| | * | | | | | | | | | | | | | Merge "Utilize StateListDrawable for key preview background" into jb-mr1-devTadashi G. Takaoka2012-09-0511-127/+127
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Utilize StateListDrawable for key preview backgroundTadashi G. Takaoka2012-09-0511-127/+127
| | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I268550a185701caecefc27ebaec40fb2c940d883
* | | | | | | | | | | | | | | | am 4bdbd254: am cde005c0: Fix apostrophe issueSatoshi Kataoka2012-09-051-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4bdbd254bb9c25630af7549dfc27c1192f6b9e09': Fix apostrophe issue
| * | | | | | | | | | | | | | | am cde005c0: Fix apostrophe issueSatoshi Kataoka2012-09-051-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cde005c05ec6b552ec26740b578be12c7d24013b': Fix apostrophe issue
| | * | | | | | | | | | | | | | Fix apostrophe issueSatoshi Kataoka2012-09-051-0/+5
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7109083 Change-Id: I47275b1bd5fae023981cae502628f5a8284f49ce
* | | | | | | | | | | | | | | am f619ac6b: am 2a2b5edc: Change BinaryDictIOTests\'s package.Yuichiro Hanada2012-09-051-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f619ac6b959569feed126e152af2501918529cd0': Change BinaryDictIOTests's package.
| * | | | | | | | | | | | | | am 2a2b5edc: Change BinaryDictIOTests\'s package.Yuichiro Hanada2012-09-051-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a2b5edc21c9bbea0ee172baf4b90053ceff98b5': Change BinaryDictIOTests's package.
| | * | | | | | | | | | | | | Change BinaryDictIOTests's package.Yuichiro Hanada2012-09-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9df2f7767cd925051c5e1fdcc325cc3359bca20
* | | | | | | | | | | | | | | am 91fd5bb5: am 83dfe0fd: Add FormatOptions.Yuichiro Hanada2012-09-056-28/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91fd5bb568b7aaf8487b3022c5f1f8af846451a1': Add FormatOptions.
| * | | | | | | | | | | | | | am 83dfe0fd: Add FormatOptions.Yuichiro Hanada2012-09-056-28/+69
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '83dfe0fd8c7e2bce2717930dbf8732f5414ee39d': Add FormatOptions.