aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge "Clean up public helper methods of SettingsValues"Tadashi G. Takaoka2013-01-099-211/+205
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Clean up public helper methods of SettingsValuesTadashi G. Takaoka2013-01-099-211/+205
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c6087580b67f497eaaf16900f8df7a4a895b8e3
* | | | | | | | | am 7132840b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-01-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7132840b7173daae9c0ff307277c3f5bacbe8f4f': Import translations. DO NOT MERGE
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-01-095-7/+5
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7513684783ad97339184b8db61ddd062cbd7a1c5 Auto-generated-cl: translation import
* | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-01-095-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35be6cca9818f1ea08f3a23c76d19bfb945028b7 Auto-generated-cl: translation import
* | | | | | | | am 125ad223: Merge "Abandon the idea of an Event pool and make Event ↵Jean Chalard2013-01-093-26/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | immutable (B1)" * commit '125ad2237072745e4800b7a3907d5507024f35e5': Abandon the idea of an Event pool and make Event immutable (B1)
| * | | | | | | Merge "Abandon the idea of an Event pool and make Event immutable (B1)"Jean Chalard2013-01-093-26/+17
| |\ \ \ \ \ \ \
| | * | | | | | | Abandon the idea of an Event pool and make Event immutable (B1)Jean Chalard2013-01-093-26/+17
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I750a07c0c564a95ceac734afa873ca3da9626a7f
* | | | | | | | am e4d07ac7: Merge "add a define"Satoshi Kataoka2013-01-091-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4d07ac75aabb3efe0dc7f7a4c602baf5d2ad668': add a define
| * | | | | | | Merge "add a define"Satoshi Kataoka2013-01-091-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | add a defineSatoshi Kataoka2013-01-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8139d0639d07afd200ba4507768bf76d0054687b
* | | | | | | | | am b112a135: Merge "Fix a race condition with backspaces"Jean Chalard2013-01-092-0/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b112a13518fd7479da4113d8e4f4f327ad8b9bbb': Fix a race condition with backspaces
| * | | | | | | | Merge "Fix a race condition with backspaces"Jean Chalard2013-01-092-0/+26
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix a race condition with backspacesJean Chalard2013-01-092-0/+26
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add a test to make sure it stays not-broken. Bug: 7946604 Change-Id: I996da3d5507d591ec25a13fb57434f39843f1df5
* | | | | | | | | am e56686f4: Merge "Cancel update batch input timer whenever MotionEvent is ↵Tadashi G. Takaoka2013-01-093-0/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | received" * commit 'e56686f43af81db965941a393c5e0231c26ec77b': Cancel update batch input timer whenever MotionEvent is received
| * | | | | | | | Merge "Cancel update batch input timer whenever MotionEvent is received"Tadashi G. Takaoka2013-01-093-0/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Cancel update batch input timer whenever MotionEvent is receivedTadashi G. Takaoka2013-01-093-0/+24
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7911739 Change-Id: Id2cd98385371fd98435943ed66ec5381dfaa48e0
* | | | | | | | | am 28772899: Merge "Don\'t cancel gesture typing while more keys keyboard is ↵Tadashi G. Takaoka2013-01-091-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shown" * commit '28772899d2fd0f452d1beca79c03123eaee53c0f': Don't cancel gesture typing while more keys keyboard is shown
| * | | | | | | | Merge "Don't cancel gesture typing while more keys keyboard is shown"Tadashi G. Takaoka2013-01-091-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don't cancel gesture typing while more keys keyboard is shownTadashi G. Takaoka2013-01-091-0/+5
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7964225 Change-Id: I4c572527b6f399282bdd963e38c147c7e69815ac
* | | | | | | | | am 8f5f79d7: Merge "Replace assert() with ASSERT() & use -funwind-tables for ↵Ken Wakasa2013-01-087-22/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debug builds" * commit '8f5f79d7ea824752dcaa4e035e71291e7dd7ddaf': Replace assert() with ASSERT() & use -funwind-tables for debug builds
| * | | | | | | | Merge "Replace assert() with ASSERT() & use -funwind-tables for debug builds"Ken Wakasa2013-01-087-22/+21
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Replace assert() with ASSERT() & use -funwind-tables for debug buildsKen Wakasa2013-01-097-22/+21
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ec14eb24ebc45657119a45aba09517e71a22974
* | | | | | | | am dd4d938e: assert when the touch event goes back to the futureSatoshi Kataoka2013-01-082-0/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd4d938e6990701176c658af5c593ea377973bef': assert when the touch event goes back to the future
| * | | | | | | assert when the touch event goes back to the futureSatoshi Kataoka2013-01-092-0/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 7911739 Change-Id: I29db6a5cb6749999666b1c53857ea61bcc19b8f1
* | | | | | | am 8315e816: Merge "Clean up debug related preference keys"Tadashi G. Takaoka2013-01-082-10/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8315e8168b135599237f5493f72e667f39503006': Clean up debug related preference keys
| * | | | | | Merge "Clean up debug related preference keys"Tadashi G. Takaoka2013-01-082-10/+10
| |\ \ \ \ \ \
| | * | | | | | Clean up debug related preference keysTadashi G. Takaoka2013-01-082-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib7129692c673b3bce253120ee709e0253aeafa52
* | | | | | | | am 4fdffc16: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-01-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4fdffc16d235ad24db8c3a2134aa50fec73478f0': Import translations. DO NOT MERGE
| * | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-01-0846-92/+46
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-01-0746-92/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b9113b6328fa461d8184ff3d2bc03379d1c7e3a Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-01-0846-92/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-01-0746-92/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28702033361341341f341afdd6db881004234b20 Auto-generated-cl: translation import
* | | | | | | | | | am e9c64558: [Rlog48] Better logging of MotionEventsKurt Partridge2013-01-083-6/+59
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9c6455881060c9f43a15a499582118b2ac2fa65': [Rlog48] Better logging of MotionEvents
| * | | | | | | | | [Rlog48] Better logging of MotionEventsKurt Partridge2013-01-083-6/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Now includes all historical data stored in a motionEvent - Simpler API, refactored to move extraction code to JsonUtils Change-Id: I52d9756ddbeaa14d1704787da59bf1aad18f0335
* | | | | | | | | | am 9bad176e: Merge "[Rlog32] ResearchLogger segment motion data around ↵Kurt Partridge2013-01-083-19/+82
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gestures correctly" * commit '9bad176ebe4f6520db188b5498efbbf7e5fc2c4f': [Rlog32] ResearchLogger segment motion data around gestures correctly
| * | | | | | | | | Merge "[Rlog32] ResearchLogger segment motion data around gestures correctly"Kurt Partridge2013-01-083-19/+82
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [Rlog32] ResearchLogger segment motion data around gestures correctlyKurt Partridge2013-01-073-19/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-project commit with I684ba5fed8c653777942e6b0366113ca40dfa37c Change-Id: Id3804e6cfa97b4cdde212b8eebc413f76fa4772c
* | | | | | | | | | | am b7fb16e8: Merge "[Rlog27] Refactor LogBuffer"Kurt Partridge2013-01-085-86/+160
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b7fb16e8ccbdd867221109e48a3a5b804f87b80d': [Rlog27] Refactor LogBuffer
| * | | | | | | | | | Merge "[Rlog27] Refactor LogBuffer"Kurt Partridge2013-01-085-86/+160
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [Rlog27] Refactor LogBufferKurt Partridge2013-01-035-88/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup and prepare for replaying Change-Id: Ie09e912c6e9c0d7375168c575ccf1cfd9375dd31
* | | | | | | | | | | | am 398b79ee: Merge "Yet another small cleanups"Ken Wakasa2013-01-087-31/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '398b79eea1945ebc9632490afd29ecff551bf929': Yet another small cleanups
| * | | | | | | | | | | Merge "Yet another small cleanups"Ken Wakasa2013-01-087-31/+23
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Yet another small cleanupsKen Wakasa2013-01-087-31/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie940c4d4d9d85c95e2f04ba23f00a54ba3dc53bf
* | | | | | | | | | | | am 0015ce8f: Merge "Make Settings class singleton to manage SettingsValues"Tadashi G. Takaoka2013-01-083-97/+146
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0015ce8feafba31d441c49268f0d333604c0b945': Make Settings class singleton to manage SettingsValues
| * | | | | | | | | | | Merge "Make Settings class singleton to manage SettingsValues"Tadashi G. Takaoka2013-01-083-97/+146
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Make Settings class singleton to manage SettingsValuesTadashi G. Takaoka2013-01-083-97/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id30828a141de86d9bcf8bce586d2adb468cc59e1
* | | | | | | | | | | | am a10b1a88: Misc small cleanupsKen Wakasa2013-01-0813-61/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a10b1a88443a16bb1b5af1af63d0ed501b25f55d': Misc small cleanups
| * | | | | | | | | | | Misc small cleanupsKen Wakasa2013-01-0813-61/+44
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea61e6c76a9a0437a1b2e8143f6ab5b09a8e211e
* | | | | | | | | | | am 8873b5ae: Merge "Rename Settings to SettingsFragment"Tadashi G. Takaoka2013-01-073-359/+378
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8873b5ae31a5541913af40af6862542055e39ef8': Rename Settings to SettingsFragment