aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 9fdb4dad: am 3ef0038f: am af7dadad: am aa734f41: am 33592d1b: Merge "Add ↵Satoshi Kataoka2013-10-030-0/+0
|\ | | | | | | | | | | a debug preference for using only personalization dictionary" * commit '9fdb4dad37dbc96ea3ad259bdea27fa66cd07c57':
| * am 3ef0038f: am af7dadad: am aa734f41: am 33592d1b: Merge "Add a debug ↵Satoshi Kataoka2013-10-030-0/+0
| |\ | | | | | | | | | | | | | | | preference for using only personalization dictionary" * commit '3ef0038f4f2731c048342942fdde3f1caa108b68':
| | * am af7dadad: am aa734f41: am 33592d1b: Merge "Add a debug preference for ↵Satoshi Kataoka2013-09-260-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | using only personalization dictionary" * commit 'af7dadadf35db645ddbda96d01414920657f4f85':
| | | * am aa734f41: am 33592d1b: Merge "Add a debug preference for using only ↵Satoshi Kataoka2013-09-260-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | personalization dictionary" * commit 'aa734f41990ae2aab1e2e8e2b2f03a054192bff3':
* | | | | am cb1cb4a0: am 327510b0: am 96aa7f90: am 9cd592c2: am ba2f4f84: Merge "Fix ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a concurrency bug." * commit 'cb1cb4a07905439b0ee528240e48669d65b5d8ee':
| * | | | am 327510b0: am 96aa7f90: am 9cd592c2: am ba2f4f84: Merge "Fix a concurrency ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug." * commit '327510b07161531000685bb8b70daabb10f55171':
| | * | | am 96aa7f90: am 9cd592c2: am ba2f4f84: Merge "Fix a concurrency bug."Jean Chalard2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit '96aa7f903774102a0ac635346b3c83aeef4410ef':
| | | * | am 9cd592c2: am ba2f4f84: Merge "Fix a concurrency bug."Jean Chalard2013-09-260-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | * commit '9cd592c2102a2cf958b3c74b1a0a77866efb1401':
* | | | | | am a9408992: am 60e84c87: am 59f034ef: am f56a8cc8: am 6333ed38: Small cleanupKen Wakasa2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a9408992dfef01c4c805055f5112e8f50251a361':
| * | | | | am 60e84c87: am 59f034ef: am f56a8cc8: am 6333ed38: Small cleanupKen Wakasa2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | * commit '60e84c8772b35dee679e667992fa7179fbb79740':
| | * | | | am 59f034ef: am f56a8cc8: am 6333ed38: Small cleanupKen Wakasa2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | * commit '59f034eff96cc35ae1558abc64c9001b4166efc0':
| | | * | | am f56a8cc8: am 6333ed38: Small cleanupKen Wakasa2013-09-260-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | * commit 'f56a8cc89c6198b622b5e0a304075c0607b4f0c5':
* | | | | | | am a2b34d1b: am 6aad5dd3: am b72eb5a4: am 0a856c2d: am 52876bbe: Remove ↵Ken Wakasa2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary setLayerType() calls * commit 'a2b34d1bd10684e6c3ca853031452676a4c38a2c':
| * | | | | | am 6aad5dd3: am b72eb5a4: am 0a856c2d: am 52876bbe: Remove unnecessary ↵Ken Wakasa2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setLayerType() calls * commit '6aad5dd3e5f3aba27f17991e4dd7a7bd782ce674':
| | * | | | | am b72eb5a4: am 0a856c2d: am 52876bbe: Remove unnecessary setLayerType() callsKen Wakasa2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b72eb5a4606573a828ba285616fff4c5c98e99d6':
| | | * | | | am 0a856c2d: am 52876bbe: Remove unnecessary setLayerType() callsKen Wakasa2013-09-260-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a856c2d2399cde7644433a44b6bf7917a775f0a':
* | | | | | | | am ddb56c64: am eb1d8f35: am fae5b33e: am eba1ad95: am 82018f99: Forgot to ↵Ken Wakasa2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset the matrix of offscreen canvas * commit 'ddb56c6433e86872cca23b4f6d9a29ee6181e6ec':
| * | | | | | | am eb1d8f35: am fae5b33e: am eba1ad95: am 82018f99: Forgot to reset the ↵Ken Wakasa2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix of offscreen canvas * commit 'eb1d8f35e043d9e29e6e1596ac2b29cbc02132a3':
| | * | | | | | am fae5b33e: am eba1ad95: am 82018f99: Forgot to reset the matrix of ↵Ken Wakasa2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offscreen canvas * commit 'fae5b33e24274f9aa46aee62568ebe27f4a59609':
| | | * | | | | am eba1ad95: am 82018f99: Forgot to reset the matrix of offscreen canvasKen Wakasa2013-09-260-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eba1ad955e5274eb5d6bb2ce4861c31688aea187':
* | | | | | | | | am 28eb35ad: am 383c06b8: am 9fe3802d: am 197c6034: am e08c418f: Move motion ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event dispatcher to PointerTracker * commit '28eb35add5b84a195b6bf05792f577bcd25bcedb':
| * | | | | | | | am 383c06b8: am 9fe3802d: am 197c6034: am e08c418f: Move motion event ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatcher to PointerTracker * commit '383c06b8e799148a2c5891fc030db60eef5d06a4':
| | * | | | | | | am 9fe3802d: am 197c6034: am e08c418f: Move motion event dispatcher to ↵Tadashi G. Takaoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PointerTracker * commit '9fe3802d3b3797dd51c9148313449970b38d547c':
| | | * | | | | | am 197c6034: am e08c418f: Move motion event dispatcher to PointerTrackerTadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '197c60342b62dc9d359dea65d02cec2bd1a907fc':
* | | | | | | | | | am 58c323e5: am fa53e283: am 443d26b5: am 31a61ce3: am ed56ea86: Merge ↵Ken Wakasa2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Deallocate offscreen buffer for non-HW-accel draw" * commit '58c323e58f9da12c2fe4c4c2bba6e999c9d625b3':
| * | | | | | | | | am fa53e283: am 443d26b5: am 31a61ce3: am ed56ea86: Merge "Deallocate ↵Ken Wakasa2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offscreen buffer for non-HW-accel draw" * commit 'fa53e2838354fb04bcf9bc1bda6e7c5a05bb93af':
| | * | | | | | | | am 443d26b5: am 31a61ce3: am ed56ea86: Merge "Deallocate offscreen buffer ↵Ken Wakasa2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for non-HW-accel draw" * commit '443d26b5c74dfc4b47bef9276192babc75af76f4':
| | | * | | | | | | am 31a61ce3: am ed56ea86: Merge "Deallocate offscreen buffer for ↵Ken Wakasa2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-HW-accel draw" * commit '31a61ce3876c46f409a54dc6080d262266f6b5dc':
* | | | | | | | | | | am 64486692: am 7f9d4a4e: am b17b0fa2: am f2b54321: am 54dd1bed: Clean up ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResearchLogger log method * commit '64486692e27eb97b7ef8b9ee397963b96660539c':
| * | | | | | | | | | am 7f9d4a4e: am b17b0fa2: am f2b54321: am 54dd1bed: Clean up ResearchLogger ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log method * commit '7f9d4a4eb3eef4b6bdaa020a9846e0d1c0a3e53a':
| | * | | | | | | | | am b17b0fa2: am f2b54321: am 54dd1bed: Clean up ResearchLogger log methodTadashi G. Takaoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b17b0fa2b27575d1ce56ae77824dad9e75a1e154':
| | | * | | | | | | | am f2b54321: am 54dd1bed: Clean up ResearchLogger log methodTadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2b54321078e3ebb9f960bd098c79e5aecb873a7':
* | | | | | | | | | | | am c0eded64: am 92d75dbc: am f43c404d: am a7739acf: am b7f62601: Merge "Move ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-distinct multitouch support to a separate class" * commit 'c0eded64ce85daf5997b958f99709cb27d59d91e':
| * | | | | | | | | | | am 92d75dbc: am f43c404d: am a7739acf: am b7f62601: Merge "Move non-distinct ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multitouch support to a separate class" * commit '92d75dbc9b0df8071da2a2e6beac0e94501b6bfb':
| | * | | | | | | | | | am f43c404d: am a7739acf: am b7f62601: Merge "Move non-distinct multitouch ↵Tadashi G. Takaoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support to a separate class" * commit 'f43c404d18ea25c6b39fe26cbc9c1cd551188697':
| | | * | | | | | | | | am a7739acf: am b7f62601: Merge "Move non-distinct multitouch support to a ↵Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | separate class" * commit 'a7739acfcb81a982c18cc4fe986d238531f3132f':
* | | | | | | | | | | | | am 7fd37382: am e74b8a6a: am 2e55f68a: am 52977770: am 18d64559: Merge ↵Keisuke Kuroynagi2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "DynamicPatriciaTrieReadingUtils for version 3 dictionary." * commit '7fd37382e116b62a03dd85c479f554aee20b5b63':
| * | | | | | | | | | | | am e74b8a6a: am 2e55f68a: am 52977770: am 18d64559: Merge ↵Keisuke Kuroynagi2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "DynamicPatriciaTrieReadingUtils for version 3 dictionary." * commit 'e74b8a6a233332187c4b11daf862776748c16f73':
| | * | | | | | | | | | | am 2e55f68a: am 52977770: am 18d64559: Merge ↵Keisuke Kuroynagi2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "DynamicPatriciaTrieReadingUtils for version 3 dictionary." * commit '2e55f68a915d64421b717a2c906bd43e09fa9411':
| | | * | | | | | | | | | am 52977770: am 18d64559: Merge "DynamicPatriciaTrieReadingUtils for version ↵Keisuke Kuroynagi2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3 dictionary." * commit '52977770f55cc58b3ae09a9e2cf2ac9d62b00fb9':
* | | | | | | | | | | | | | am d2eaa9c0: am 113b523b: am 8df2f504: am 15072b4e: am 80c9b829: Merge "Give ↵Keisuke Kuroynagi2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PatriciaTrieReadingUtils methods for reading nodes." * commit 'd2eaa9c03614641fdb63feefcda6770519ccfe56':
| * | | | | | | | | | | | | am 113b523b: am 8df2f504: am 15072b4e: am 80c9b829: Merge "Give ↵Keisuke Kuroynagi2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PatriciaTrieReadingUtils methods for reading nodes." * commit '113b523b916b41a5917b520764c42bc4e5679bc3':
| | * | | | | | | | | | | | am 8df2f504: am 15072b4e: am 80c9b829: Merge "Give PatriciaTrieReadingUtils ↵Keisuke Kuroynagi2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods for reading nodes." * commit '8df2f50431e0d8873119b36ca61909451a202c71':
| | | * | | | | | | | | | | am 15072b4e: am 80c9b829: Merge "Give PatriciaTrieReadingUtils methods for ↵Keisuke Kuroynagi2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading nodes." * commit '15072b4e5c52376d4c5b1a18838b290fbe4c3456':
* | | | | | | | | | | | | | | am 610555c1: am e8109b48: am 9f64b890: am 40f8a487: am a299421f: Merge ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Remove getTimer() reference except from PointerTracker" * commit '610555c18d97e054b964b6e320b86f556d5de8eb':
| * | | | | | | | | | | | | | am e8109b48: am 9f64b890: am 40f8a487: am a299421f: Merge "Remove getTimer() ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference except from PointerTracker" * commit 'e8109b48dbddcd5161b227cf816a0c8a149d3095':
| | * | | | | | | | | | | | | am 9f64b890: am 40f8a487: am a299421f: Merge "Remove getTimer() reference ↵Tadashi G. Takaoka2013-09-260-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | except from PointerTracker" * commit '9f64b8903ac8cb453b4078b7a36a1264ba8e540f':
| | | * | | | | | | | | | | | am 40f8a487: am a299421f: Merge "Remove getTimer() reference except from ↵Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PointerTracker" * commit '40f8a487e0c1eab1ec5b8396812db5d5f952cc9e':
* | | | | | | | | | | | | | | | am 407e147f: am 04bccb46: am 7a7e3775: am 3f30c09d: am 503b7902: Merge ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Connect the personalization dictionary" * commit '407e147f67e0bc75510364451ee4a073302f85e9':
| * | | | | | | | | | | | | | | am 04bccb46: am 7a7e3775: am 3f30c09d: am 503b7902: Merge "Connect the ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | personalization dictionary" * commit '04bccb46dadc5ae7533ba295943b18d55f847021':