aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Fix drawing debug points of gesture trails"Tadashi G. Takaoka2013-05-222-26/+61
|\ \ \ \ \
| * | | | | Fix drawing debug points of gesture trailsTadashi G. Takaoka2013-05-212-26/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7167303 Change-Id: I9a75b1b9b9127c5364da49b2a04b22c16a7ad535
* | | | | | Merge "Fix running on device regression test and profile."Keisuke Kuroyanagi2013-05-221-0/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix running on device regression test and profile.Keisuke Kuroyanagi2013-05-201-0/+2
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Ie16d9514092d6d6f42881b975420e5d1431b776c
* | | | | Merge "Clean up IntentCompatUtils a bit"Tadashi G. Takaoka2013-05-212-6/+5
|\ \ \ \ \
| * | | | | Clean up IntentCompatUtils a bitTadashi G. Takaoka2013-05-212-6/+5
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I803aa6c2160bfa1ffe992b28e7eb6e8a320c9762
* | | | | Merge "Modify isAllowedToLog"Kurt Partridge2013-05-213-6/+71
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Modify isAllowedToLogKurt Partridge2013-05-213-6/+71
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently isAllowedToLog only checks the state of the ResearchLogger, and does not consider which log the data is going to. This causes problems with the logs for Feedback. The Feedback log should inhibit normal logging procedures, but the system needs to be able to write specific data directly to it. This change renames to isAllowedToLogTo and adds the destination ResearchLog as a parameter. A FeedbackLog is also added as a new class so it can be distinguished from other ResearchLogs. Change-Id: I5a1eea05bb040c26bf816b89179f44b3024fa2ad
* | | | am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into ↵Jean Chalard2013-05-202-2/+16
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'e2bee5b134aaefc69a680be8ea65e2d7640b3ead': Fix a crash on a secondary user
| * | | am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-devJean Chalard2013-05-202-2/+16
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'ede3db51f0fb16559c27aa29a7cf07784bb9431c': Fix a crash on a secondary user
| | * | Merge "Fix a crash on a secondary user" into jb-mr2-devJean Chalard2013-05-212-2/+16
| | |\ \
| | | * | Fix a crash on a secondary userSatoshi Kataoka2013-05-212-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9054063 Change-Id: I092ab6e0077578d0aca57d2e41dfbc00b46e1ba4
| * | | | am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-202-1/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '23bff513a97a71eacc6eadf694ce6f5a1e07967c': Import translations. DO NOT MERGE
| | * | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-212-1/+28
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2013-05-202-1/+28
| | | |/ / | | | | | | | | | | | | | | | | | | | | Change-Id: I40c83f490ebab993d07fd92b78a6901f3ddbc2b2 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-05-212-1/+28
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-202-1/+28
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Change-Id: I1075741837c63b5bb93cf2b39aa707cf5afeb9e7 Auto-generated-cl: translation import
* | | | | am 167ba345: am 89fe1f50: Add a method to work around apps broken by ↵Jean Chalard2013-05-203-0/+40
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | recorrection * commit '167ba3459b0ce02b9add12ade9388bd2b1e6eb62': Add a method to work around apps broken by recorrection
| * | | | am 89fe1f50: Add a method to work around apps broken by recorrectionJean Chalard2013-05-203-0/+40
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '89fe1f50881180730e451cbe6ec4d1f8dc67acf1': Add a method to work around apps broken by recorrection
| | * | | Add a method to work around apps broken by recorrectionJean Chalard2013-05-213-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8944307 Change-Id: I8986622554f30aaf4f595099c4ab5652b75c972c
* | | | | Merge "Remove unnecessary @UsedForTesting annotation"Tadashi G. Takaoka2013-05-211-5/+0
|\ \ \ \ \
| * | | | | Remove unnecessary @UsedForTesting annotationTadashi G. Takaoka2013-05-211-5/+0
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I843fd6bc20da95e61d1a05b5b34d6e4c9db59dab
* | | | | am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds.Jean Chalard2013-05-204-40/+88
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '5906b05bb50c0a67bd4f03fcfae41db3daefe0bc': Extract a new class for app-specific workarounds.
| * | | am 7058b02a: Extract a new class for app-specific workarounds.Jean Chalard2013-05-204-40/+88
| |\| | | | | | | | | | | | | | | | | | * commit '7058b02a9c798c21b169b778be2befc7739f4e9b': Extract a new class for app-specific workarounds.
| | * | Extract a new class for app-specific workarounds.Jean Chalard2013-05-214-40/+88
| | |/ | | | | | | | | | | | | Bug: 8944307 Change-Id: Iaff9dd03d3d856a6bdaa2b16c4e71e95cd2b6349
| * | am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when ↵Jean Chalard2013-05-151-3/+13
| |\| | | | | | | | | | | | | | | | | | | not shown" * commit 'b1e37e4a478a577c59930767148e50f8f45af21f': am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
| | * am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"Jean Chalard2013-05-151-3/+13
| | | | | | | | | | | | | | | * commit 'f1dcf725061b3e61e40540566a5385cf4934f424': Don't process recorrection or resets when not shown
| * | am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in ↵Tadashi G. Takaoka2013-05-151-4/+16
| |\| | | | | | | | | | | | | | | | | | | orientation change" * commit '25f0c8089eecfcded7f41c66453bd874ba92219a': am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
| | * am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"Tadashi G. Takaoka2013-05-151-4/+16
| | | | | | | | | | | | | | | * commit '96a9f357c7e2a059687926cd7cd52ac5d06bc65e': Fix unintentional setup step advance in orientation change
| * | am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"Tadashi G. Takaoka2013-05-1511-41/+57
| |\| | | | | | | | | | | | | * commit 'd59c1f8324d568fa05a0ba660c602357b8f68958': am 50259c70: Merge "Tune layout parameters of setup wizard"
| | * am 50259c70: Merge "Tune layout parameters of setup wizard"Tadashi G. Takaoka2013-05-1511-41/+57
| | | | | | | | | | | | | | | * commit '50259c70d7754569a7b552cfc6ef8a034b5b0d40': Tune layout parameters of setup wizard
| * | am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset)Tadashi G. Takaoka2013-05-151-0/+0
| |\| | | | | | | | | | | | | * commit '7d9bd6f54e5ebed4b4a1657c44e5731a2d182560': am 66b87269: Update welcome fallback image (using xhdpi asset)
| | * am 66b87269: Update welcome fallback image (using xhdpi asset)Tadashi G. Takaoka2013-05-151-0/+0
| | | | | | | | | | | | | | | * commit '66b87269e16a0ed4b13a58bca5dd3a41318ad241': Update welcome fallback image (using xhdpi asset)
| * | am 7fe67544: am 769427cf: Adjust aspect ratio of setup imageTadashi G. Takaoka2013-05-152-19/+28
| |\| | | | | | | | | | | | | * commit '7fe675440e5ecc3da872803dae60bec8bd66c9e5': am 769427cf: Adjust aspect ratio of setup image
| | * am 769427cf: Adjust aspect ratio of setup imageTadashi G. Takaoka2013-05-152-19/+28
| | | | | | | | | | | | | | | * commit '769427cff24944958f5f1f6179090a86444f3eab': Adjust aspect ratio of setup image
| * | am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."Kurt Partridge2013-05-151-42/+7
| |\| | | | | | | | | | | | | * commit '6d0f0347013fbd59d967b438c9f2754141d35f85': Remove FeedbackLog instance variables.
| * | am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"Tadashi G. Takaoka2013-05-1515-40/+54
| |\ \ | | | | | | | | | | | | | | | | * commit '4e3a8afd173b23f8f73fd18d0b23a3cc8f3226b4': Revise welcome screen video and still image
| * \ \ am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke ↵Ken Wakasa2013-05-151-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawing a bit." * commit '23bfac83c25f7635d539cdb85d923a03c44c0a8d': Adjust sampling interval for gesture stroke drawing a bit.
| * \ \ \ am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when ↵Ken Wakasa2013-05-151-14/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard hidden"" * commit '2e0fc8bf33411de82c8110878878ec1d6c392fe3': Revert "Fix isSuggestionsStripVisible when keyboard hidden"
| * \ \ \ \ am 3fff5179: am 41016aca: Back to previous keyboard layout by canceling ↵Tadashi G. Takaoka2013-05-156-46/+61
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sliding input * commit '3fff5179d5020123c5bae7a1c83591afd45ace58': Back to previous keyboard layout by canceling sliding input
| * \ \ \ \ \ am f46eafe2: am c9398a3b: Merge "Fix ↵Tadashi G. Takaoka2013-05-151-24/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PointerTrackerQueue.releaseAllPointerOlderThan" * commit 'f46eafe2555a8d405ce7171bc4a2977a9aecf2b9': Fix PointerTrackerQueue.releaseAllPointerOlderThan
| * \ \ \ \ \ \ am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hiddenJean Chalard2013-05-151-5/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dccad3efa4af41282857df5140e8ca6dc9ad99be': Fix isSuggestionsStripVisible when keyboard hidden
| * \ \ \ \ \ \ \ am 035c68a1: am b121538e: Tune maximum keypress duration to 100 millisecondsTadashi G. Takaoka2013-05-152-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '035c68a19a4966fe1a0f5c4d1cc7990e41455f79': Tune maximum keypress duration to 100 milliseconds
| * \ \ \ \ \ \ \ \ am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"Tadashi G. Takaoka2013-05-151-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94c54eca391b82cd174a5e80c19078ff62556b66': Fix keypress vibration duration of HTC One X
| * \ \ \ \ \ \ \ \ \ am a70da988: am 5f857a35: Merge "Disable functional key while in sliding ↵Tadashi G. Takaoka2013-05-151-4/+7
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input mode" * commit 'a70da988d78ffd20941dfaa34f7a6324e465808e': Disable functional key while in sliding input mode
| * \ \ \ \ \ \ \ \ \ \ am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration ↵Tadashi G. Takaoka2013-05-152-15/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database * commit 'f6b5484dcb2d69fe6a21a62fda31ff523936b492': Add device specific keypress vibration duration database
| * \ \ \ \ \ \ \ \ \ \ \ am f1708394: am 0efd8d1b: Fix landscape override value expressionTadashi G. Takaoka2013-05-151-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f17083941daefe146358dc39a3e8d0ca660c530d': Fix landscape override value expression
| * \ \ \ \ \ \ \ \ \ \ \ \ am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding ↵Tadashi G. Takaoka2013-05-153-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input mode" * commit '813ba9f5262c59ba99efdcf838036ae3b7e2dd0c': Disable long press timer while sliding input mode
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 094447bd: am ad662ade: Disable delete key repeating while in slide input modeTadashi G. Takaoka2013-05-151-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '094447bd4652f9ed038f0489ef4e4f5af1679143': Disable delete key repeating while in slide input mode
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6780e43d: am 18184eac: Support regular expression for condition patternTadashi G. Takaoka2013-05-151-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6780e43d761b0cbe0ce54cfc017ac779509e1c61': Support regular expression for condition pattern