Kurt Partridge
5e50eec570
Merge "Check inputs to ResearchLogger"
2012-06-12 11:39:11 -07:00
Jean Chalard
53eedaea92
Merge "Consolidate auto-correction settings."
2012-06-12 11:29:21 -07:00
Jean Chalard
9224b437b0
Merge "Move two methods in a more appropriate place"
2012-06-12 11:23:22 -07:00
Kurt Partridge
65fc909e13
Check inputs to ResearchLogger
...
to avoid NPEs.
Bug: 6188932
Change-Id: I377ceaac867df879dc7984dae44e96b369858cca
2012-06-12 10:56:03 -07:00
Kurt Partridge
4c8cee05ac
Merge "Adjust string lengths for translation"
2012-06-12 00:10:57 -07:00
Kurt Partridge
fe035fe378
Adjust string lengths for translation
...
Bug: 6635482
Bug: 6644787
Bug: 6645780
Bug: 6646060
Bug: 6645917
Change-Id: I61e62a7b9840bb4767ce40f521004fae7dbe905a
2012-06-11 23:33:02 -07:00
Jean Chalard
140adf204b
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
2012-06-12 10:29:55 +09:00
Jean Chalard
2010aad741
Move two methods in a more appropriate place
...
Change-Id: I512b04e23490413a44b1ca0517102fe2d9138df3
2012-06-12 10:29:55 +09:00
Jean Chalard
a32eb27213
Move an editing method to the RichInputConnection
...
Change-Id: Ie143ad008ca8deb1c5034cb80ec1cb28a6b0682d
2012-06-12 10:29:55 +09:00
Jean Chalard
243e370fcb
Move a member call out of the way
...
Change-Id: I5da48442c0b39aaff817c3b6d067a9b13fda0643
2012-06-12 10:29:55 +09:00
Jean Chalard
747cf0435a
Move two editing utility methods to RichInputConnection
...
Change-Id: If8d03bea1b6369cb3043da6321048d052995d664
2012-06-12 10:29:55 +09:00
Jean Chalard
70a046f8ca
Merge "Rename mSettingsValues to mCurrentSettings"
2012-06-11 18:24:45 -07:00
Jean Chalard
64913d72bc
Merge "Move suggestion strip visibility to SettingsValues"
2012-06-11 18:18:50 -07:00
Jean Chalard
15c0090e88
Merge "Accept a null input attributes for reading settings."
2012-06-11 18:18:43 -07:00
Jean Chalard
f4bc441256
Merge "Move the correction mode to SettingsValue and make it final"
2012-06-11 18:18:03 -07:00
Eric Fischer
250b45702f
Merge "Import translations. DO NOT MERGE"
2012-06-11 18:13:40 -07:00
Eric Fischer
74d36bc8af
Import translations. DO NOT MERGE
...
Change-Id: I2ab623c74a6c9b45558af0241dbd985e851428cd
2012-06-11 14:17:49 -07:00
Jean Chalard
411a98afb9
Merge "Consolidate updateCorrectionMode() calls"
2012-06-11 14:02:15 -07:00
The Android Open Source Project
642f9df078
am 4761677e: Reconcile with jb-release
...
* commit '4761677ea28182b70d9456d1641b3c2e87e23ca0':
2012-06-11 09:25:51 -07:00
The Android Open Source Project
4761677ea2
Reconcile with jb-release
...
Change-Id: I8a27e182b289fe193ffad6427aeed2db6b120201
2012-06-11 09:22:47 -07:00
The Android Automerger
bead66d1d5
merge in jb-release history after reset to jb-dev
2012-06-11 07:04:41 -07:00
Eric Fischer
2d56339246
am 65128b5a: (-s ours) am 2d5ba8bb: Import translations. DO NOT MERGE
...
* commit '65128b5a52b22dce04cd0ae9d7a14fe671abd598':
Import translations. DO NOT MERGE
2012-06-08 16:55:29 -07:00
Eric Fischer
65128b5a52
am 2d5ba8bb: Import translations. DO NOT MERGE
...
* commit '2d5ba8bbde29fb468f80c71701522496bc64dc33':
Import translations. DO NOT MERGE
2012-06-08 16:53:35 -07:00
Eric Fischer
2d5ba8bbde
Import translations. DO NOT MERGE
...
Change-Id: I3a0a7fc4901be1171d0877bb3a02633d6f6c1c2d
2012-06-08 16:50:02 -07:00
The Android Automerger
e4cd466f41
merge in jb-release history after reset to jb-dev
2012-06-08 08:22:42 -07:00
Jean Chalard
297e6d590b
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
2012-06-08 21:34:07 +09:00
Jean Chalard
d273697259
Move suggestion strip visibility to SettingsValues
...
Change-Id: If34112c69acd5122d87554043d87d8f4dbdf5d15
2012-06-08 21:26:25 +09:00
Jean Chalard
01e3b014bb
Accept a null input attributes for reading settings.
...
Change-Id: I11a8e1aca3541c35d2b39b27716687fcd8ff3dc6
2012-06-08 21:15:33 +09:00
Jean Chalard
4b9e6ee6fb
Move the correction mode to SettingsValue and make it final
...
At last this guy is final, at last
Change-Id: I76911f8d47493f8a1719f75fc7e949be5d7da1a2
2012-06-08 21:10:35 +09:00
Jean Chalard
3791183076
Consolidate updateCorrectionMode() calls
...
Change-Id: I43c0505e9a1652bfc568f23b787fc68a5c5e9220
2012-06-08 21:02:19 +09:00
Ken Wakasa
e7b34b9f86
Add NativeUtils.powf()
...
Change-Id: I0339f39d49bc6390d098017f32d92c776974e03e
2012-06-08 20:46:19 +09:00
Jean Chalard
aa564e336e
Merge "Move some editing methods to RichInputConnection."
2012-06-08 04:26:24 -07:00
Jean Chalard
bbbdab12be
Move some editing methods to RichInputConnection.
...
Change-Id: I8527776a4bd8236a85bb77f9791f9b76977ad181
2012-06-08 20:23:13 +09:00
Satoshi Kataoka
730b49fffc
Merge changes I94a64865,I62725bfe
...
* changes:
Refactor step3: const unigram_dictionary
refactor native step 2
2012-06-08 04:17:38 -07:00
Jean Chalard
e091982868
Straighten batch edits, pass 1
...
Change-Id: I73acfee9098a87b9cde8aca720586ec748b2a82f
2012-06-08 20:09:41 +09:00
Satoshi Kataoka
6bc051d291
Refactor step3: const unigram_dictionary
...
- make all functions in unigram_dictionary const
Change-Id: I94a64865aa793435e6c81890e68d999f6374074e
2012-06-08 20:04:36 +09:00
Jean Chalard
02308bec63
Merge RichInputConnection with EditingUtils
...
Change-Id: I9982ff325bef56694402caef28a77683c52ccd71
2012-06-08 20:04:09 +09:00
Jean Chalard
5475b38328
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
2012-06-08 19:50:12 +09:00
Satoshi Kataoka
4a3db7057f
refactor native step 2
...
- proximity_info is now stateless
Change-Id: I62725bfe05b161fa8fc050ea6b50867e10a354e2
2012-06-08 18:14:49 +09:00
Jean Chalard
c33a5428be
Merge "Small performance tweak"
2012-06-08 01:22:31 -07:00
Jean Chalard
67fd0c240d
Remove deprecated classes.
...
Should we maybe rename back *BinaryDict* to *Dict* in another
change for simplicity?
Change-Id: I8f7dcb78b9bdf1a13ce403a997fbb8619f2b453b
2012-06-08 17:12:15 +09:00
Jean Chalard
d10c473347
Small performance tweak
...
Change-Id: Icd540742073d49d12e70b2d8bd99aaf7ccb5802d
2012-06-08 17:09:40 +09:00
Jean Chalard
e91f32d8c1
Merge "Remove a slew of Eclipse warnings."
2012-06-08 00:35:05 -07:00
Jean Chalard
7214617622
Remove a slew of Eclipse warnings.
...
Change-Id: I03236386aea13fbd4fb8eaeee18e0008aa136502
2012-06-08 16:23:18 +09:00
Satoshi Kataoka
eed2cf287d
Merge "Separate state from proximity_info step1"
2012-06-07 22:18:11 -07:00
Eric Fischer
ab96376c9e
am b86be339: (-s ours) am 5921ebe3: Import translations. DO NOT MERGE
...
* commit 'b86be339d5a718721a57563082c11b8a1e2ac8a2':
Import translations. DO NOT MERGE
2012-06-07 17:21:24 -07:00
Eric Fischer
b86be339d5
am 5921ebe3: Import translations. DO NOT MERGE
...
* commit '5921ebe34ea82076d5a0619d096f354d23590221':
Import translations. DO NOT MERGE
2012-06-07 16:34:38 -07:00
Eric Fischer
43a7a82728
Import translations. DO NOT MERGE
...
Change-Id: I6cad8f4ae58eeb08d8a29137987cb3da60019844
2012-06-07 15:52:50 -07:00
Eric Fischer
5921ebe34e
Import translations. DO NOT MERGE
...
Change-Id: I7f676d036d2773bd3caa5087626b72fc599b1f08
2012-06-07 15:50:15 -07:00
Ken Wakasa
d418580a71
Fix typo
...
Change-Id: I264f829c1584a37995dbc5ee4ba6b6783d5d4834
2012-06-08 03:42:02 +09:00