aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge RichInputConnection with EditingUtilsJean Chalard2012-06-085-270/+239
| | | | | | | | | | | | | | | | | | | | Change-Id: I9982ff325bef56694402caef28a77683c52ccd71
* | | | | Make a wrapper for the input connection.Jean Chalard2012-06-082-213/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Small performance tweak"Jean Chalard2012-06-082-8/+8
|\ \ \ \ \
| * | | | | Small performance tweakJean Chalard2012-06-082-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd540742073d49d12e70b2d8bd99aaf7ccb5802d
* | | | | | Remove deprecated classes.Jean Chalard2012-06-087-596/+41
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should we maybe rename back *BinaryDict* to *Dict* in another change for simplicity? Change-Id: I8f7dcb78b9bdf1a13ce403a997fbb8619f2b453b
* | | | | Merge "Remove a slew of Eclipse warnings."Jean Chalard2012-06-0810-12/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove a slew of Eclipse warnings.Jean Chalard2012-06-0810-12/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I03236386aea13fbd4fb8eaeee18e0008aa136502
* | | | | Merge "Separate state from proximity_info step1"Satoshi Kataoka2012-06-079-307/+474
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Separate state from proximity_info step1Satoshi Kataoka2012-06-079-307/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6548943 Change-Id: I7b4fbe20615a28151a74875be43b9f4a20e0dce9
* | | | | am b86be339: (-s ours) am 5921ebe3: Import translations. DO NOT MERGEEric Fischer2012-06-070-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'b86be339d5a718721a57563082c11b8a1e2ac8a2': Import translations. DO NOT MERGE
| * | | | am 5921ebe3: Import translations. DO NOT MERGEEric Fischer2012-06-073-9/+7
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '5921ebe34ea82076d5a0619d096f354d23590221': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEEric Fischer2012-06-073-9/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I7f676d036d2773bd3caa5087626b72fc599b1f08
* | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0749-9/+693
| | | | | | | | | | | | | | | | | | | | Change-Id: I6cad8f4ae58eeb08d8a29137987cb3da60019844
* | | | | Fix typoKen Wakasa2012-06-081-8/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I264f829c1584a37995dbc5ee4ba6b6783d5d4834
* | | | | am e4da18e2: am 6348c54f: Merge "Initializing member variable before it is ↵Tadashi G. Takaoka2012-06-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | referenced" into jb-dev * commit 'e4da18e27916f770fcd704032d30534d287d67c6': Initializing member variable before it is referenced
| * | | | am 6348c54f: Merge "Initializing member variable before it is referenced" ↵Tadashi G. Takaoka2012-06-071-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '6348c54ffd1d39be44ce42d7d2eb068cba508dbc': Initializing member variable before it is referenced
| | * | | Merge "Initializing member variable before it is referenced" into jb-devTadashi G. Takaoka2012-06-071-1/+1
| | |\ \ \
| | | * | | Initializing member variable before it is referencedTadashi G. Takaoka2012-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6584882 Change-Id: I1f76388fa8cc16171bc3fc60c935ddcf0a7c4e92
* | | | | | am 674c51a0: am ec2981a4: Fix a bug on upgrading user history schemesatok2012-06-072-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '674c51a01117b73dd25473195f92fb0c0158da26': Fix a bug on upgrading user history scheme
| * | | | | am ec2981a4: Fix a bug on upgrading user history schemesatok2012-06-072-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec2981a487b91a682caade486700d8b2377a5c52': Fix a bug on upgrading user history scheme
| | * | | | Fix a bug on upgrading user history schemesatok2012-06-082-1/+9
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 6626700 Change-Id: I3190d7404e45e704be79ee2031e79b18475feb8c
* | | | | am 733b3c5f: am 65b72435: Fix Dvorak 4th-row color scheme of 7-inch tabletTadashi G. Takaoka2012-06-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '733b3c5fa86953b36d2242becb991b2891d8ffc0': Fix Dvorak 4th-row color scheme of 7-inch tablet
| * | | | am 65b72435: Fix Dvorak 4th-row color scheme of 7-inch tabletTadashi G. Takaoka2012-06-071-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '65b72435237f9dbc0eca0038ebc666331aff079f': Fix Dvorak 4th-row color scheme of 7-inch tablet
| | * | | Fix Dvorak 4th-row color scheme of 7-inch tabletTadashi G. Takaoka2012-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6625029 Change-Id: I6ea02e8e46d2bae29080cf9b4ad852a1b6fdd6f5
* | | | | am dd52a9dc: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'dd52a9dcada2c89a723c49b213c4679424ecc728':
| * | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I187fd2f871882b894e1c7db7b2ff61763f8bc090
| | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-070-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | | | |\ \
| | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-040-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | | | | |\ \
* | | | | | | | \ \ Merge "Contacts binary dictionary updates with change in keyboard locale."Tom Ouyang2012-06-072-16/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Contacts binary dictionary updates with change in keyboard locale.Tom Ouyang2012-06-072-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6616436 Change-Id: I8d66a37f295134c5b9875b2a305a9be7442bd75d
* | | | | | | | | | | am eead5492: am 769cecf7: Close spell-checking dictionaries in a background ↵Jean Chalard2012-06-061-20/+25
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread * commit 'eead5492615f0b05ef85ca1f88d3a41ce3f8d496': Close spell-checking dictionaries in a background thread
| * | | | | | | | | | am 769cecf7: Close spell-checking dictionaries in a background threadJean Chalard2012-06-061-20/+25
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '769cecf7e79dc6e2a98e527bdb9943bef9a42396': Close spell-checking dictionaries in a background thread
| | * | | | | | | | | Close spell-checking dictionaries in a background threadJean Chalard2012-06-071-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6584677 Change-Id: Ifd9b0f995f4e0cf4d35a7ecde767826ab976f0b8
* | | | | | | | | | | Merge "add research log ui control"Kurt Partridge2012-06-067-33/+177
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add research log ui controlKurt Partridge2012-06-067-33/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - lets users flag a particular time in the research log - lets users delete the log for this session also makes the UsabilityLog setting control whether the ResearchLog logs or not. multi-project commit with I89067e7d3b8daca7179333f1dbe82224c26920fe Bug: 6188932 Change-Id: I89864ef3ab53b0efe1ea8d75247be08712f0c399
* | | | | | | | | | | | am c27646cd: (-s ours) am 69b4e411: Merge "Import translations. DO NOT ↵Eric Fischer2012-06-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-dev * commit 'c27646cd2705786b33e23edd7f3902e40afecab8': Import translations. DO NOT MERGE
| * | | | | | | | | | | am 69b4e411: Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-06-0626-53/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '69b4e411e1666a7a4abed72ab5484878b24cba35': Import translations. DO NOT MERGE
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-06-0626-53/+27
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0626-53/+27
| | | | |_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c285a7484375ce4aa4569af6249027f84711d60
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-06-0626-53/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0626-53/+27
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7718b03a6f995edfb3cce07f761a4f56d573aa1b
* | | | | | | | | | | | am 55628748: am 95ab6fff: Merge "Change spacebar and language switch key ↵Tadashi G. Takaoka2012-06-062-9/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background color of phone" into jb-dev * commit '5562874831219d5622b5d194fd3ee3e15251202d': Change spacebar and language switch key background color of phone
| * | | | | | | | | | | am 95ab6fff: Merge "Change spacebar and language switch key background color ↵Tadashi G. Takaoka2012-06-062-9/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of phone" into jb-dev * commit '95ab6fff29b83434307a1705bfe68d30bf440237': Change spacebar and language switch key background color of phone
| | * | | | | | | | | | Merge "Change spacebar and language switch key background color of phone" ↵Tadashi G. Takaoka2012-06-062-9/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev
| | | * | | | | | | | | | Change spacebar and language switch key background color of phoneTadashi G. Takaoka2012-06-042-9/+5
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6568834 Change-Id: I815af444eb953e665a09a075b2d3e5875898cb52
* | | | | | | | | | | | am e08cfda1: am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each ↵Satoshi Kataoka2012-06-063-127/+216
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language" into jb-dev * commit 'e08cfda1ebea693c56681816076c419f23c51076': Cache UserHistoryDictionary for each language