aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Consolidate a test."Jean Chalard2012-06-121-1/+4
|\
| * Consolidate a test.•••Stop using the numerical value, use the actual method Change-Id: Iffa7f2d21a0471c7862afd3234cc9c5dd86feb2e Jean Chalard2012-06-131-1/+4
* | Merge "Use InstrumentationTestCase and get rid of AndroidTestCase.getTestCont...Tadashi G. Takaoka2012-06-121-4/+6
|\ \
| * | Use InstrumentationTestCase and get rid of AndroidTestCase.getTestContext call•••Bug: 6202480 Change-Id: I19e04f17614e70867f8383d08667e350d753cde9 Tadashi G. Takaoka2012-06-121-4/+6
* | | Merge "Check inputs to ResearchLogger"Kurt Partridge2012-06-121-8/+15
|\ \ \ | |_|/ |/| |
| * | Check inputs to ResearchLogger•••to avoid NPEs. Bug: 6188932 Change-Id: I377ceaac867df879dc7984dae44e96b369858cca Kurt Partridge2012-06-121-8/+15
* | | Merge "Consolidate auto-correction settings."Jean Chalard2012-06-122-12/+8
|\ \ \
| * | | Consolidate auto-correction settings.•••For some reason, there were several ways, not exactly identical, to get this setting. The ones that used mAutoCorrectionEnabled would kick in when the input field was specifying no correction, so it would be a little strange (although harmless in the practice because the settings set in this way would not get used later, because the correct test would be done at that time). Also perform a very small refactoring Change-Id: Ica9f32b238d98009ae1852d3c1e940398f5d341c Jean Chalard2012-06-122-12/+8
* | | | Merge "Move two methods in a more appropriate place"Jean Chalard2012-06-123-31/+33
|\| | | | |_|/ |/| |
| * | Move two methods in a more appropriate place•••Change-Id: I512b04e23490413a44b1ca0517102fe2d9138df3 Jean Chalard2012-06-123-31/+33
* | | Merge "Adjust string lengths for translation"Kurt Partridge2012-06-121-5/+5
|\ \ \ | |/ / |/| |
| * | Adjust string lengths for translation•••Bug: 6635482 Bug: 6644787 Bug: 6645780 Bug: 6646060 Bug: 6645917 Change-Id: I61e62a7b9840bb4767ce40f521004fae7dbe905a Kurt Partridge2012-06-111-5/+5
| |/
* | Move an editing method to the RichInputConnection•••Change-Id: Ie143ad008ca8deb1c5034cb80ec1cb28a6b0682d Jean Chalard2012-06-122-24/+24
* | Move a member call out of the way•••Change-Id: I5da48442c0b39aaff817c3b6d067a9b13fda0643 Jean Chalard2012-06-121-1/+1
* | Move two editing utility methods to RichInputConnection•••Change-Id: If8d03bea1b6369cb3043da6321048d052995d664 Jean Chalard2012-06-122-40/+48
* | Merge "Rename mSettingsValues to mCurrentSettings"Jean Chalard2012-06-111-54/+55
|\ \
| * | Rename mSettingsValues to mCurrentSettings•••...for readability. After all, it makes sense that "current settings" is a "SettingsValues", while it's harder to understand why we'd manipulate an object named "SettingsValues". Change-Id: Ide9a17b970a6cc00b80b9a217f986268c739c662 Jean Chalard2012-06-081-54/+55
* | | Merge "Move suggestion strip visibility to SettingsValues"Jean Chalard2012-06-112-29/+33
|\| |
| * | Move suggestion strip visibility to SettingsValues•••Change-Id: If34112c69acd5122d87554043d87d8f4dbdf5d15 Jean Chalard2012-06-082-29/+33
* | | Merge "Accept a null input attributes for reading settings."Jean Chalard2012-06-112-3/+1
|\| |
| * | Accept a null input attributes for reading settings.•••Change-Id: I11a8e1aca3541c35d2b39b27716687fcd8ff3dc6 Jean Chalard2012-06-082-3/+1
* | | Merge "Move the correction mode to SettingsValue and make it final"Jean Chalard2012-06-112-21/+21
|\| |
| * | Move the correction mode to SettingsValue and make it final•••At last this guy is final, at last Change-Id: I76911f8d47493f8a1719f75fc7e949be5d7da1a2 Jean Chalard2012-06-082-21/+21
* | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-06-1147-669/+340
|\ \ \
| * | | Import translations. DO NOT MERGE•••Change-Id: I2ab623c74a6c9b45558af0241dbd985e851428cd Eric Fischer2012-06-1147-669/+340
| | |/ | |/|
* | | Merge "Consolidate updateCorrectionMode() calls"Jean Chalard2012-06-111-6/+3
|\ \ \ | |/ / |/| / | |/
| * Consolidate updateCorrectionMode() calls•••Change-Id: I43c0505e9a1652bfc568f23b787fc68a5c5e9220 Jean Chalard2012-06-081-6/+3
* | am 4761677e: Reconcile with jb-release•••* commit '4761677ea28182b70d9456d1641b3c2e87e23ca0': The Android Open Source Project2012-06-110-0/+0
|\ \
| * \ Reconcile with jb-release•••Change-Id: I8a27e182b289fe193ffad6427aeed2db6b120201 The Android Open Source Project2012-06-110-0/+0
| |\ \
| | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| | |\ \
| | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| | | |\ \
* | | | | | am 65128b5a: (-s ours) am 2d5ba8bb: Import translations. DO NOT MERGE•••* commit '65128b5a52b22dce04cd0ae9d7a14fe671abd598': Import translations. DO NOT MERGE Eric Fischer2012-06-080-0/+0
|\| | | | |
| * | | | | am 2d5ba8bb: Import translations. DO NOT MERGE•••* commit '2d5ba8bbde29fb468f80c71701522496bc64dc33': Import translations. DO NOT MERGE Eric Fischer2012-06-084-9/+9
| |\| | | |
| | * | | | Import translations. DO NOT MERGE•••Change-Id: I3a0a7fc4901be1171d0877bb3a02633d6f6c1c2d Eric Fischer2012-06-084-9/+9
| | |/ / /
* | | | / Add NativeUtils.powf()•••Change-Id: I0339f39d49bc6390d098017f32d92c776974e03e Ken Wakasa2012-06-086-2/+110
| |_|_|/ |/| | |
* | | | Merge "Move some editing methods to RichInputConnection."Jean Chalard2012-06-082-35/+39
|\ \ \ \
| * | | | Move some editing methods to RichInputConnection.•••Change-Id: I8527776a4bd8236a85bb77f9791f9b76977ad181 Jean Chalard2012-06-082-35/+39
* | | | | Merge changes I94a64865,I62725bfe•••* changes: Refactor step3: const unigram_dictionary refactor native step 2 Satoshi Kataoka2012-06-088-240/+218
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactor step3: const unigram_dictionary•••- make all functions in unigram_dictionary const Change-Id: I94a64865aa793435e6c81890e68d999f6374074e Satoshi Kataoka2012-06-082-47/+46
| * | | | refactor native step 2•••- proximity_info is now stateless Change-Id: I62725bfe05b161fa8fc050ea6b50867e10a354e2 Satoshi Kataoka2012-06-088-196/+175
* | | | | Straighten batch edits, pass 1•••Change-Id: I73acfee9098a87b9cde8aca720586ec748b2a82f Jean Chalard2012-06-081-23/+8
* | | | | Merge RichInputConnection with EditingUtils•••Change-Id: I9982ff325bef56694402caef28a77683c52ccd71 Jean Chalard2012-06-085-270/+239
* | | | | Make a wrapper for the input connection.•••The goal is to simplify the code in LatinIME.java as well as having a handy place to put debug calls to see interaction with TextView. Change-Id: I255227e7e7343e0c2f3dcd1f185e5020d6186732 Jean Chalard2012-06-082-213/+275
* | | | | Merge "Small performance tweak"Jean Chalard2012-06-082-8/+8
|\ \ \ \ \
| * | | | | Small performance tweak•••Change-Id: Icd540742073d49d12e70b2d8bd99aaf7ccb5802d Jean Chalard2012-06-082-8/+8
* | | | | | Remove deprecated classes.•••Should we maybe rename back *BinaryDict* to *Dict* in another change for simplicity? Change-Id: I8f7dcb78b9bdf1a13ce403a997fbb8619f2b453b Jean Chalard2012-06-087-596/+41
|/ / / / /
* | | | | Merge "Remove a slew of Eclipse warnings."Jean Chalard2012-06-0810-12/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove a slew of Eclipse warnings.•••Change-Id: I03236386aea13fbd4fb8eaeee18e0008aa136502 Jean Chalard2012-06-0810-12/+11
* | | | | Merge "Separate state from proximity_info step1"Satoshi Kataoka2012-06-079-307/+474
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Separate state from proximity_info step1•••Bug: 6548943 Change-Id: I7b4fbe20615a28151a74875be43b9f4a20e0dce9 Satoshi Kataoka2012-06-079-307/+474