aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | am 15ea1d40: Merge "Simplify the space-before and space-after logic."Jean Chalard2013-01-175-105/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15ea1d40967c25ab27849e1d8c0acf55d8f07e29': Simplify the space-before and space-after logic.
| * | | | | | | | | Merge "Simplify the space-before and space-after logic."Jean Chalard2013-01-175-105/+58
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Simplify the space-before and space-after logic.Jean Chalard2013-01-175-105/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7889078 Bug: 7268000 Change-Id: I6c77b8c9e60ef69f02526b407124d2f5d02818ee
* | | | | | | | | | | am 40c59727: Merge "Add default button to vibration/volume settings dialog"Tadashi G. Takaoka2013-01-174-14/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40c59727cf3c1b07a60c28f8df64876eb8ea03e3': Add default button to vibration/volume settings dialog
| * | | | | | | | | | Merge "Add default button to vibration/volume settings dialog"Tadashi G. Takaoka2013-01-174-14/+43
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add default button to vibration/volume settings dialogTadashi G. Takaoka2013-01-104-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7beb4517314efdefeb47d91b14a6b02c3075c19f
* | | | | | | | | | | | am 1b1fa7a1: Merge "SeekBarDialog supports neutral and dismiss listener"Tadashi G. Takaoka2013-01-172-11/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b1fa7a18b7baeb8fbdb3fb7ed46cf13a75fbac1': SeekBarDialog supports neutral and dismiss listener
| * | | | | | | | | | | Merge "SeekBarDialog supports neutral and dismiss listener"Tadashi G. Takaoka2013-01-172-11/+47
| |\| | | | | | | | | | | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | SeekBarDialog supports neutral and dismiss listenerTadashi G. Takaoka2013-01-102-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I652fd1a383ef4074c04d03a37ebc779d229474e6
* | | | | | | | | | | am 22959faa: Merge "Stop relying on the soft keyboard to get the editor action."Jean Chalard2013-01-164-16/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '22959faad4ad6a6284404ffc667ec823991f3710': Stop relying on the soft keyboard to get the editor action.
| * | | | | | | | | | Merge "Stop relying on the soft keyboard to get the editor action."Jean Chalard2013-01-174-16/+13
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Stop relying on the soft keyboard to get the editor action.Jean Chalard2013-01-164-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7969231 Change-Id: I9848c63c4c51550b5dc53c981eafa74e7fa95197
* | | | | | | | | | | am 5e45fbf0: Merge "Fix bounding rectangle of gesture preview trail"Tadashi G. Takaoka2013-01-163-37/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e45fbf0be0b5cff1d82c862cb07272e2a258ff7': Fix bounding rectangle of gesture preview trail
| * | | | | | | | | | Merge "Fix bounding rectangle of gesture preview trail"Tadashi G. Takaoka2013-01-163-37/+28
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix bounding rectangle of gesture preview trailTadashi G. Takaoka2013-01-163-37/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7917443 Bug: 7987585 Change-Id: I99e6db1fe43d3a9b497e92330a6857e0454c428c
* | | | | | | | | | | am b4f89c03: Merge "Follow up to I21b54b35"Ken Wakasa2013-01-152-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4f89c0368ce00b07ec1531f9ddefbe00380e5bb': Follow up to I21b54b35
| * | | | | | | | | | Merge "Follow up to I21b54b35"Ken Wakasa2013-01-152-4/+8
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Follow up to I21b54b35Ken Wakasa2013-01-162-4/+8
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3dd5fdd0c7f157724c82f6ddd6d3bea9bc853988
* | | | | | | | | | am 9579936b: [Rlog67] Renaming clarificationKurt Partridge2013-01-152-7/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9579936bcf6bc5cecee315c5e40a30af77f47dfd': [Rlog67] Renaming clarification
| * | | | | | | | | [Rlog67] Renaming clarificationKurt Partridge2013-01-152-7/+11
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResearchLogger.latinIME_handleSeparator wasn't doing anything really specific to the separator, so its implementation has been renamed according to its role. Change-Id: I24e8691c7dc440dd067e96d23e50463683e17cfc
* | | | | | | | | am 34b88560: Merge "Distinguish action-enter/shift-enter/enter"Jean Chalard2013-01-155-39/+63
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34b8856077220cfaa475a13d383bcc69ef470af4': Distinguish action-enter/shift-enter/enter
| * | | | | | | | Merge "Distinguish action-enter/shift-enter/enter"Jean Chalard2013-01-155-39/+63
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Distinguish action-enter/shift-enter/enterJean Chalard2013-01-155-39/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7969231 Change-Id: I75d495ee1ea126da9be4e269ee990ee0a97793c1
* | | | | | | | | | am a04fe20c: Merge "refactor distance cache"Satoshi Kataoka2013-01-154-30/+66
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a04fe20c7736523fc3d906aaba7d3a01bca06fc2': refactor distance cache
| * | | | | | | | | Merge "refactor distance cache"Satoshi Kataoka2013-01-154-30/+66
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | refactor distance cacheSatoshi Kataoka2013-01-154-30/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21b54b356641a63d7be17fd34b9ede7a63ec738a
* | | | | | | | | | | am 1ddc1dab: Small renaming for consistencyKen Wakasa2013-01-153-12/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1ddc1dabe6b049bb76a60acf23019e1bd96674a3': Small renaming for consistency
| * | | | | | | | | | Small renaming for consistencyKen Wakasa2013-01-153-12/+12
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I10c61d441f586e63045f8c7a606a9ee61366d870
* | | | | | | | | | am 6cee61de: Use -fno-inline for debug builds & small cleanupsKen Wakasa2013-01-157-23/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6cee61deebd0ca2b85054ccc239523d1e5fdfab1': Use -fno-inline for debug builds & small cleanups
| * | | | | | | | | Use -fno-inline for debug builds & small cleanupsKen Wakasa2013-01-157-23/+17
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24f91d7130f2203715b868d4a82510660939886f
* | | | | | | | | am c995dbcf: Merge "Remove MAX_WORD_LENGTH_INTERNAL"Ken Wakasa2013-01-1425-234/+202
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c995dbcf598730f138e59f989e813b83d585d40b': Remove MAX_WORD_LENGTH_INTERNAL
| * | | | | | | | Merge "Remove MAX_WORD_LENGTH_INTERNAL"Ken Wakasa2013-01-1425-234/+202
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove MAX_WORD_LENGTH_INTERNALKen Wakasa2013-01-1525-234/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie11ff000675601acff5fbb00e9e9f48eb32c5071
* | | | | | | | | | am 722eeb14: Fix drawing Arabic diacriticsTadashi G. Takaoka2013-01-144-4/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '722eeb144f4a0af337784ffa311217432272e19d': Fix drawing Arabic diacritics
| * | | | | | | | | Fix drawing Arabic diacriticsTadashi G. Takaoka2013-01-154-4/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8001868 Change-Id: I0e5aab266bbaad8c68e4a900b8d5572977a0379d
* | | | | | | | | am 019bcc62: Merge "[Rlog68] Logger; make filenames more unique to prevent ↵Kurt Partridge2013-01-142-7/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filesys conflicts" * commit '019bcc62b92d2a43057a00c2db0a2928966c6247': [Rlog68] Logger; make filenames more unique to prevent filesys conflicts
| * | | | | | | | Merge "[Rlog68] Logger; make filenames more unique to prevent filesys conflicts"Kurt Partridge2013-01-142-7/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [Rlog68] Logger; make filenames more unique to prevent filesys conflictsKurt Partridge2013-01-142-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-project commit with If6b9f8990d7cdbf570740a81096513698d0e0f4c Change-Id: I124aed24be0beb4c472869594184ecf003c2fed4
* | | | | | | | | | am 5b611e18: Merge "[Rlog63] Log whether a manual suggestion is a prediction"Kurt Partridge2013-01-142-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b611e184b44e479855ca45acd132ab9c592ba52': [Rlog63] Log whether a manual suggestion is a prediction
| * | | | | | | | | Merge "[Rlog63] Log whether a manual suggestion is a prediction"Kurt Partridge2013-01-142-4/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [Rlog63] Log whether a manual suggestion is a predictionKurt Partridge2013-01-112-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6f793611d4b18aecb1a635655af5edb639e1ecf
* | | | | | | | | | | am 939e3f31: Merge "[Rlog59d] Pass separatorString through revertCommit"Kurt Partridge2013-01-142-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '939e3f3152f7c2a1593b5ab4161597f4fe73315c': [Rlog59d] Pass separatorString through revertCommit
| * | | | | | | | | | Merge "[Rlog59d] Pass separatorString through revertCommit"Kurt Partridge2013-01-142-4/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [Rlog59d] Pass separatorString through revertCommitKurt Partridge2013-01-142-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ef20476318979f99f543f9300cf6198d18f6244
* | | | | | | | | | | | am 3e05370d: Merge "[Rlog59c] More detailed logging of backspace"Kurt Partridge2013-01-132-7/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e05370d53688e2c34cc26b7e5b6ca07f25fa839': [Rlog59c] More detailed logging of backspace
| * | | | | | | | | | | Merge "[Rlog59c] More detailed logging of backspace"Kurt Partridge2013-01-132-7/+32
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [Rlog59c] More detailed logging of backspaceKurt Partridge2013-01-122-7/+32
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Normal delete events are recorded - Includes number of characters deleted for both batch and normal delete Change-Id: I422da3ddc94fa0ccd6c7586eaacf14c62dd16679
* | | | | | | | | | | | am 916c0a08: Merge "[Rlog60] Log if a logUnit is uncommitted"Kurt Partridge2013-01-121-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '916c0a08c679b12922cbf32b659d1e32ca4dc6cd': [Rlog60] Log if a logUnit is uncommitted
| * | | | | | | | | | | Merge "[Rlog60] Log if a logUnit is uncommitted"Kurt Partridge2013-01-121-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | [Rlog60] Log if a logUnit is uncommittedKurt Partridge2013-01-101-0/+3
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally logUnits are committed to a log when the word that their data corresponds to is complete. However, if the user reverts a word, or goes back to edit it, then the system may "uncommit" the logUnit, and append additional editing steps to the end of it. When this happens, we want to make a note of it in the log, which is what this patch does. Change-Id: If2bbb948469824c76facf5f06ed8a6da8ff9777c