Commit graph

7505 commits

Author SHA1 Message Date
Eric Fischer
32b56fd34d am 3894e25f: (-s ours) am 62b1e672: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '3894e25f011595d550506edddd6d1f522f6ec90e':
  Import translations. DO NOT MERGE
2012-06-12 14:52:26 -07:00
Satoshi Kataoka
84bb18f4c9 resolved conflicts for merge of ee78e780 to master
Change-Id: I88a4996bdd17c5378a67781d8075eff311670c3b
2012-06-13 06:45:38 +09:00
Eric Fischer
3894e25f01 am 62b1e672: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '62b1e67215cef632b9447839ff5b1bd268dc3924':
  Import translations. DO NOT MERGE
2012-06-12 12:43:45 -07:00
satok
ee78e780fc am 6a71f061: Fix UserHistoryBigram data contention in UserHistoryDictionary
* commit '6a71f0610c137c613a5fa44a658f31e9f4ec5525':
  Fix UserHistoryBigram data contention in UserHistoryDictionary
2012-06-12 12:43:07 -07:00
Jean Chalard
58d9e46ce0 Merge "Consolidate a test." 2012-06-12 11:50:36 -07:00
Tadashi G. Takaoka
4b3ae50eef Merge "Use InstrumentationTestCase and get rid of AndroidTestCase.getTestContext call" 2012-06-12 11:49:55 -07:00
Kurt Partridge
5e50eec570 Merge "Check inputs to ResearchLogger" 2012-06-12 11:39:11 -07:00
Jean Chalard
e86054e5c2 Consolidate a test.
Stop using the numerical value, use the actual method

Change-Id: Iffa7f2d21a0471c7862afd3234cc9c5dd86feb2e
2012-06-13 03:34:58 +09:00
Jean Chalard
53eedaea92 Merge "Consolidate auto-correction settings." 2012-06-12 11:29:21 -07:00
The Android Automerger
364d8f8fca merge in jb-release history after reset to jb-dev 2012-06-12 11:25:15 -07:00
Tadashi G. Takaoka
9a5bf1d12e Use InstrumentationTestCase and get rid of AndroidTestCase.getTestContext call
Bug: 6202480

Change-Id: I19e04f17614e70867f8383d08667e350d753cde9
2012-06-12 11:23:56 -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
satok
703eb8bf96 Fix UserHistoryBigram data contention in UserHistoryDictionary
Bug: 6637614
Change-Id: I34d26563e59d3b09bf35b8173dac5645ccb6a39f
2012-06-12 08:20:07 -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
62b1e67215 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-11 18:13:03 -07:00
satok
6a71f0610c Fix UserHistoryBigram data contention in UserHistoryDictionary
Bug: 6637614
Change-Id: I34d26563e59d3b09bf35b8173dac5645ccb6a39f
2012-06-12 08:00:14 +09:00
Eric Fischer
74d36bc8af Import translations. DO NOT MERGE
Change-Id: I2ab623c74a6c9b45558af0241dbd985e851428cd
2012-06-11 14:17:49 -07:00
Eric Fischer
1616903f71 Import translations. DO NOT MERGE
Change-Id: I865d01b8e1f936a0715bb28ce6ab2dd8ecd5a315
2012-06-11 14:14:15 -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