aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | Extract a new class for app-specific workarounds.Jean Chalard2013-05-214-40/+88
| | | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 8944307 Change-Id: Iaff9dd03d3d856a6bdaa2b16c4e71e95cd2b6349
* | | | | am eb724ddb: (-s ours) am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release ↵The Android Open Source Project2013-05-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit 'eb724ddbe92ba4c090fafad42ca65af4fd8d5143':
| * | | | am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-170-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '7f78bd5e2517b6a2f6eceb5f1703e51aca236dc0':
| | * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-170-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: Ie6c9c358c616c5271893b6ceb2cf2d50fa209c38
| | | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-160-0/+0
| | | |\ \ | | | | |/ | | | |/|
* | | | | am de4e579c: Merge "Fix punctuation logging"Kurt Partridge2013-05-172-14/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'de4e579c68e74fa0c85b376769e9428cd822add7': Fix punctuation logging
| * | | | Merge "Fix punctuation logging"Kurt Partridge2013-05-172-14/+40
| |\ \ \ \
| | * | | | Fix punctuation loggingKurt Partridge2013-05-172-14/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release ↵The Android Open Source Project2013-05-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit '82c852cb4644e28b55fad08f04cae9e124b32cc2': Fix an NPE in recorrection Fix an NPE in recapitalize
| * | | | | am b528e251: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | * commit 'b528e2511377b58f2c7e0d1046b3645a3716e0ab': Fix an NPE in recorrection Fix an NPE in recapitalize
| | * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: I823f0c7f5fd55d748e7651188eb7ff1edace6dfe
| | | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-130-0/+0
| | | |\ \
| | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-070-0/+0
| | | | |\ \
| | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-060-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-020-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-010-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-290-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-250-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-240-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-230-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-220-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * | Fix an NPE in recorrectionJean Chalard2013-04-191-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, theoretically, we don't want to retrieve older suggestions if there are no results for a recorrection - that would look random. This bug addresses this too. Bug: 8657919 Change-Id: I44f36d34a708a968ab71fa0592da57f4c97d4b7f
| | | | | | | | | | | | | * | Fix an NPE in recapitalizeJean Chalard2013-04-191-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8657736 Change-Id: I459d1c200826c1c394f8207475ecf60a4f356793
* | | | | | | | | | | | | | | am 17b63ba5: Merge "Remove unnecessary commit/uncommit"Kurt Partridge2013-05-152-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17b63ba588598d0bd6f643d3a8cb385c75d2c163': Remove unnecessary commit/uncommit
| * | | | | | | | | | | | | | Merge "Remove unnecessary commit/uncommit"Kurt Partridge2013-05-152-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Remove unnecessary commit/uncommitKurt Partridge2013-05-142-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user reverts a commit, this causes the committed word to be changed. The user usually then goes back to edit that word. Going back to edit causes an uncommit, so that the editing actions are added onto the LogUnit containing the operations used to construct the word. But currently, reverting also involves its own commit/uncommit pair, with the caller performing the uncommit, and the commit happening inside the revert command. This may have been necessary in the past, when revert was called in different situations, but is unnecessary now. Furthermore, the guarding conditions are currently such that the uncommit doesn't always undo the effects of the commit, corrupting the log output. Change-Id: I74af41f4f1db2fcabfa496dcc4a2d7bd0af19b3a
* | | | | | | | | | | | | | | | am 7af5300c: Merge "Add claifying comment"Kurt Partridge2013-05-151-0/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7af5300c7dc8d3816b0f02fa9dae112d3d22a71a': Add claifying comment
| * | | | | | | | | | | | | | | Merge "Add claifying comment"Kurt Partridge2013-05-151-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add claifying commentKurt Partridge2013-05-141-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up to I7c01c3dd3ac33d7e96c00836256bae9c14b124ed Change-Id: I9e3f8968c4bbf9525d5dfe101f71373c42f88361
* | | | | | | | | | | | | | | | | am a404e365: am d40b4729: am b1e37e4a: am f1dcf725: Merge "Don\'t process ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recorrection or resets when not shown" * commit 'a404e36520c975660f9fbc0c7ae65353407140d4': am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
| * | | | | | | | | | | | | | | | am d40b4729: am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or ↵Jean Chalard2013-05-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resets when not shown" * commit 'd40b4729a5c37f35caff9c37f6f6218cdd46cb1f': am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
| | * | | | | | | | | | | | | | | am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when ↵Jean Chalard2013-05-153-5/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-153-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1dcf725061b3e61e40540566a5385cf4934f424': Don't process recorrection or resets when not shown
* | | | | | | | | | | | | | | | | am c3c879ed: am ff0bd7db: am 25f0c808: am 96a9f357: Merge "Fix unintentional ↵Tadashi G. Takaoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup step advance in orientation change" * commit 'c3c879ed9f3232b4631f7fb699a7993aa173258b': am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
| * | | | | | | | | | | | | | | | am ff0bd7db: am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step ↵Tadashi G. Takaoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | advance in orientation change" * commit 'ff0bd7dbfa2421786459125795016853b45dca7b': am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
| | * | | | | | | | | | | | | | | 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 ad6df987: am d6a7a26d: am d59c1f83: am 50259c70: Merge "Tune layout ↵Tadashi G. Takaoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameters of setup wizard" * commit 'ad6df987ac3910913d7517e0deff914f23ab4ea3': am 50259c70: Merge "Tune layout parameters of setup wizard"
| * | | | | | | | | | | | | | | | am d6a7a26d: am d59c1f83: am 50259c70: Merge "Tune layout parameters of ↵Tadashi G. Takaoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup wizard" * commit 'd6a7a26d6396cf4418a3d35718a332c8d9a32097': am 50259c70: Merge "Tune layout parameters of setup wizard"
| | * | | | | | | | | | | | | | | 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 feb169cb: am e7ef9669: am 7d9bd6f5: am 66b87269: Update welcome fallback ↵Tadashi G. Takaoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image (using xhdpi asset) * commit 'feb169cb536b35556275eb6332e5a168fff6fe30': am 66b87269: Update welcome fallback image (using xhdpi asset)
| * | | | | | | | | | | | | | | | am e7ef9669: am 7d9bd6f5: am 66b87269: Update welcome fallback image (using ↵Tadashi G. Takaoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xhdpi asset) * commit 'e7ef9669d6e04f3dec6161f31af8667b38a6cbb8': am 66b87269: Update welcome fallback image (using xhdpi asset)
| | * | | | | | | | | | | | | | | 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 ce0273c2: am 883905f4: am 7fe67544: am 769427cf: Adjust aspect ratio of ↵Tadashi G. Takaoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup image * commit 'ce0273c26a83cb63a32f1bdd13e1d308b1000748': am 769427cf: Adjust aspect ratio of setup image
| * | | | | | | | | | | | | | | | am 883905f4: am 7fe67544: am 769427cf: Adjust aspect ratio of setup imageTadashi G. Takaoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '883905f45b836c5ded2527b5fe778c69e744a185': am 769427cf: Adjust aspect ratio of setup image
| | * | | | | | | | | | | | | | | 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 e0d3bb2c: am b6161b40: am 66c5f8cb: merge in jb-ub-latinimegoogle-azuki ↵The Android Automerger2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history after reset to jb-ub-latinimegoogle * commit 'e0d3bb2c36dd804b1aa4b1b2de33e221ab1ffe12': 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