aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 6b0bcfba: Merge "Disable long press timer while sliding input mode"•••* commit '6b0bcfba9b9a1f2079769aa331a7fc4daf071d9b': Disable long press timer while sliding input mode Tadashi G. Takaoka2013-05-133-5/+11
|\
| * Merge "Disable long press timer while sliding input mode"Tadashi G. Takaoka2013-05-133-5/+11
| |\
| | * Disable long press timer while sliding input mode•••Bug: 8915171 Change-Id: Id8685f90766c7de55b56476de83abf97150a186d Tadashi G. Takaoka2013-05-133-5/+11
* | | am ad662ade: Disable delete key repeating while in slide input mode•••* commit 'ad662adeef10c4b202f8f5f80037dd5b8fc9583d': Disable delete key repeating while in slide input mode Tadashi G. Takaoka2013-05-131-4/+7
|\| |
| * | Disable delete key repeating while in slide input mode•••Bug: 8915171 Change-Id: I04f84c29f10abc0207072d2165c75dd20f053f92 Tadashi G. Takaoka2013-05-131-4/+7
| |/
* | am 18184eac: Support regular expression for condition pattern•••* commit '18184eacb149f1b12b859ff8631340a9f73bf8ac': Support regular expression for condition pattern Tadashi G. Takaoka2013-05-132-6/+42
|\|
| * Support regular expression for condition pattern•••Bug: 8556975 Change-Id: Iffc53d6a40dd77860434c5f7f4f59af5cd1ba92b Tadashi G. Takaoka2013-05-132-6/+42
* | am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"•••* commit 'ec83457d726679e81d0b0ec12c9e7a284464133e': Support multiple condition for getDeviceOverrideValue Tadashi G. Takaoka2013-05-129-96/+259
|\|
| * Merge "Support multiple condition for getDeviceOverrideValue"Tadashi G. Takaoka2013-05-139-96/+259
| |\
| | * Support multiple condition for getDeviceOverrideValue•••Bug: 8556975 Change-Id: I29d3a305b6ac3d8e3620c6d8592d85047d62bf48 Tadashi G. Takaoka2013-05-139-96/+259
* | | am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java•••* commit 'cb3bba3c4ee4652e12c81185ab9a648db20bb0dd': Rename GesturePreviewTrail.java -> GestureTrail.java Ken Wakasa2013-05-1211-120/+118
|\| |
| * | Rename GesturePreviewTrail.java -> GestureTrail.java•••Try reducing some confusions between GesturePreviewTrail.java and GestureTrailsPreview.java Change-Id: I5fe2ee740cf1b32210530188153f6f6937e34b68 Ken Wakasa2013-05-1311-120/+118
| |/
* | am 7d72ca0b: Avoid JsonWriter multi-write error•••* commit '7d72ca0b20334aba077e3a01d7b12f6f34618076': Avoid JsonWriter multi-write error Kurt Partridge2013-05-104-49/+55
|\|
| * Avoid JsonWriter multi-write error•••JsonWriter requires that its clients pass it only a single top-level object. The existing implementation tries to make code cleaner by having mJsonWriter never be null, and instead use a global static "NULL_JSON_WRITER" that just discards data. But because JsonWriter complains if more than one top-level object is passed, making this a global object does not work. This change instead copes with mJsonWriter being null. Change-Id: Ia37ccfc8646e91f11a64713dd92d2846eb86ac54 Kurt Partridge2013-05-104-49/+55
* | am 260df841: Merge "Remove unused code"•••* commit '260df8419739f92d4c64abfedec448a7f447b3a1': Remove unused code Kurt Partridge2013-05-101-11/+1
|\|
| * Merge "Remove unused code"Kurt Partridge2013-05-101-11/+1
| |\
| | * Remove unused code•••Change-Id: I192c67e9e8de44f073abc70ec85ebcdb36356c2e Kurt Partridge2013-05-091-11/+1
* | | am bb17034f: Merge "Remove ref to LatinImeLogger preference."•••* commit 'bb17034f6403261681b63a2f789566a27c49af07': Remove ref to LatinImeLogger preference. Kurt Partridge2013-05-101-5/+0
|\| |
| * | Merge "Remove ref to LatinImeLogger preference."Kurt Partridge2013-05-101-5/+0
| |\ \
| | * | Remove ref to LatinImeLogger preference.•••This is a bug; the ResearchLogger uses ResearchSettings.readResearchLoggerEnabledFlag() instead, which the user cannot change. (We assume they will just switch to a different keyboard.) Change-Id: Ib5731c9eeb2bc29d9cf8608033326674f5eb6f7b Kurt Partridge2013-05-091-5/+0
| | |/
* | | am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization"•••* commit '4135c2db7b4c9722db8fd86dedde3319c51fd482': Avoid NPE by fixing ResearchLogger initialization Kurt Partridge2013-05-101-93/+62
|\| |
| * | Merge "Avoid NPE by fixing ResearchLogger initialization"Kurt Partridge2013-05-101-93/+62
| |\ \
| | * | Avoid NPE by fixing ResearchLogger initialization•••Previously, mMainResearchLog and mMainLogBuffer were set up when the user moved to a new TextView, and set to null when the user left the TextView. This change causes mMainResearchLog, mMainLogBuffer, mFeedbackLog, and mFeedbackLogBuffer to be non-null forever after init() is called. start() no longer sets up these fields; instead they are cleared and reset every time stop() is called. Checks for null values are now removed. The earlier code just didn't initialize these variables if the user disabled logging, but since the new version invariantly keeps these variables valid, we add a check for whether the user has enabled logging in publishLogUnits(). Change-Id: Ifde3517f1cf924cfa33cda95fec24529b52b3c08 Kurt Partridge2013-05-091-93/+62
* | | | am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"•••* commit '565ced4546420e9e17c7747f9e207ca6773598e3': Refactor StringUtils.findPrefixedString to findValueOfKey Tadashi G. Takaoka2013-05-108-37/+103
|\| | |
| * | | Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"Tadashi G. Takaoka2013-05-108-37/+103
| |\ \ \
| | * | | Refactor StringUtils.findPrefixedString to findValueOfKey•••Bug: 8556975 Change-Id: I275c99db8a0d10594a5a8c0c27ebc1a87495c307 Tadashi G. Takaoka2013-05-108-37/+103
* | | | | am 4705c0fa: Fix screen flash when launching settings activity•••* commit '4705c0fa7ca9527f6a3d7cb47542de734a56337d': Fix screen flash when launching settings activity Tadashi G. Takaoka2013-05-102-10/+17
|\| | | |
| * | | | Fix screen flash when launching settings activity•••Bug: 8336068 Change-Id: I90a0f259129a3f3319b158b060154cc43960c234 Tadashi G. Takaoka2013-05-102-10/+17
* | | | | am 2b5c9726: Introduce another activity to launch setup wizard•••* commit '2b5c9726f4a7d24497fc1df17c6ce57188c99cab': Introduce another activity to launch setup wizard Tadashi G. Takaoka2013-05-103-427/+477
|\| | | |
| * | | | Introduce another activity to launch setup wizard•••Bug: 8336068 Change-Id: I35b94dd87c5b01d3e927da8f918a5398dd565d33 Tadashi G. Takaoka2013-05-103-427/+477
| |/ / /
* | | | am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launc...•••* commit '5ffa5bf3ba7d169912d163790e461ab8d5aca30a': Keep SetupActivity alive to check re-launching from launcher Tadashi G. Takaoka2013-05-091-18/+32
|\| | |
| * | | Merge "Keep SetupActivity alive to check re-launching from launcher"Tadashi G. Takaoka2013-05-101-18/+32
| |\ \ \
| | * | | Keep SetupActivity alive to check re-launching from launcher•••Bug: 8336068 Change-Id: I183b8e3fd1b3898d5f8dbbb13a0c93c64341fc38 Tadashi G. Takaoka2013-05-101-18/+32
* | | | | am 2564bd09: Merge "Reuse old preferences if possible."•••* commit '2564bd09375c24bbd7fef0fd30cb3ba8a606a274': Reuse old preferences if possible. Jean Chalard2013-05-092-7/+28
|\| | | |
| * | | | Merge "Reuse old preferences if possible."Jean Chalard2013-05-102-7/+28
| |\ \ \ \
| | * | | | Reuse old preferences if possible.•••This is an optimization. It also happens to work around what seems to be a framework bug in JB MR1 / MR1.1. Bug: 8771179 Change-Id: I62cc7acdc8656d75f8a50c068c4e9d8c6ceb74a0 Jean Chalard2013-05-102-7/+28
| | |/ / /
* | | | | am ba35426f: Merge "Tweak a label in the personal dictionary settings"•••* commit 'ba35426f01ed9243ff6a03be589a0f098353e1b2': Tweak a label in the personal dictionary settings Satoshi Kataoka2013-05-091-6/+0
|\| | | |
| * | | | Merge "Tweak a label in the personal dictionary settings"Satoshi Kataoka2013-05-101-6/+0
| |\ \ \ \
| | * | | | Tweak a label in the personal dictionary settings•••Bug: 8897600 Change-Id: Ibf245e32468e5740ad9d65b8ff1f1e87b430d287 Satoshi Kataoka2013-05-101-6/+0
* | | | | | am 2ad7023c: Fix detecting out of keyboard area•••* commit '2ad7023c548afe829eb87f0ea1be48b533a2ac2b': Fix detecting out of keyboard area Tadashi G. Takaoka2013-05-091-1/+1
|\| | | | |
| * | | | | Fix detecting out of keyboard area•••Bug: 8885165 Change-Id: I85c78b23955169972fb0f5395463b6fe47f12c9c Tadashi G. Takaoka2013-05-101-1/+1
| | |/ / / | |/| | |
* | | | | am b0aabbfb: (-s ours) am 8dafc8e8: (-s ours) am 22e6a5c5: Import translation...•••* commit 'b0aabbfbe0144272df816160e7b0b569bbba55cd': Import translations. DO NOT MERGE Baligh Uddin2013-05-090-0/+0
|\| | | |
| * | | | am 8dafc8e8: (-s ours) am 22e6a5c5: Import translations. DO NOT MERGE•••* commit '8dafc8e834036ffded3644ba06ad4164ee7e755f': Import translations. DO NOT MERGE Baligh Uddin2013-05-090-0/+0
| |\ \ \ \
| | * \ \ \ am 22e6a5c5: Import translations. DO NOT MERGE•••* commit '22e6a5c5b4c3fb486fd2605255081fc4b849f415': Import translations. DO NOT MERGE Baligh Uddin2013-05-092-5/+5
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGE•••Change-Id: I189a4ad23e69f0abe515dad7e3c909a28fcfbf0b Auto-generated-cl: translation import Baligh Uddin2013-05-082-5/+5
* | | | | | | am 42dc0c25: (-s ours) Merge "Import translations. DO NOT MERGE"•••* commit '42dc0c256220496743a2532b7d51823d1d4d65d9': Import translations. DO NOT MERGE Baligh Uddin2013-05-090-0/+0
|\| | | | | |
| * | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-05-097-95/+105
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGE•••Change-Id: I77a0aed9771ecc28a56226bb5f9776c1e1cf8b4d Auto-generated-cl: translation import Baligh Uddin2013-05-087-95/+105
* | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-05-097-95/+105
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGE•••Change-Id: I424582a75cee45290b1dbe7552dfeb8288324c8b Auto-generated-cl: translation import Baligh Uddin2013-05-087-95/+105