The Android Open Source Project
150da22528
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ia5c29124c5251cfba762c1a19190fe3c02d8bf42
2013-05-21 08:59:25 -07:00
The Android Automerger
bbc5321c84
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-21 07:47:03 -07:00
Jean Chalard
d96f63d2ed
am e2bee5b1
: am ede3db51
: Merge "Fix a crash on a secondary user" into jb-mr2-dev
...
* commit 'e2bee5b134aaefc69a680be8ea65e2d7640b3ead':
Fix a crash on a secondary user
2013-05-20 21:32:21 -07:00
Jean Chalard
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
Jean Chalard
ede3db51f0
Merge "Fix a crash on a secondary user" into jb-mr2-dev
2013-05-21 04:27:34 +00:00
Baligh Uddin
88fcf65f43
am 13d7d568
: (-s ours) am 23bff513
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '13d7d5684ee855b2e87160dee8a8754d58f5ee72':
Import translations. DO NOT MERGE
2013-05-20 21:21:40 -07:00
Baligh Uddin
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
Baligh Uddin
7f008a62d3
Merge "Import translations. DO NOT MERGE"
2013-05-21 04:18:40 +00:00
Baligh Uddin
23bff513a9
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-21 04:17:27 +00:00
Jean Chalard
05ea7c5d02
am 167ba345
: am 89fe1f50
: Add a method to work around apps broken by recorrection
...
* commit '167ba3459b0ce02b9add12ade9388bd2b1e6eb62':
Add a method to work around apps broken by recorrection
2013-05-20 21:10:07 -07:00
Jean Chalard
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
Satoshi Kataoka
10e8b93977
Fix a crash on a secondary user
...
Bug: 9054063
Change-Id: I092ab6e0077578d0aca57d2e41dfbc00b46e1ba4
2013-05-21 12:27:16 +09:00
Keisuke Kuroyanagi
adf82a97a9
Fix running on device regression test and profile.
...
Change-Id: Ie16d9514092d6d6f42881b975420e5d1431b776c
2013-05-20 20:14:13 -07:00
Tadashi G. Takaoka
a66396369b
Merge "Remove unnecessary @UsedForTesting annotation"
2013-05-21 03:07:59 +00:00
Jean Chalard
0013f97ddd
am 5906b05b
: am 7058b02a
: Extract a new class for app-specific workarounds.
...
* commit '5906b05bb50c0a67bd4f03fcfae41db3daefe0bc':
Extract a new class for app-specific workarounds.
2013-05-20 19:50:46 -07:00
Jean Chalard
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
Tadashi G. Takaoka
2532f72b94
Remove unnecessary @UsedForTesting annotation
...
Change-Id: I843fd6bc20da95e61d1a05b5b34d6e4c9db59dab
2013-05-21 10:45:59 +09:00
Jean Chalard
89fe1f5088
Add a method to work around apps broken by recorrection
...
Bug: 8944307
Change-Id: I8986622554f30aaf4f595099c4ab5652b75c972c
2013-05-21 07:53:31 +09:00
Jean Chalard
7058b02a9c
Extract a new class for app-specific workarounds.
...
Bug: 8944307
Change-Id: Iaff9dd03d3d856a6bdaa2b16c4e71e95cd2b6349
2013-05-21 07:53:28 +09:00
Baligh Uddin
5914b8d4b6
Import translations. DO NOT MERGE
...
Change-Id: I1075741837c63b5bb93cf2b39aa707cf5afeb9e7
Auto-generated-cl: translation import
2013-05-20 15:29:34 -07:00
Baligh Uddin
6ac1a79f02
Import translations. DO NOT MERGE
...
Change-Id: I40c83f490ebab993d07fd92b78a6901f3ddbc2b2
Auto-generated-cl: translation import
2013-05-20 15:15:36 -07:00
The Android Open Source Project
eb724ddbe9
am 7f78bd5e
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '7f78bd5e2517b6a2f6eceb5f1703e51aca236dc0':
2013-05-17 12:59:40 -07:00
The Android Open Source Project
7f78bd5e25
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ie6c9c358c616c5271893b6ceb2cf2d50fa209c38
2013-05-17 12:54:52 -07:00
Kurt Partridge
de4e579c68
Merge "Fix punctuation logging"
2013-05-17 17:45:21 +00:00
Kurt Partridge
500dea6ad4
Fix punctuation logging
...
Punctuation is currently put into the same LogUnit as the
following word. This is counter-intuitive and makes
post-processing more complicated.
This change causes punctuation to be put into its own
LogUnit.
A tricky case is the phantom space. A phantom space is
inserted right before other text, whose MotionEvents have
already been collected and inserted into mCurrentLogBuffer.
Phantom spaces are handled by creating their own LogUnit and
inserting it into the LogBuffer right before
mCurrentLogBuffer is shifted in.
Change-Id: I102d7cd93982ad37ba0abb6c1ac0f66b85b5f95d
2013-05-17 09:47:40 -07:00
The Android Automerger
5fb6a99bd6
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-16 05:55:49 -07:00
The Android Open Source Project
82c852cb46
am b528e251
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'b528e2511377b58f2c7e0d1046b3645a3716e0ab':
Fix an NPE in recorrection
Fix an NPE in recapitalize
2013-05-16 05:48:21 -07:00
The Android Open Source Project
b528e25113
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I823f0c7f5fd55d748e7651188eb7ff1edace6dfe
2013-05-16 05:44:12 -07:00
Kurt Partridge
17b63ba588
Merge "Remove unnecessary commit/uncommit"
2013-05-15 23:52:43 +00:00
Kurt Partridge
7af5300c7d
Merge "Add claifying comment"
2013-05-15 23:31:31 +00:00
Jean Chalard
a404e36520
am d40b4729
: am b1e37e4a
: am f1dcf725
: Merge "Don\'t process recorrection or resets when not shown"
...
* commit 'd40b4729a5c37f35caff9c37f6f6218cdd46cb1f':
am f1dcf725
: Merge "Don\'t process recorrection or resets when not shown"
2013-05-15 13:06:57 -07:00
Tadashi G. Takaoka
c3c879ed9f
am ff0bd7db
: am 25f0c808
: am 96a9f357
: Merge "Fix unintentional setup step advance in orientation change"
...
* commit 'ff0bd7dbfa2421786459125795016853b45dca7b':
am 96a9f357
: Merge "Fix unintentional setup step advance in orientation change"
2013-05-15 13:06:56 -07:00
Tadashi G. Takaoka
ad6df987ac
am d6a7a26d
: am d59c1f83
: am 50259c70
: Merge "Tune layout parameters of setup wizard"
...
* commit 'd6a7a26d6396cf4418a3d35718a332c8d9a32097':
am 50259c70
: Merge "Tune layout parameters of setup wizard"
2013-05-15 13:06:55 -07:00
Tadashi G. Takaoka
feb169cb53
am e7ef9669
: am 7d9bd6f5
: am 66b87269
: Update welcome fallback image (using xhdpi asset)
...
* commit 'e7ef9669d6e04f3dec6161f31af8667b38a6cbb8':
am 66b87269
: Update welcome fallback image (using xhdpi asset)
2013-05-15 13:06:54 -07:00
Tadashi G. Takaoka
ce0273c26a
am 883905f4
: am 7fe67544
: am 769427cf
: Adjust aspect ratio of setup image
...
* commit '883905f45b836c5ded2527b5fe778c69e744a185':
am 769427cf
: Adjust aspect ratio of setup image
2013-05-15 13:06:53 -07:00
The Android Automerger
e0d3bb2c36
am b6161b40
: am 66c5f8cb
: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit 'b6161b40bc1e9ce584ecb40bbae3bc5aa787b7a2':
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 13:06:51 -07:00
Kurt Partridge
ba4e480c43
am 39afaf3d
: am 6d0f0347
: am b2d53be7
: Merge "Remove FeedbackLog instance variables."
...
* commit '39afaf3dc38bb929a87ea6ebed5c5f574e70fc23':
2013-05-15 13:06:50 -07:00
Tadashi G. Takaoka
091bcabfd3
am 46bf9f49
: am 4e3a8afd
: am 8b56ad78
: Merge "Revise welcome screen video and still image"
...
* commit '46bf9f493c61430cbaed343f09e7e88fdd238098':
2013-05-15 13:06:49 -07:00
Ken Wakasa
7a72480555
am acb37023
: am 23bfac83
: am d78c776b
: Merge "Adjust sampling interval for gesture stroke drawing a bit."
...
* commit 'acb37023b2e23b4be29d3b05f6516923adeb9560':
2013-05-15 13:06:47 -07:00
Ken Wakasa
d8e8b007ca
am 5ee11c5d
: am 2e0fc8bf
: am d6d70e73
: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
...
* commit '5ee11c5d9a55871e04dc24a34499d16a0d8ae3bd':
2013-05-15 13:06:46 -07:00
Tadashi G. Takaoka
315e8fac82
am 8e7b1739
: am 3fff5179
: am 41016aca
: Back to previous keyboard layout by canceling sliding input
...
* commit '8e7b173936778503b2d08b47e39457d934192e17':
2013-05-15 13:06:44 -07:00
Tadashi G. Takaoka
7ab91dfe3a
am 03f2ca6d
: am f46eafe2
: am c9398a3b
: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
...
* commit '03f2ca6d50c78b2584dedb894534167a5a35343a':
2013-05-15 13:06:43 -07:00
Jean Chalard
a1912d14de
am 95586abc
: am dccad3ef
: am cb0d1c4c
: Fix isSuggestionsStripVisible when keyboard hidden
...
* commit '95586abc11d07ceb363040921542c85c3378afa1':
2013-05-15 13:06:42 -07:00
Baligh Uddin
d64589b4e8
am 8587e879
: (-s ours) am 5ec5e0b6
: am e69066d1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8587e879b76fb14d6dc3be491065560563c8bc03':
2013-05-15 13:06:40 -07:00
Baligh Uddin
29cfa87b31
am fd2c2e62
: (-s ours) am 298d8232
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fd2c2e627089c6f4355aad477cb1cc90c52365b3':
Import translations. DO NOT MERGE
2013-05-15 13:06:39 -07:00
Jean Chalard
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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