0532b398ad
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I8e30c075ddfaf3712aacd89a2a90c30ea245193a
2013-06-03 14:04:13 -07:00
2d2519d9e2
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-06-02 05:55:51 -07:00
6f7e39a682
am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
...
* commit 'e7514a6a8a9e59ea5cde9f2c3a198f35d111cdc2':
Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:47:01 -07:00
ea11a8ef4f
am dee9d17c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dee9d17c6855b9d34a9cd0e7946c5890a83a583b':
Import translations. DO NOT MERGE
2013-05-30 23:47:01 -07:00
e7514a6a8a
Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
2013-05-31 06:45:07 +00:00
d76cbb0e37
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-30 05:56:10 -07:00
dee9d17c68
Import translations. DO NOT MERGE
...
Change-Id: Iccfbe700901fe89974beab377bea82d547a1478a
Auto-generated-cl: translation import
2013-05-27 15:08:39 -07:00
02088f4497
Add vibration override values for Galaxy S4 and HTC One
...
Bug: 9109493
2013-05-23 17:03:42 -07:00
150da22528
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ia5c29124c5251cfba762c1a19190fe3c02d8bf42
2013-05-21 08:59:25 -07:00
bbc5321c84
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-21 07:47:03 -07:00
e2bee5b134
am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
...
* commit 'ede3db51f0fb16559c27aa29a7cf07784bb9431c':
Fix a crash on a secondary user
2013-05-20 21:29:50 -07:00
ede3db51f0
Merge "Fix a crash on a secondary user" into jb-mr2-dev
2013-05-21 04:27:34 +00:00
13d7d5684e
am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '23bff513a97a71eacc6eadf694ce6f5a1e07967c':
Import translations. DO NOT MERGE
2013-05-20 21:19:11 -07:00
23bff513a9
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-21 04:17:27 +00:00
167ba3459b
am 89fe1f50: Add a method to work around apps broken by recorrection
...
* commit '89fe1f50881180730e451cbe6ec4d1f8dc67acf1':
Add a method to work around apps broken by recorrection
2013-05-20 21:08:41 -07:00
10e8b93977
Fix a crash on a secondary user
...
Bug: 9054063
Change-Id: I092ab6e0077578d0aca57d2e41dfbc00b46e1ba4
2013-05-21 12:27:16 +09:00
5906b05bb5
am 7058b02a: Extract a new class for app-specific workarounds.
...
* commit '7058b02a9c798c21b169b778be2befc7739f4e9b':
Extract a new class for app-specific workarounds.
2013-05-20 19:49:25 -07:00
89fe1f5088
Add a method to work around apps broken by recorrection
...
Bug: 8944307
Change-Id: I8986622554f30aaf4f595099c4ab5652b75c972c
2013-05-21 07:53:31 +09:00
7058b02a9c
Extract a new class for app-specific workarounds.
...
Bug: 8944307
Change-Id: Iaff9dd03d3d856a6bdaa2b16c4e71e95cd2b6349
2013-05-21 07:53:28 +09:00
6ac1a79f02
Import translations. DO NOT MERGE
...
Change-Id: I40c83f490ebab993d07fd92b78a6901f3ddbc2b2
Auto-generated-cl: translation import
2013-05-20 15:15:36 -07:00
7f78bd5e25
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ie6c9c358c616c5271893b6ceb2cf2d50fa209c38
2013-05-17 12:54:52 -07:00
5fb6a99bd6
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-16 05:55:49 -07:00
b528e25113
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I823f0c7f5fd55d748e7651188eb7ff1edace6dfe
2013-05-16 05:44:12 -07:00
d40b4729a5
am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
...
* commit 'b1e37e4a478a577c59930767148e50f8f45af21f':
am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
2013-05-15 12:59:27 -07:00
ff0bd7dbfa
am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
...
* commit '25f0c8089eecfcded7f41c66453bd874ba92219a':
am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
2013-05-15 12:59:26 -07:00
d6a7a26d63
am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"
...
* commit 'd59c1f8324d568fa05a0ba660c602357b8f68958':
am 50259c70: Merge "Tune layout parameters of setup wizard"
2013-05-15 12:59:25 -07:00
e7ef9669d6
am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset)
...
* commit '7d9bd6f54e5ebed4b4a1657c44e5731a2d182560':
am 66b87269: Update welcome fallback image (using xhdpi asset)
2013-05-15 12:59:23 -07:00
883905f45b
am 7fe67544: am 769427cf: Adjust aspect ratio of setup image
...
* commit '7fe675440e5ecc3da872803dae60bec8bd66c9e5':
am 769427cf: Adjust aspect ratio of setup image
2013-05-15 12:59:22 -07:00
b6161b40bc
am 66c5f8cb: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '66c5f8cbe8cea83dcedc952a07250d855e9f8c7e':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-05-15 12:59:20 -07:00
39afaf3dc3
am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
...
* commit '6d0f0347013fbd59d967b438c9f2754141d35f85':
Remove FeedbackLog instance variables.
2013-05-15 12:59:19 -07:00
46bf9f493c
am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"
...
* commit '4e3a8afd173b23f8f73fd18d0b23a3cc8f3226b4':
Revise welcome screen video and still image
2013-05-15 12:59:17 -07:00
acb37023b2
am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit."
...
* commit '23bfac83c25f7635d539cdb85d923a03c44c0a8d':
Adjust sampling interval for gesture stroke drawing a bit.
2013-05-15 12:59:11 -07:00
5ee11c5d9a
am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
...
* commit '2e0fc8bf33411de82c8110878878ec1d6c392fe3':
Revert "Fix isSuggestionsStripVisible when keyboard hidden"
2013-05-15 12:59:09 -07:00
8e7b173936
am 3fff5179: am 41016aca: Back to previous keyboard layout by canceling sliding input
...
* commit '3fff5179d5020123c5bae7a1c83591afd45ace58':
Back to previous keyboard layout by canceling sliding input
2013-05-15 12:59:08 -07:00
03f2ca6d50
am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
...
* commit 'f46eafe2555a8d405ce7171bc4a2977a9aecf2b9':
Fix PointerTrackerQueue.releaseAllPointerOlderThan
2013-05-15 12:59:06 -07:00
95586abc11
am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
...
* commit 'dccad3efa4af41282857df5140e8ca6dc9ad99be':
Fix isSuggestionsStripVisible when keyboard hidden
2013-05-15 12:59:05 -07:00
8587e879b7
am 5ec5e0b6: am e69066d1: (-s ours) Import translations. DO NOT MERGE
...
* commit '5ec5e0b6f82987e8545629c38a7d595e02eb2887':
Import translations. DO NOT MERGE
2013-05-15 12:59:04 -07:00
fd2c2e6270
am 298d8232: (-s ours) Import translations. DO NOT MERGE
...
* commit '298d823297820418d0602e41f0eee7a57e6a659b':
Import translations. DO NOT MERGE
2013-05-15 12:59:04 -07:00
2d86b73ffe
am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds
...
* commit '035c68a19a4966fe1a0f5c4d1cc7990e41455f79':
Tune maximum keypress duration to 100 milliseconds
2013-05-15 12:53:14 -07:00
7e52c35dce
am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"
...
* commit '94c54eca391b82cd174a5e80c19078ff62556b66':
Fix keypress vibration duration of HTC One X
2013-05-15 12:53:13 -07:00
f197335027
am a70da988: am 5f857a35: Merge "Disable functional key while in sliding input mode"
...
* commit 'a70da988d78ffd20941dfaa34f7a6324e465808e':
Disable functional key while in sliding input mode
2013-05-15 12:53:11 -07:00
c731457f8a
am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
...
* commit 'f6b5484dcb2d69fe6a21a62fda31ff523936b492':
Add device specific keypress vibration duration database
2013-05-15 12:53:10 -07:00
73673b4c41
am f1708394: am 0efd8d1b: Fix landscape override value expression
...
* commit 'f17083941daefe146358dc39a3e8d0ca660c530d':
Fix landscape override value expression
2013-05-15 12:53:09 -07:00
7a876b3114
am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding input mode"
...
* commit '813ba9f5262c59ba99efdcf838036ae3b7e2dd0c':
Disable long press timer while sliding input mode
2013-05-15 12:53:07 -07:00
94ad2ef762
am 094447bd: am ad662ade: Disable delete key repeating while in slide input mode
...
* commit '094447bd4652f9ed038f0489ef4e4f5af1679143':
Disable delete key repeating while in slide input mode
2013-05-15 12:53:06 -07:00
66e5e05fbf
am 6780e43d: am 18184eac: Support regular expression for condition pattern
...
* commit '6780e43d761b0cbe0ce54cfc017ac779509e1c61':
Support regular expression for condition pattern
2013-05-15 12:53:04 -07:00
aaf7d70be7
am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"
...
* commit '6f6478422f8881e7692c99e3a3925266980099d0':
Support multiple condition for getDeviceOverrideValue
2013-05-15 12:53:03 -07:00
8738eeaf65
am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
...
* commit '01c133d72e5cbba33148ec478a3f1ab0c0c3ad5f':
Rename GesturePreviewTrail.java -> GestureTrail.java
2013-05-15 12:53:02 -07:00
7bc99237b3
am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error
...
* commit '03a32146458f3cd192fde2ff0e85e3a0271a7d2a':
Avoid JsonWriter multi-write error
2013-05-15 12:53:00 -07:00
1e0f8cffaf
am 697f6abb: am 260df841: Merge "Remove unused code"
...
* commit '697f6abb5d6478e0e0493ee7f821522fa4411f18':
Remove unused code
2013-05-15 12:52:59 -07:00
The Android Open Source Project
The Android Automerger
Tadashi G. Takaoka
Baligh Uddin
Jean Chalard
Satoshi Kataoka
The Android Automerger
Kurt Partridge
Ken Wakasa