Tadashi G. Takaoka
c27fe6253c
Add custom subtype settings
...
Bug: 4460018
Change-Id: I4919d79516dcf574be2761bbaf9adcdc381b2ddc
2012-04-19 19:33:51 +09:00
Tadashi G. Takaoka
344af15674
Change predefined additional subtype format in preference
...
This change also refactor StringUtils class
Change-Id: Ie0b4d169b21c260bf238d6fcc9ab0ee8bfd6b508
2012-04-19 17:11:21 +09:00
Eric Fischer
d43f7ec1d7
Import translations. DO NOT MERGE
...
Change-Id: I0e373f7cd2b577cca91e042b7bb48540d5c09a23
2012-04-18 15:25:32 -07:00
Tadashi G. Takaoka
f5a0bd2c28
Make predefined subtype configurable by XML resource
...
Change-Id: I1f8486a1fb652f1e06789e7bfd2cc57273092234
2012-04-18 22:45:26 +09:00
Tadashi G. Takaoka
55d28fd1b2
Cleanup InputMethodManagerCompatWrapper
...
Change-Id: Id3b84ee19bb504ed8fbb398e260cc663a5b5ae0d
2012-04-18 18:01:29 +09:00
Tadashi G. Takaoka
feea31e9ce
Merge "Fix typo of some methods' name"
2012-04-18 00:42:19 -07:00
Tadashi G. Takaoka
a58ebc73ae
Fix typo of some methods' name
...
Also changes some methods' argument type from Locale to String.
Change-Id: Ib68b528a450dc68a01546483403230f76500bee4
2012-04-18 16:40:50 +09:00
Jean Chalard
bd2897d86e
Fix the build
...
Change-Id: I128224799835bc3c230fed1afce942650e1396e0
2012-04-18 16:29:01 +09:00
Jean Chalard
74d2977367
Merge "Add interesting corrections to the whitelist"
2012-04-18 00:10:23 -07:00
Jean Chalard
b5365eb8f0
Add interesting corrections to the whitelist
...
Bug: 6096906
Change-Id: I3b8da88c1547fb94a67a280b60c604041c92e65b
2012-04-18 16:08:49 +09:00
Tadashi G. Takaoka
26d97b089d
Merge "Fix dimming keyboard"
2012-04-17 23:30:25 -07:00
Tadashi G. Takaoka
b3f0912fd1
Fix dimming keyboard
...
Bug: 6354679
Change-Id: I03bb0554bc06f1aab7eaa6c69fd9241ef300318f
2012-04-18 14:55:57 +09:00
Kurt Partridge
d442984e96
researchLogging for inputConnection events
...
Bug: 6188932
Change-Id: I596df68956abd879293cfb550e66e7d7d0ba74e9
2012-04-17 20:05:10 -07:00
Tadashi G. Takaoka
18178fefdc
Merge "Remove useless key event handling methods"
2012-04-17 19:58:05 -07:00
Tadashi G. Takaoka
79e07e3f84
Remove useless key event handling methods
...
Change-Id: I8c42fba79aba643ab7a145e6fd54ef23855a3ad0
2012-04-18 11:55:11 +09:00
Jean Chalard
bde232dcaa
Merge "Pass the previous word down to native code in getSuggestions"
2012-04-17 18:01:05 -07:00
Tadashi G. Takaoka
69bcc15cb3
Add SubtypeUtils.setAditionalInputMethodSubtypes method
...
Change-Id: Ia3043346ed87297e01d505980555fdf29ce4f96f
2012-04-17 22:48:00 +09:00
Jean Chalard
80111f08e2
Pass the previous word down to native code in getSuggestions
...
Change-Id: I477b631d81ef58461e44954f3ae5fd895928bb97
2012-04-17 20:07:10 +09:00
satok
74a84febc7
Cache results of the spell checker
...
Change-Id: Ie11cd1b07e069474b140fbaae65fca703adc056f
2012-04-17 19:45:57 +09:00
Tadashi G. Takaoka
761b6bc120
Merge "Add SubtypeLocale.getKeyboardLayoutSetDisplayName"
2012-04-17 03:08:59 -07:00
Tadashi G. Takaoka
bb17bafac3
Add SubtypeLocale.getKeyboardLayoutSetDisplayName
...
Change-Id: I576b47a936545e653ce9e26222ba4db143ea90e6
2012-04-17 18:55:51 +09:00
satok
23980cdba4
Merge "Do not pass misspelled flags to TextView"
2012-04-17 02:51:28 -07:00
satok
65ebe190a9
Do not pass misspelled flags to TextView
...
Bug: 6310268
Original CL: I2f7a54ae0d63235a0b94e039109ab8
Change-Id: I28f64a4d0bb262db819f5f8c0ffc58a259c8e62d
2012-04-17 15:51:08 +09:00
Jean Chalard
1277692519
Merge "Pass the previous word to getSuggestions"
2012-04-16 20:56:03 -07:00
Jean Chalard
ac27e4544b
Pass the previous word to getSuggestions
...
This is a preparative change to bug#6313806
Change-Id: I1be9ec49b21005c1f45ce459fa93712bc74ef3f0
2012-04-17 12:43:53 +09:00
Kurt Partridge
9bfb620215
add logPoint for manual correction (inc touch pos)
...
Bug: 6188932
Change-Id: Ibcc4901bcfab6632ee4c59cb58d35452218a288d
2012-04-16 16:52:25 -07:00
Tadashi G. Takaoka
8b833071a1
Fix Settings fragment isn't shown on tablet
...
Bug: 6341510
Change-Id: I319bb72400995d8385b0b14ef25b164dee3974da
2012-04-16 16:36:28 +09:00
Tadashi G. Takaoka
11a40a047f
Make Utils.getDeviceOverrideValue aware of device orientation
...
Bug: 6277225
Change-Id: If41fe5cbee0985b9a4740dcd5d1c6ba73b94b377
2012-04-16 12:59:55 +09:00
Tadashi G. Takaoka
423b30d59c
Use keyTextStyle to draw popup hint "..." text
...
Also popup hint "..." text doesn't follow the alpha animation of
alt-while-key-typing.
Bug: 6333266
Change-Id: I08b548a8922e6fe5e9ff036ff75cadf39fb9358a
2012-04-16 12:11:05 +09:00
Tom Ouyang
a7352c8df4
Merge "Add a new binary contacts dictionary based on ExpandableBinaryDictionary and use locale for bigrams."
2012-04-13 18:30:19 -07:00
Tom Ouyang
18222f8c86
Add a new binary contacts dictionary based on ExpandableBinaryDictionary and use locale for bigrams.
...
Bug: 6188977
Change-Id: I753422eed1effaeb5fd01124cf1ddd1e31ee9d60
2012-04-13 17:54:39 -07:00
Eric Fischer
b9315e9a85
Import translations. DO NOT MERGE
...
Change-Id: Idd8b8ea44c3b8b5d5dead243fde3189e891f1e9c
2012-04-13 14:40:35 -07:00
Kurt Partridge
2783c51e6d
Merge "clean up researchLogging of autocorrection"
2012-04-13 10:47:19 -07:00
Tadashi G. Takaoka
c206d04623
Use InputMethodSettingsFragment for IME settings
...
Change-Id: Id6d9cd0ddf99c0687b6d3ea4b2f868f6cf2a0eaf
2012-04-13 19:56:47 +09:00
Tadashi G. Takaoka
f6972561fc
Utilize InputMethodSubtype and additional subtype
...
* Remove de_QY and fr_CH from supported subtypes
* Add de-qwerty and fr-qwertz predefined additional subtypes instead.
Change-Id: I49e8ba0299529302f2b91b4d018b07304cdd6897
2012-04-13 18:36:26 +09:00
Tadashi G. Takaoka
8abde7db6b
Refatcor InputMethodSubtype related stuff a bit
...
Change-Id: Iaded72331660afbaeddda085f2b633b681d4b6df
2012-04-13 16:24:11 +09:00
Kurt Partridge
60adb87574
clean up researchLogging of autocorrection
...
remove dependence of ResearchLogger on LatinImeLogger
for autocorrection
multi-project commit with I32cc134b
Bug: 6188932
Change-Id: Iaeda97eb43fa4782db2d1b2a6d8d09a93b395111
2012-04-12 22:59:21 -07:00
satok
35b5a7babb
Merge "Add isDictionaryAvailable to SubtypeSwitcher"
2012-04-12 04:46:29 -07:00
satok
cf6b2099be
Add isDictionaryAvailable to SubtypeSwitcher
...
Change-Id: I534878d330b57bbfaa8b7711082456969771f4dc
2012-04-12 19:46:02 +09:00
Tadashi G. Takaoka
0f87ca72f7
Start typing timer when key is pressed
...
Bug: 6327144
Change-Id: I5df0073ff38ac25e46455ef459121528c86a8dbe
2012-04-12 17:55:22 +09:00
Tadashi G. Takaoka
45213ed2a6
Polish fade-in/out animations for the gray-out-while-typing keys
...
Bug: 6326723
Change-Id: Idb6fa023c497cf1f0f584f496e7e5ae82b1c9f4f
2012-04-12 16:43:24 +09:00
Tadashi G. Takaoka
f1678ba802
Don't cancel key typing timer when new keyboard is set
...
This change also fixes some typos.
Bug: 6312143
Change-Id: I5d752c05b128a47ed022a4a804b02559eeee6915
2012-04-12 15:35:44 +09:00
Jean Chalard
cec8552b18
Pass a parameter to the dict pack if we don't have a default dict
...
Also, optimize quite a bit the code that decides whether we have
a default dict or not.
Bug: 5705834
Change-Id: Ied20fbcbbc42cbe8c01759d11b1804d1156c6960
2012-04-12 13:05:31 +09:00
Kurt Partridge
fed44d08d8
Merge "change ResearchLoggerTests to check file"
2012-04-11 13:19:52 -07:00
Kurt Partridge
b8e2ae3bc3
change ResearchLoggerTests to check file
...
multi-project commit with I587003f2
Bug: 6188932
Change-Id: I3d3f0c9d011301489473dc330338ea4a7ba61e9e
2012-04-11 11:17:44 -07:00
Eric Fischer
fad6a2625b
Import translations. DO NOT MERGE
...
Change-Id: Ieadb02a76d86b07b251d3246b3f1355ddfdfc18d
2012-04-11 10:31:56 -07:00
Jean Chalard
e6269759d6
Read the dictionary resource in a more sensical place.
...
We don't need to pass this down all the way from LatinIME any more.
It fetched be done exactly where it needs to be.
Change-Id: I9f277f9c4f9de70ae755a1334d86c67bbb24c988
2012-04-11 21:03:21 +09:00
Tadashi G. Takaoka
9d95a99626
Merge "Add language suffix to main dictionary"
2012-04-11 00:21:47 -07:00
Tadashi G. Takaoka
78ab80844b
Add language suffix to main dictionary
...
Bug: 6319377
Change-Id: Ie6a887fefa12e33c17bfeb5d22984e7c1a7bdb46
2012-04-11 16:11:34 +09:00
Tadashi G. Takaoka
ab0d0d8a02
Add followKeyLabelRatio flag for keyLabelFlags of Key attribute
...
This change renames largeLetter flag to followKeyLargeLetterRatio as
well.
Change-Id: Ida777aac57e4d885fa051654fe863f493f8e946a
2012-04-11 15:53:38 +09:00
Tadashi G. Takaoka
10f18f5fb7
Use system locale for labels on no language keyboard
...
Bug: 6010147
Change-Id: I9a6ce1bf82ca13359f715f4d1fc5f2bf15d4ee6e
2012-04-11 14:38:06 +09:00
Tadashi G. Takaoka
2be51f4fd0
Generate KeyboardLabelsSet from donottranslate-more-keys.xml
...
This change introduces makelabel tool that reads all languages'
donottranslate-more-keys and generate KeyboardLabelsSet.java source
file. The makelabel command must be invoked prior to compile LatinIME.
Change-Id: I7515c7919c535e30f9c80a37bdc831d0f682cd43
2012-04-11 11:23:47 +09:00
Eric Fischer
7be6ce0fd7
Import translations. DO NOT MERGE
...
Change-Id: I2d0942b4d3eaf3e62cde5b38034df60c0ac5cd86
2012-04-10 15:16:14 -07:00
Tom Ouyang
ecd2ac93bc
Add an expandable binary dictionary that can be modified at runtime and works with native algorithms.
...
Bug: 6188977
Change-Id: Iec5c4e7d1d3918ac645187bd32dc3f82a95fec1e
2012-04-10 10:17:52 -07:00
Tadashi G. Takaoka
8834e3dbce
Fix KeyboardCodesSet code mapping
...
This is a follow up for Icfd6d06f.
Change-Id: I9a11c6f1c8d9654e3fb004940791055c2bcf9f17
2012-04-10 15:09:26 +09:00
Tadashi G. Takaoka
7f0c503afc
Use !icon/<icon_name> notation for more keys spec
...
Change-Id: I616e6c1ac603d2eb7a5c99ec70d5411371d15f3e
2012-04-10 12:01:07 +09:00
Tadashi G. Takaoka
ed3bac91f2
Introduce KeyboardCodesSet.java and remove keycodes.xml
...
Change-Id: Icfd6d06f47425aa037682d22c895548ba6f047d8
2012-04-10 11:53:58 +09:00
Kurt Partridge
a601ef03db
Merge "move suggested words logpoint to SuggestionsView.java"
2012-04-09 17:26:01 -07:00
Kurt Partridge
a9ca7867b5
move suggested words logpoint to SuggestionsView.java
...
Bug: 6188932
Change-Id: I73974783783bb4453962cb9009656d86d2074409
2012-04-09 16:24:29 -07:00
Kurt Partridge
98986c6a43
Merge "add more data collection points to ResearchLogger (attempt #2 )"
2012-04-09 16:13:47 -07:00
Eric Fischer
43822893c9
Import translations. DO NOT MERGE
...
Change-Id: I3329fe453b8b014ce367e8083ca79bed5b673abb
2012-04-09 15:41:43 -07:00
Kurt Partridge
9bc29d78a6
add more data collection points to ResearchLogger (attempt #2 )
...
the new points are all at Log.x() positions; only those appearing directly
related to user input were added.
multi-project change with I159f5de2
this CL is the same as I618bcd07, which was reverted because of
incompatibilities with vendor branches.
Bug: 6188932
Change-Id: I999249dceb0c04f5a4ffbfff25caed09d24a2c52
2012-04-09 09:38:07 -07:00
Tadashi G. Takaoka
264045ef81
Extract keycodes.xml from donottranslate-more-keys.xml
...
Change-Id: Iaaf47b018b83f3d51dad348a527f17f8d6df21b6
2012-04-09 17:02:40 +09:00
Kurt Partridge
4b96f4c3e0
Merge "Revert "add more data collection points to ResearchLogger""
2012-04-06 18:30:28 -07:00
Kurt Partridge
d16bda4a4a
Revert "add more data collection points to ResearchLogger"
...
This reverts commit ac9e87c03e
2012-04-06 18:26:34 -07:00
Kurt Partridge
93a00ef9ee
Merge "add more data collection points to ResearchLogger"
2012-04-06 17:42:59 -07:00
Eric Fischer
fba1656352
Import translations. DO NOT MERGE
...
Change-Id: Iace23e7e6136ae74812aff021d9f7be4abd629d3
2012-04-06 14:42:37 -07:00
Kurt Partridge
ac9e87c03e
add more data collection points to ResearchLogger
...
the new points are all at Log.x() positions; only those appearing directly
related to user input were added.
Bug: 6188932
Change-Id: I618bcd07b22c9efc794745678b073afe1e79a697
2012-04-06 09:35:13 -07:00
Jean Chalard
fe4807d52f
Remove obsolete resources.
...
Change-Id: If114306037b23da1c0ef29b7de44ba15de078bb5
2012-04-06 20:01:53 +09:00
Jean Chalard
b5e1f48987
Remove the now useless Flag class.
...
Change-Id: Ibe45189b73e2606cf77e30da166dd0d45ae47c5c
2012-04-06 19:47:16 +09:00
Jean Chalard
338d3ec725
Replace the flags in getSuggestions with a boolean.
...
Change-Id: I0ec44df1979cb1dc21017ea290d2151a2af0e7cd
Conflicts:
java/src/com/android/inputmethod/latin/Suggest.java
2012-04-06 19:34:48 +09:00
Jean Chalard
24aee9100e
Change the flags to a boolean in constructors.
...
Change-Id: I9939204f3b16346aaebd4d726315ba9c4faf910a
2012-04-06 19:33:01 +09:00
Jean Chalard
f420df2823
Add support for German umlaut and French ligatures flags
...
Bug: 6202812
Change-Id: Ib4a7f96f6ef86c840069b15d04393f84d428c176
2012-04-06 17:07:29 +09:00
Jean Chalard
b8060399c7
Remove constructors
...
And small cleanup.
Change-Id: I1de903f42c1b8d57a488be2162e0b94055a6d1f2
2012-04-06 16:53:15 +09:00
Jean Chalard
8cf1a8d04f
Remove the shortcutOnly attribute which is now useless.
...
Change-Id: Ifccdfdaf7c0066bb7728981503baceff0fedb71f
2012-04-06 16:27:53 +09:00
Tadashi G. Takaoka
b6313f7275
Merge "Cleanup unused methods"
2012-04-05 23:46:56 -07:00
satok
7540fd009d
Merge "Fix the locale of the flags in BinaryDicitonary for tests"
2012-04-05 22:33:17 -07:00
Tadashi G. Takaoka
a4c7733cf7
Cleanup unused methods
...
Change-Id: Ic7c1ec0e0606da6eb5b954934547c6e8a561fed5
2012-04-06 12:27:53 +09:00
Tadashi G. Takaoka
fc169c726a
Merge "Use keyboardSet extra value of subtype to specify layout type"
2012-04-05 19:17:30 -07:00
Ken Wakasa
0cedde120b
Merge "Set view properties for Key node infos."
2012-04-05 17:09:54 -07:00
Eric Fischer
1cbd8d09dd
Import translations. DO NOT MERGE
...
Change-Id: I9a3d2ce38cab8721064389dd61be6114f6df3f27
2012-04-05 15:59:37 -07:00
alanv
26c80a1b9a
Set view properties for Key node infos.
...
Bug: 6298716
Change-Id: Iae0616f0095d32e0ca61dcb55f2f84744e91f60e
2012-04-05 14:56:57 -07:00
Jean Chalard
af7d86c5b8
Merge "Update the names and default values of bigram options."
2012-04-05 05:08:56 -07:00
Jean Chalard
80f2ccc236
Update the names and default values of bigram options.
...
Bug: 6293595
Change-Id: I9978a1127c64b7a26a5ccf6f777366f7c4e214db
2012-04-05 21:07:40 +09:00
Ken Wakasa
aa300bb73a
Don't draw red underline for manually picked words that came from bigram prediction
...
Change-Id: I544680c8b4b1baff71bd08168630a34e803c40b9
2012-04-05 20:50:27 +09:00
Tadashi G. Takaoka
11d9ee742f
Use keyboardSet extra value of subtype to specify layout type
...
Change-Id: Ice1f345a08a8d760e3b847c885c4072e3e142c97
2012-04-05 17:25:15 +09:00
satok
ae234abd21
Fix the locale of the flags in BinaryDicitonary for tests
...
Bug: 6129372
Change-Id: I5611f88b10c44261b6145c9dc8615b80e4341e77
2012-04-05 12:48:30 +09:00
Tadashi G. Takaoka
cb389ef0d6
Refactor to utilize InputMethodSubtype
...
Change-Id: I76fbc8a395eb8dab996c02c86d7328f07865f8cf
2012-04-05 12:27:27 +09:00
satok
43ebd8a035
Fix the locale of flags in BinaryDictionary
...
Bug: 6129372
Change-Id: I4958c2aabf651d7e26648a29b75fcc6c77813451
2012-04-04 21:50:42 +09:00
Tadashi G. Takaoka
b082c95a2b
Use no language "zz" to disable shortcut key
...
Change-Id: Ifba5bbd4298ecf84cc5e0ebdb4fc8494eafff62e
2012-04-04 14:35:55 +09:00
Tadashi G. Takaoka
23bcd664c0
Update Thai keyboard comment
...
Bug: 6070772
Change-Id: Iae59e3c34ee4ea8878f17b8d775a2a4cb886718c
2012-04-04 14:15:53 +09:00
Tadashi G. Takaoka
c7e43a7aec
Merge "Use language agnostic QWERTY for forceAscii"
2012-04-03 21:06:52 -07:00
Tadashi G. Takaoka
234bf612ca
Merge "Use "No language (QWERTY)" for language agnostic QWERTY keyboard name"
2012-04-03 21:03:10 -07:00
Tadashi G. Takaoka
32bfc1601a
Use language agnostic QWERTY for forceAscii
...
Bug: 6286208
Change-Id: I1b3b6f04c9033e7dc57a30e8dce43e01428b8e4e
2012-04-04 12:59:58 +09:00
Tadashi G. Takaoka
3bf57a5624
Use "No language (QWERTY)" for language agnostic QWERTY keyboard name
...
Bug: 6010147
Change-Id: I401c2e3fcd639c0e1a03e64489a0d792810caa18
2012-04-04 12:58:42 +09:00
satok
d8af793983
Merge "Fix NPE in SuggestedWords"
2012-04-03 19:23:03 -07:00
satok
f088204a90
Fix NPE in SuggestedWords
...
Bug: 6279966
Change-Id: Ia94a78d79cc51014126d18612aabdc7ce51487a4
2012-04-04 11:09:13 +09:00
Tadashi G. Takaoka
fde7efd877
Add private constructor to utility classes
...
Bug: 6129704
Change-Id: I52925ae7bd80683f63efc48649448865a5654f41
2012-04-03 18:01:04 +09:00
Tadashi G. Takaoka
d2c5533fd9
Merge "Add RunInLocale class to guard locale switching"
2012-04-03 01:53:05 -07:00
Tadashi G. Takaoka
56dda78d52
Merge "Cleanup InputTypeCompatUtils to InputTypeUtils"
2012-04-03 01:50:08 -07:00
Tadashi G. Takaoka
16c6f35570
Add RunInLocale class to guard locale switching
...
Bug: 6128216
Change-Id: I8d9c75c773c3de886183b291ada7a3836295839b
2012-04-03 17:43:45 +09:00
Tadashi G. Takaoka
be55086fd9
Cleanup InputTypeCompatUtils to InputTypeUtils
...
Bug: 6129704
Change-Id: I45e19e456ef7c6e61fe877ea544fef1b9f896e95
2012-04-03 17:42:19 +09:00
Tadashi G. Takaoka
b07939764a
Merge "Fix typo"
2012-04-03 01:31:47 -07:00
Tadashi G. Takaoka
8f433a66b2
Fix typo
...
Follow up for I5b9964f2
Bug: 6129704
Change-Id: Ia90c013cf4c4e6f675da5701644bd10833898c3f
2012-04-03 17:27:51 +09:00
Tadashi G. Takaoka
78e333594b
Remove ViewParentCompatUtils
...
Bug: 6129704
Change-Id: I429dcbec01bb4d33064ab1e3d597640d76c53d2f
2012-04-03 17:26:06 +09:00
Tadashi G. Takaoka
c6435f92a8
Remove AccessibilityManagerCompatUtils and MorionEventCompatUtils
...
Bug: 6129704
Change-Id: Icb7e80588536066c4fe5b4a1afc100a724b43e7b
2012-04-03 16:51:02 +09:00
Tadashi G. Takaoka
244c825c4b
Merge "Cleanup EditorInfoCompatUtils"
2012-04-03 00:49:55 -07:00
Tadashi G. Takaoka
7a0779a441
Merge "Cleanup FrameLayoutCompatUtils to ViewLayoutUtils"
2012-04-03 00:47:32 -07:00
Tadashi G. Takaoka
0d1a5d5b97
Cleanup EditorInfoCompatUtils
...
Bug: 6129704
Change-Id: I5b9964f2ad52e7cd60c63acca93d0241a1e729ef
2012-04-03 16:45:36 +09:00
Tadashi G. Takaoka
13d6ecc4c2
Remove InputMethodServiceCompatWrapper
...
Bug: 6129704
Change-Id: I76f2854e27623be940a711d0d48fd3f90132141c
2012-04-03 16:02:09 +09:00
Tadashi G. Takaoka
8443af57ba
Merge "Remove InputMethodSubtypeCompatWrapper"
2012-04-02 23:57:43 -07:00
Tadashi G. Takaoka
9cc2c94c8b
Remove InputMethodSubtypeCompatWrapper
...
Bug: 6129704
Change-Id: I8f84f0f61a2205ac1fcd1cd40e3a586ee535282d
2012-04-03 15:31:26 +09:00
Jean Chalard
c734c2aca1
Add a simple way to input dictionary header attributes
...
Just add them as an attribute to the root of the XML node.
Bug: 6202812
Change-Id: Idf040bfebf20a72f9e4370930a85d97df593f484
2012-04-03 15:18:51 +09:00
Tadashi G. Takaoka
19457316c1
Remove CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED boolean
...
Bug: 6129704
Change-Id: I7643e656c6e7656eff339cc301dd32f34dee83a4
2012-04-02 23:22:49 +09:00
Tadashi G. Takaoka
b1904ec235
Merge "Remove InputMethodInfoCompatWrapper"
2012-04-02 07:14:20 -07:00
Tadashi G. Takaoka
c8461d1ae2
Cleanup FrameLayoutCompatUtils to ViewLayoutUtils
...
Bug: 6129704
Change-Id: I52f2e236c7dae3ac2cba64392165f955a53d3f42
2012-04-02 22:55:12 +09:00
Tadashi G. Takaoka
0dbf6ab53d
Remove InputMethodInfoCompatWrapper
...
Bug: 6129704
Change-Id: I0eca1ee7d1769ddc44f93c50f0723196299bc6d6
2012-04-02 21:33:49 +09:00
Jean Chalard
bee1a10285
Merge "Fix the regression tests"
2012-04-02 03:30:50 -07:00
Jean Chalard
aff55baf2a
Fix the regression tests
...
Change-Id: I42150fbb05e5b070aca81a36f18fb069d7a8b810
2012-04-02 19:21:45 +09:00
satok
7e518d8b83
Combine candidate words and scores
...
Bug: 5240798
Change-Id: Ie56c1c2cfd7f365e771fee88c1ed15012448feed
2012-04-02 18:39:24 +09:00
Tadashi G. Takaoka
01127fad51
Merge "Tweak keyboard layout size a bit"
2012-04-02 01:50:53 -07:00
Tadashi G. Takaoka
79dcd270e5
Tweak keyboard layout size a bit
...
* Enlarge 3rd row of phone keyboard slightly for nordic and slavic.
* Fixed the width of the first key of each rows on 10 inch tablet.
Change-Id: I5b1936d7f19db30d2f45aff03a255c2a505a2e7f
2012-04-02 17:26:25 +09:00
satok
6747b30a64
Merge "Come back the proximity correction to ExpandableDictionary"
2012-04-02 01:20:26 -07:00
Tadashi G. Takaoka
850f3a8525
Merge "Remove digit and Thai digit more keys from shifted Thai keyboard"
2012-04-02 00:36:39 -07:00
Tadashi G. Takaoka
9d3626ae0b
Remove digit and Thai digit more keys from shifted Thai keyboard
...
Bug: 6070772
Change-Id: I21bc0ad3687899bdfa580e2c5c34df500fc174ea
2012-04-02 16:18:52 +09:00
Tadashi G. Takaoka
d5fcc79e4c
Update Hindi keyboard
...
* Remove "U+090E: DEVANAGARI LETTER SHORT E" from 3rd row
* Remove "U+0946: DEVANAGARI VOWEL SIGN SHORT E" from 3rd row
* Remove digit and Devanagari digit more keys from shifted layout
* Replace digit keys on symbol layout with Devanagari digit keys
* Enlarge 3rd row of phone layout slightly
Bug: 5964777
Change-Id: I2a4f85bf11fbec3820a79a026d95c8f73a9cf604
2012-04-02 16:06:19 +09:00
satok
209dd09e5a
Come back the proximity correction to ExpandableDictionary
...
Bug: 6242539
Change-Id: Ic0467d54c9d85d0653812d4e127328878ef15b94
2012-04-02 15:01:21 +09:00
Ken Wakasa
96fdc4dd84
Remove InputConnectionCompatUtils
...
Also, small cleanup in proguard.flags
bug: 6129704
Change-Id: If4cc694dbe74b26b1d0da301bbc321ee7afc0211
2012-03-31 19:04:38 +09:00
Eric Fischer
57471f59c4
Import translations. DO NOT MERGE
...
Change-Id: Id999b394a37669f66c9860aa5a67ac9ef2ae3d32
2012-03-30 14:41:58 -07:00
Ken Wakasa
672635493e
Remove ArraysCompatUtils
...
bug: 6129704
Change-Id: I0f1a0dee744e6dcdea7ae8606119b4af22b86663
2012-03-30 22:50:53 +09:00
Ken Wakasa
cba3887b2f
Remove the SharedPreferencesCompat class that is unused.
...
bug: 6129704
Change-Id: Ib3f5ce242e016d2ffcefae915a312e5a9aeb9845
2012-03-30 22:40:11 +09:00
Ken Wakasa
376eb52450
Move VibratorCompatWrapper to VibratorUtils.
...
bug: 6129704
Change-Id: Ib63f1ed2d610e27e14957cf8805ef884cae6adf6
2012-03-30 19:23:12 +09:00
Tadashi G. Takaoka
3224878351
Merge "Add language agnostic QWERTY subtype"
2012-03-30 03:03:55 -07:00
Tadashi G. Takaoka
7fbc51965a
Merge "Remove unused resources"
2012-03-30 03:03:51 -07:00
Tadashi G. Takaoka
fb5b4c4fc3
Add language agnostic QWERTY subtype
...
Bug: 6010147
Change-Id: I705e38ac889172ae8b7c2a68e5c688f2ffc28320
2012-03-30 18:20:52 +09:00
Tadashi G. Takaoka
b264de67ea
Remove unused resources
...
Follow up to Ib27f2774
Bug: 6129704
Change-Id: I75b892a5f97270c270441a00f98e6e7ea1abc424
2012-03-30 18:06:09 +09:00
Tadashi G. Takaoka
8d86a47913
Merge "Add "ij" letter to Dutch keyboard"
2012-03-30 01:55:45 -07:00
Tadashi G. Takaoka
8d34d178cb
Add "ij" letter to Dutch keyboard
...
Change-Id: Ie8c2ec66c3e6bd5a95d34b53782cbc45785cd0b7
2012-03-30 17:39:58 +09:00
Ken Wakasa
338ba2a236
Merge "Remove the "deprecated" classes"
2012-03-30 01:36:49 -07:00
Ken Wakasa
911b8f9d19
Remove the "deprecated" classes
...
bug: 6129704
Change-Id: Ib27f2774444e1f084b19be3fe6f56d25dffa7084
2012-03-30 16:20:56 +09:00
Tadashi G. Takaoka
478d3fa8bf
Fix settings key on more keys keyboard
...
Bug: 6260868
Change-Id: I0b8113d283fa5d03a02115cd71a5af511982145a
2012-03-30 16:05:25 +09:00
Tadashi G. Takaoka
989abb1295
Cleanup Slavic keyboard resources
...
* Name keylabel_for string based on layout and position
* Move all default resources to individual donottranslate-morekeys.xml
And empty the default resources. This is much easier to maintain
* Rename scandinavian resource name to nordic
Change-Id: I34c43238d0cc4e9773a6d355f73a1fe11589e23e
2012-03-30 10:32:44 +09:00
Kurt Partridge
0f55e6cbcd
Merge "improve ResearchLogger performance"
2012-03-29 16:14:36 -07:00
Kurt Partridge
347fcab043
improve ResearchLogger performance
...
also demonstrate proposed logpoint invocation
Bug: 6188932
Change-Id: Ib6a7a196fe2e5f8184d26d1e0e3e91b404454112
2012-03-29 15:37:41 -07:00
Eric Fischer
a8ef547d9b
Import translations. DO NOT MERGE
...
Change-Id: Ieca91db4e16672a88d70d2f87d965f5382b18e05
2012-03-29 14:55:22 -07:00
Tadashi G. Takaoka
8acbce1f78
Merge "Separate leftward arrow from "add to dictionary" hint text"
2012-03-29 01:20:07 -07:00
Tadashi G. Takaoka
20b4c223b4
Merge "Fix some obvious compiler warnings"
2012-03-29 00:18:36 -07:00
Tadashi G. Takaoka
499c5e8ad8
Merge "Don't send touch coordinates if proximity characters correction is disabled"
2012-03-29 00:18:28 -07:00
Tadashi G. Takaoka
8dcad2ed47
Don't send touch coordinates if proximity characters correction is disabled
...
Bug: 6225317
Change-Id: I4fa65e020d838f53066d4a071f58fb6f40583e0b
2012-03-29 16:11:54 +09:00
Tadashi G. Takaoka
aaa9e8626a
Merge "Fix race condition while changing the system locale"
2012-03-29 00:10:35 -07:00
Tadashi G. Takaoka
2eb8781dc2
Separate leftward arrow from "add to dictionary" hint text
...
Bug: 6008875
Change-Id: I2be1698e485bc6541163771f41b8b82eaa3cee7a
2012-03-29 15:58:26 +09:00
Tadashi G. Takaoka
c61cd79229
Fix some obvious compiler warnings
...
Change-Id: I10a634f7492b45d5a72345f14d36cf341946387d
2012-03-29 15:07:53 +09:00
Tadashi G. Takaoka
7769b76fc9
Fix race condition while changing the system locale
...
Bug: 6128216
Change-Id: Ie153e3eb18feeb97aada6a7708075f5152f11999
2012-03-29 14:36:45 +09:00
Kurt Partridge
5bf1140207
Merge "make ResearchLogger log write only"
2012-03-28 18:38:57 -07:00
Kurt Partridge
2d9483ff16
make ResearchLogger log write only
...
Bug: 6188932
Change-Id: I8a8f944b1d4ee858d5ecaad0d3adc6dc7af54f68
2012-03-28 17:36:05 -07:00
Tadashi G. Takaoka
bc30f5c1f7
Merge "Change shifted key of quote on AZERTY phone to question mark"
2012-03-28 15:55:01 -07:00
Eric Fischer
fc50a41078
Import translations. DO NOT MERGE
...
Change-Id: I9efc30a04a541a96ddd068d3aa9af8d65b6d7ace
2012-03-28 14:16:46 -07:00
Tadashi G. Takaoka
2b21d68aa9
Change shifted key of quote on AZERTY phone to question mark
...
Bug: 6242861
Change-Id: I8d05d68c2211682d20b0f32966b30212da9f28c7
2012-03-28 22:00:13 +09:00
Jean Chalard
428484d6f9
Merge "Remove useless adding of shortcut as unigrams."
2012-03-28 04:41:05 -07:00
Jean Chalard
e705a122d1
Remove useless adding of shortcut as unigrams.
...
Change-Id: I1f50ebf00d6dd0dad4114fad86ace5b7b304613a
2012-03-28 20:40:38 +09:00
Jean Chalard
aacffad8ef
Merge "Add read support for string shortcuts for makedict."
2012-03-28 04:40:28 -07:00
Jean Chalard
752996540f
Add read support for string shortcuts for makedict.
...
Change-Id: I48ee4fc9ac703ad2a680b3cd848de91c415ea3c8
2012-03-28 20:40:08 +09:00
Jean Chalard
7b49efdea6
Merge "Change the format of the shortcuts in the binary dict."
2012-03-28 04:39:55 -07:00
Tadashi G. Takaoka
a501caa9a5
Merge "Remove SupportTouchPositionCorrection from subtype extra value"
2012-03-28 04:36:27 -07:00
Jean Chalard
3bbb31f3f0
Change the format of the shortcuts in the binary dict.
...
This only includes the write part of the change. The read part is
coming in a different commit.
Change-Id: Iabe7af6cd134462dc19245f5400719920ed31c8f
2012-03-28 20:24:07 +09:00
Tadashi G. Takaoka
e07db71d26
Remove SupportTouchPositionCorrection from subtype extra value
...
Change-Id: Ieedff9ec212f5567405ca276b0f2194132ba7b0c
2012-03-28 19:45:28 +09:00
satok
6ba8de2a60
Good bye the proximity logic in Java code
...
Bug: 4343280
Change-Id: I82f7d08703647a3492ce6e2d3b741146df58927e
2012-03-28 18:42:30 +09:00
satok
67094f5bde
Do not re-calculate primary code in WordComposer
...
Bug: 4343280
Test: Ib43c0f1d1a19d067ea0
Change-Id: I3393a6099cb7fb824994f4656ccfef884f9c6bc4
2012-03-28 17:23:10 +09:00
satok
1551119e06
Merge "Fix AIOOBE"
2012-03-27 21:05:37 -07:00
satok
9611b281e1
Fix AIOOBE
...
Bug: 6236912
Change-Id: Ie09e5ef1c23eb48621ac3f2f2dc28dc2e46ca288
2012-03-28 13:02:14 +09:00
Tadashi G. Takaoka
e354dce078
Shorten maximum keyboard height to 46% of display height
...
Change-Id: Ie71a7c085bfea4d45c078914eace20aa487f5354
2012-03-28 11:25:45 +09:00
Eric Fischer
8d16a0c9a1
Import translations. DO NOT MERGE
...
Change-Id: I5baced3e7a0d3a8721b20d1198bae403e5f8b71d
2012-03-27 14:03:02 -07:00
Ken Wakasa
f71aee8f4f
Tighten up the "define" classes.
...
Change-Id: I854b1dd56b676d0a492a15c16bfe4c6a1bcccdf7
2012-03-27 22:43:25 +09:00
Tadashi G. Takaoka
b10e06feea
Merge "Use FontMetrics.top and padding to place keyHintLetter"
2012-03-27 02:51:02 -07:00
Tadashi G. Takaoka
72fb8e05f9
Use FontMetrics.top and padding to place keyHintLetter
...
Bug: 6225638
Change-Id: Ia3680d84bd1e7ccbdb87aedca106641c6d270677
2012-03-27 17:47:33 +09:00
satok
0a1b00869d
Merge "Put a misspelled flag if the word is not valid by the same logic of Android spell checker."
2012-03-27 01:16:54 -07:00
satok
e0e3e8bb26
Merge "ongoing cleanup 2"
2012-03-27 01:16:48 -07:00
satok
356776a9b7
Put a misspelled flag if the word is not valid by the same logic of Android spell checker.
...
Bug: 6222722
Currently, the flags of the suggestion span from the Latin IME is different from the flags from Android spell checker.
Change-Id: I2f7a54ae0d63235a0b94e039109ab8b2f1311055
2012-03-27 17:11:48 +09:00
satok
01ab7c8b59
ongoing cleanup 2
...
Change-Id: I66b61cbe491cf8375144e834390beae3209a777d
2012-03-27 16:28:48 +09:00
Tadashi G. Takaoka
93070d085d
Merge "Add Icelandic keyboard"
2012-03-26 23:46:31 -07:00
Tadashi G. Takaoka
dd7871b36a
More readable more keys definitions for English keyboard
...
Change-Id: I6fdb818e8dcb1224fa3ae838ab8264fa927fbb50
2012-03-27 14:40:41 +09:00
Tadashi G. Takaoka
5a4f278485
Add Icelandic keyboard
...
Bug: 6150881
Change-Id: I8dedbea96f1bc9de30f5f13b0f3479dd55a33469
2012-03-27 14:26:20 +09:00
Ken Wakasa
b79064cbeb
Merge "Optimization: Start making use of ProductionFlag.IS_EXPERIMENTAL for ResearchLogger"
2012-03-26 20:06:57 -07:00
Ken Wakasa
c166697e3f
Optimization: Start making use of ProductionFlag.IS_EXPERIMENTAL for ResearchLogger
...
Move GodMode specific tests to relevant directories as well.
This goes along with I9dc4d469
Change-Id: I4a21c53846b26eede346cb1da13e6abbdf9ec27f
2012-03-27 11:55:23 +09:00
Eric Fischer
1ebebebc44
Import translations. DO NOT MERGE
...
Change-Id: Icbb05d5cbdfae8509610cd8270198181499e46ab
2012-03-26 14:42:41 -07:00
Tadashi G. Takaoka
82e43549e4
Merge "Fix Farsi keyboard"
2012-03-26 06:01:01 -07:00
Tadashi G. Takaoka
58d28b1ec9
Fix Farsi keyboard
...
Bug: 5456620
Change-Id: Ia54f084fbc7a238aeda1df234c723d9e675ce62f
2012-03-26 21:44:48 +09:00
satok
2ac1fad645
Merge "Add a flag file for the experimental mode"
2012-03-26 04:53:49 -07:00
Tadashi G. Takaoka
7409717648
Merge "More readable currency symbol representation"
2012-03-26 04:20:17 -07:00
satok
9b2f77f2b1
Add a flag file for the experimental mode
...
Change-Id: I880b7c85dbc20f8d7590b7f65b5f898bfb2266f9
2012-03-26 18:52:46 +09:00
Tadashi G. Takaoka
41b33149ea
More readable currency symbol representation
...
Change-Id: Ifc3dc29ba3b827c3a81acf432b04ac02c79207a2
2012-03-26 18:21:48 +09:00
Jean Chalard
d2cd3d54f9
Merge "Split a method for reuse"
2012-03-26 02:12:20 -07:00
Kurt Partridge
400ff86c7b
Merge "add tests for ResearchLogger"
2012-03-26 01:49:09 -07:00
Kurt Partridge
2482e6c386
add tests for ResearchLogger
...
Bug: 6188932
Change-Id: Icf407f9d145d2b25b70d5d7bc30ee3d64561620c
2012-03-26 17:21:50 +09:00
Jean Chalard
8403611960
Split a method for reuse
...
Change-Id: I9a82e538903f05bedad51bc195866abbd9daf957
2012-03-26 16:34:29 +09:00
Tadashi G. Takaoka
8574644009
Add missing ZWNJ icon for tablets
...
Follow up to I7238f41c.
Bug: 5456620
Change-Id: I3492b38102ecc5af7fc8cddedff1f0319672e3fe
2012-03-26 16:04:47 +09:00
Tadashi G. Takaoka
27bb631f4c
Merge "Add ZWNJ and ZWJ icons"
2012-03-25 23:46:29 -07:00
Tadashi G. Takaoka
39390d3f94
Add ZWNJ and ZWJ icons
...
Bug: 5456620
Change-Id: I7238f41c841803746ca2ab6cd332b2be8498a3ee
2012-03-26 13:05:29 +09:00
Tadashi G. Takaoka
99eb2d3404
Merge "Convert dimension unit "in" and "mm" to "dp""
2012-03-25 20:21:00 -07:00
Tadashi G. Takaoka
ef6034e7da
Merge "Fix Thai Keyboard"
2012-03-25 20:20:45 -07:00
Tadashi G. Takaoka
8af62c23ee
Fix Thai Keyboard
...
Bug: 6070772
Change-Id: I0bda4032825cb8bac17d9f800346a77f6903fd30
2012-03-26 10:52:40 +09:00
Jean Chalard
a77bbc64f0
Merge "Correct a shaky processing and move it to a better place"
2012-03-25 17:57:49 -07:00
Kurt Partridge
e327628855
update ResearchLogger times to report SystemClock.uptime()
...
Bug: 6188932
Change-Id: I852537caed46958e4d9c3251664edaa69652205c
2012-03-24 22:41:11 +09:00
Kurt Partridge
d05afa3f4c
move usability log code to new class (ResearchLogger) and clean api
...
This change also undoes the effects of I8694eb9016, which was an initial
effort built on Utils.UsabilityStudyLogs. Now Utils operates as it did
previously, for backward compatibility, but the ResearchLogger retains
the new log format.
Coordinated with I274b75c5.
Bug: 6188932
Change-Id: I41208bdc6b511f69a010c9fc38a936521beba7d5
2012-03-24 20:14:42 +09:00
Jean Chalard
08baf5ff8e
Merge "Fix a native crash"
2012-03-23 06:40:50 -07:00
Jean Chalard
b0b89c87f6
Fix a native crash
...
-1 & 0xFFFF is 65536 :p
Change-Id: I8ecb882b6d6c5bcc91b52e23eb9cc02b04fcdd34
2012-03-23 22:36:00 +09:00
Tadashi G. Takaoka
fce9ca4202
Merge "Remove verbose debug message"
2012-03-23 06:25:13 -07:00
Tadashi G. Takaoka
61f24842c7
Remove verbose debug message
...
Change-Id: I05bfe24228a6fbe806987d2a0d81e59611c3b476
2012-03-23 22:23:56 +09:00
Jean Chalard
380ad509e6
Merge "Optimization and typo fix"
2012-03-23 06:20:58 -07:00
Tom Ouyang
b163f91621
Merge "Add support for updating and adding bigrams to existing nodes."
2012-03-23 05:57:55 -07:00
Tom Ouyang
7cfe20efbe
Add support for updating and adding bigrams to existing nodes.
...
Bug: 6188977
Change-Id: I48aca8ba199247d73395ab13b9d1976f4e739208
2012-03-23 21:52:39 +09:00
Jean Chalard
71f9d30b18
Correct a shaky processing and move it to a better place
...
The old code would remove caps from the first letter if
auto-capsed but that makes very little sense when the word
is camel-cased. Also, it would not correctly handle
surrogate pairs, and would require a direct reference to
LatinIME and a specific method to do the processing in an
unexpected place.
Change-Id: I416d6a805242788a2473f007ca7452c9fe3f5205
2012-03-23 21:40:07 +09:00
Jean Chalard
3ee7d97587
Optimization and typo fix
...
Change-Id: Iafa414b8bcf2cca4569b3753bfac58f301a72269
2012-03-23 21:29:30 +09:00
Tadashi G. Takaoka
9c6d9a56ad
Merge "Smaller gap for Thai 5 rows keyboard"
2012-03-23 05:23:08 -07:00
Tadashi G. Takaoka
2a04637f60
Convert dimension unit "in" and "mm" to "dp"
...
Bug: 6183561
Change-Id: I06d74705fd49566684815853b8f2df7b5a9f9d7e
2012-03-23 21:21:26 +09:00
Tadashi G. Takaoka
ad29273553
Merge "Override the keyboard height per device"
2012-03-23 05:19:36 -07:00
Tadashi G. Takaoka
e49a987c23
Override the keyboard height per device
...
Bug: 6183561
Change-Id: I7432552fbe41212e8f412962b16877a2af07eb9c
2012-03-23 21:17:05 +09:00
Tadashi G. Takaoka
e0c965dbbd
Smaller gap for Thai 5 rows keyboard
...
Change-Id: Ib7239a3d06db7154fb0fb506fcc64805c18a6787
2012-03-23 20:12:47 +09:00
satok
8980bd4a25
Merge "Cleanup jni 1"
2012-03-23 03:24:08 -07:00
satok
9df4a4527a
Cleanup jni 1
...
Change-Id: Ieb6af8385356e259720b50f1fe46a694a098b30f
2012-03-23 19:03:20 +09:00
Jean Chalard
c4f69e7d68
Merge "Stop creating useless objects"
2012-03-23 02:56:10 -07:00
Jean Chalard
0e134a4477
Merge "Small optimization"
2012-03-23 02:47:54 -07:00
Jean Chalard
85594cb7df
Merge "Add processing for French ligatures."
2012-03-23 02:44:35 -07:00
Jean Chalard
a492790982
Stop creating useless objects
...
Man that was bad, it's heavy, it's called quite often, and it's
totally useless
Change-Id: Ia7e23e0e60ff4a929b226f3f4ccabedbc3ea2c06
2012-03-23 17:55:11 +09:00
Jean Chalard
e5f02cff7a
Small optimization
...
Change-Id: I5dd7c848f2aaec20325e7ee85f27e282e1ba7a85
2012-03-23 17:03:55 +09:00
Jean Chalard
cc78d03a62
Add processing for French ligatures.
...
Bug: 5140033
Change-Id: I1c2751fc617e662aad9f67506e28a622f81d0bc9
2012-03-23 16:50:59 +09:00
Tadashi G. Takaoka
3d3ee645cc
Merge "Support Thai Keyboard"
2012-03-23 00:39:48 -07:00
Tadashi G. Takaoka
5f32a47e45
Support Thai Keyboard
...
Bug: 6070772
Change-Id: Ib7078d062801e17db500f0cd0b4b53d5433b75d1
2012-03-23 16:29:44 +09:00
Ken Wakasa
066866954a
Add a missing comparison in Word.equals()
...
Follow up to I94e2e29c
bug: 6209651
Change-Id: Iff2daca8c2678e2d1796f98d6db738f109e3d03f
2012-03-23 14:41:16 +09:00
Ken Wakasa
6ef88a8901
Merge "Add missing Word.hashCode()"
2012-03-22 22:11:51 -07:00
Ken Wakasa
9f0ea52a5d
Add missing Word.hashCode()
...
Some cleanups too.
bug: 6209651
Change-Id: I94e2e29c92e90e554e4952d277d590e093766c4f
2012-03-23 13:11:39 +09:00
Jean Chalard
081616cd2f
Send correct coordinates for the spell checker
...
This results in the computation being done in native code
and the correct proximity being used.
Bug: 6181080
Change-Id: I08fa05c781d607e4feca2caeda353ec19c133a3d
2012-03-23 13:02:58 +09:00
Jean Chalard
e7cfe43652
Merge "Don't rely on spell checker proximity in tests"
2012-03-22 02:15:29 -07:00
Jean Chalard
8e31d76983
Merge "Make some constants more explicit."
2012-03-22 02:15:21 -07:00
Jean Chalard
109728193e
Don't rely on spell checker proximity in tests
...
This fixes the input logic tests that were broken and suppresses
their dependency upon the spell checker proximity. Instead, it
gets the Keyboard instance from Latin IME and uses the actual
coordinates, which results in a test run closer to what actually
happens during typing.
Change-Id: I3a81d249ee7fb3ac6ae6940aa2e8b2421e829e5c
2012-03-22 18:08:23 +09:00
Tadashi G. Takaoka
9835808e83
Merge "Use ObjectAnimator"
2012-03-22 01:39:01 -07:00
Tadashi G. Takaoka
9a964ed595
Fix shift locked keyboard layouts of caseless scripts
...
The scripts/languages such as Georgian, Hndi have no notion of case.
In such scripts/language, shift locked keyboard should be the same of
manually shifted keyboard.
Change-Id: Iadea3a332674a52188de7f1566727e4b56dced8c
2012-03-22 16:46:24 +09:00
Jean Chalard
330cd291fa
Make some constants more explicit.
...
This wasn't very obvious, but the actual values are critical, so
make it more readable
Bug: 6181080
Change-Id: I07461d2df4c796dad0cb6f5283e41a28036d023c
2012-03-22 14:28:05 +09:00
Tadashi G. Takaoka
31c94cea82
Use ObjectAnimator
...
Bug: 6187069
Change-Id: I7df18b470b7e746da601fab3311fb4b086f40d41
2012-03-22 12:44:46 +09:00
Kurt Partridge
19b8a73efa
Merge "log through group level abstractions"
2012-03-21 20:30:35 -07:00
Kurt Partridge
fdd68f0657
log through group level abstractions
...
For the groups:
- LogGroup.MOTION subfields now deteremined in Utils.writeMotionEvent() rather
than in LatinKeyboardView.processMotionEvent()
- LogGroup.KEY is now logged throguh LatinIME.onCodeInput() rather than
Utils.push(). This catches keys more generally, including modifiers, and
records touch positions for everything. Removed now-redundant
Utils.writeBackspace() and Utils.writeChar().
- LogGroup.CORRECTION uses Utils.writeCorrection(), and formats instead of
leaving this to callers.
- LogGroup.STATE_CHANGE uses Utils.writeStateChange(). Optional fields are
still left to callers, as this group has more variety.
Formats have changed to incorporate new fields.
Minor housekeeping:
ENABLE_USABILITY_STUDY_LOG constants replaced with variable references, as
the logging feature can be changed in Settings and therefore dynamically
changes.
New log format:
20120322-111203.621+0900 1332382323621 s [onStartInputView] com.socialnmobile.dictapps.notepad.color.note 2131624043 147457 1140850694
20120322-111204.912+0900 1332382324912 m [Down] 2782355 0 243 171 0.5666667 0.895
20120322-111204.975+0900 1332382324975 m [Move] 2782419 0 240 171 0.6 1.17
20120322-111204.983+0900 1332382324983 m [Move] 2782428 0 238 171 0.6 1.1899999
20120322-111204.992+0900 1332382324992 m [Move] 2782437 0 236 171 0.6 1.1899999
20120322-111205.002+0900 1332382325002 m [Move] 2782446 0 232 170 0.6 1.1899999
20120322-111205.012+0900 1332382325012 m [Move] 2782456 0 227 169 0.6 1.125
20120322-111205.021+0900 1332382325021 m [Move] 2782465 0 224 168 0.6 1.125
20120322-111205.031+0900 1332382325031 m [Move] 2782475 0 221 167 0.6 0.895
20120322-111205.040+0900 1332382325040 m [Move] 2782483 0 213 164 0.6 0.58
20120322-111205.047+0900 1332382325047 m [Up] 2782491 0 213 164 0.6 0.58
20120322-111205.052+0900 1332382325052 k 'D' 243 171
20120322-111205.228+0900 1332382325228 m [Down] 2782622 0 171 71 0.6333334 1.275
20120322-111205.243+0900 1332382325243 m [Move] 2782677 0 178 69 0.6333334 1.275
20120322-111205.325+0900 1332382325325 m [Up] 2782750 0 178 69 0.6333334 1.275
20120322-111205.333+0900 1332382325333 k 'e' 171 71
20120322-111205.509+0900 1332382325509 m [Down] 2782936 0 265 139 0.53333336 0.885
20120322-111205.512+0900 1332382325512 m [Move] 2782954 0 265 141 0.53333336 1.04
20120322-111205.552+0900 1332382325552 m [Move] 2782973 0 265 143 0.5666667 1.14
20120322-111205.663+0900 1332382325663 m [Up] 2783102 0 265 143 0.5666667 1.14
20120322-111205.668+0900 1332382325668 k 'f' 265 139
20120322-111206.140+0900 1332382326140 m [Down] 2783584 0 348 352 0.53333336 0.675
20120322-111206.206+0900 1332382326206 m [Move] 2783648 0 348 354 0.5666667 0.73499995
20120322-111206.223+0900 1332382326223 m [Move] 2783666 0 348 356 0.5666667 0.545
20120322-111206.232+0900 1332382326232 m [Up] 2783674 0 348 356 0.5666667 0.545
20120322-111206.236+0900 1332382326236 k ' ' 348 352
20120322-111206.245+0900 1332382326245 c [----] Def -1
Bug: 6188932
Change-Id: Iea46a0c683f858b72005b8e81191ef1d70262dca
2012-03-22 12:02:10 +09:00
Ken Wakasa
2aa02b84a4
Revive the Makefile for makedict
...
Follow up to I4d2ef504. Address a compiler warning and a small optimization as well.
bug: 6188977
bug: 6209651
Change-Id: Ibc9da51d48ebf0b8815ad0bb2f697242970ba8f7
2012-03-22 11:55:18 +09:00
Eric Fischer
2e66afcc10
Import translations. DO NOT MERGE
...
Change-Id: Iea3ffbd477e54bbccd65266ce4e070efb7a8c3fc
2012-03-21 14:05:45 -07:00
Eric Fischer
96b05034d5
Merge "Move locale-specific configuration out of config.xml."
2012-03-21 09:20:16 -07:00
Tom Ouyang
7ac556216d
Merge "Move makedict to LatinIME android keyboard."
2012-03-21 05:50:28 -07:00
Kurt Partridge
221dd3d183
Merge "Add additional structure to output logs to group entries by optional fields."
2012-03-21 05:50:01 -07:00
Tadashi G. Takaoka
4897df803d
Merge "Refactor key drawing code in KeyboardView"
2012-03-21 04:31:55 -07:00
Tadashi G. Takaoka
72913f97ed
Refactor key drawing code in KeyboardView
...
Change-Id: Ic7af05caee32eb6cba68d27ba4e2d9072472b34d
2012-03-21 20:29:51 +09:00
Tadashi G. Takaoka
4cc44f9f77
Merge "Refactor to memorize device dependent override parameters"
2012-03-21 04:26:39 -07:00
Tadashi G. Takaoka
26e7ce1fa8
Merge "Use "dp" instead of "dip""
2012-03-21 04:05:21 -07:00
Kurt Partridge
78bf41b89c
Add additional structure to output logs to group entries by optional fields.
...
The new format has time, time as int, and the new logGroup code
(m=motionEvent, k=key, s=statechange, c=correction)
followed by additional text whose format depends on the logGroup code.
The additional text will be cleaned up in later CL's.
20120321-170548.067+0900 1332317148067 m
[Down]143116235,0,691,378,0.40000004,0.435
20120321-170548.133+0900 1332317148133 m
[Up]143116302,0,691,378,0.40000004,0.435
20120321-170548.146+0900 1332317148146 k <enter> 691 378
20120321-170602.485+0900 1332317162485 s
[onStartInputView]com.socialnmobile.dictapps.notepad.color.note,2131624043,147457,1140850694
20120321-170606.508+0900 1332317166508 m
[Down]143134679,0,40,154,0.4666667,0.64
20120321-170606.567+0900 1332317166567 m
[Move]143134723,0,42,154,0.4666667,0.765
20120321-170606.577+0900 1332317166577 m
[Move]143134746,0,44,154,0.4666667,0.775
20120321-170606.652+0900 1332317166652 m
[Up]143134824,0,44,154,0.4666667,0.775
20120321-170606.662+0900 1332317166662 k A 40 154
20120321-170607.200+0900 1332317167200 m
[Down]143135372,0,411,390,0.53333336,0.585
20120321-170607.311+0900 1332317167311 m
[Up]143135483,0,411,390,0.53333336,0.585
20120321-170607.313+0900 1332317167313 c [----]A
Bug: 6188932
Change-Id: I8694eb9016d8cf0389ef582f6c7d2820aa4d2c92
2012-03-21 19:41:10 +09:00
Tom Ouyang
e276c2401e
Move makedict to LatinIME android keyboard.
...
Bug: 6188977
Change-Id: I4d2ef504bb983abbda3cb52ee450cb46f58d95cf
2012-03-21 19:30:26 +09:00
Tadashi G. Takaoka
3d2ab10d99
Merge "Use "dp" instead of "sp""
2012-03-21 03:29:49 -07:00
Tadashi G. Takaoka
7c38b73ff2
Use "dp" instead of "dip"
...
Change-Id: Iaab1032a0ce0f97742288e76221433ef400e4b4f
2012-03-21 19:08:58 +09:00
Tadashi G. Takaoka
a6dd0c2761
Use "dp" instead of "sp"
...
Change-Id: I772d117d88eb7361d8695c4d97c051f0c7397df8
2012-03-21 18:56:09 +09:00
Tadashi G. Takaoka
624f1bab39
Refactor to memorize device dependent override parameters
...
Change-Id: I79482a8ef3846525669979a30dec183ea18138b5
2012-03-21 18:20:18 +09:00
Jean Chalard
32aac4777f
Merge "Correctly close the gzip stream"
2012-03-21 01:32:07 -07:00
Jean Chalard
bc89f5d3a5
Correctly close the gzip stream
...
I had gotten the chain call in reverse.
Bug: 6177523
Change-Id: Ic5b76425de2d5d05d5132f8d2c7ade0d79c14ccc
2012-03-21 17:28:37 +09:00
Jean Chalard
f5f53c2fa6
Merge "Strengthen java code against bad returns from native"
2012-03-21 00:54:25 -07:00
Jean Chalard
6ca3ac08ed
Strengthen java code against bad returns from native
...
This doesn't really fix the following bug but it may alleviate
the symptoms
Bug: 6191885
Change-Id: I0de3f550cc7c6cdf79b291399785ad31b205d2ac
2012-03-21 16:40:26 +09:00
Kurt Partridge
140467b8b6
Updated logger to record touch position within backspace key events.
...
Bug: 6188932
Change-Id: Ida2aff618153792f9803f30f1251d67c89af1fe0
2012-03-20 23:29:34 +09:00
Eric Fischer
4216350a2a
Move locale-specific configuration out of config.xml.
...
Having it in a translatable file would sometimes cause the translation
importer to try to replace the locale-specific configuration file.
Change-Id: Ib450454b63c1a4de8b85905561a59224b9410147
2012-03-19 09:22:37 -07:00
satok
1fe943aabd
Merge "Cleanup proximity related code"
2012-03-19 02:40:25 -07:00
satok
728d1c884e
Cleanup proximity related code
...
Bug: 4343280
Change-Id: I57c0f9e20d9d8911009ea97057251a7f7a81512f
2012-03-19 18:33:59 +09:00
satok
546b8275ab
Merge "Add a dummy file and package for make dict"
2012-03-19 02:01:05 -07:00
Kurt Partridge
6d7e0a876b
Merge "Fix TAG name"
2012-03-19 00:52:44 -07:00
Kurt Partridge
9a50777890
Fix TAG name
...
Change-Id: Ibea065bc72e6b5e40cfa3ffa2fb6bcdeb107ffc4
2012-03-19 16:11:17 +09:00
satok
905670bd87
Add a dummy file and package for make dict
...
Change-Id: I195fd42f2a773bcc6fab0a61336a1c15d97902bb
2012-03-19 15:26:13 +09:00
satok
f9c2773b09
Merge "Make the primary character stable"
2012-03-18 22:01:50 -07:00
satok
d6d0f6976c
Make the primary character stable
...
Bug: 4343280
Change-Id: I3e6eaa3803dc32a837825f3a64403430721b6192
2012-03-19 12:49:16 +09:00
Jean Chalard
9ffb94fa13
Rename the user history dictionary.
...
UserBigramDictionary -> UserHistoryDictionary.
Also update all methods, strings and comments, except those needed
for backward compatibility (which only include the name of the
database file).
Change-Id: I0bccea29880dc566b90100575b83baaa947b03ae
2012-03-19 12:03:51 +09:00
Ken Wakasa
660776e09b
Small performance improvement by removing interface accesses.
...
Change-Id: I6d91f3b086470b79306dbe2874db9748b9e0eb5f
2012-03-17 01:53:51 +09:00
satok
cbb5053b6c
Fix NPE
...
bug: 6181736
Change-Id: I6522f19555c27f33c9ff4eaa8b2559a51a38f015
2012-03-17 01:37:53 +09:00
satok
a50a34f8b4
Merge "Calculate proximity characters in the native code"
2012-03-16 01:38:07 -07:00
satok
1caff47ecd
Calculate proximity characters in the native code
...
Bug: 4343280
Change-Id: I6adaf560f7a4f1f96dcb6ec2f61f20ee3001167e
2012-03-16 17:26:36 +09:00
Tadashi G. Takaoka
6024e84739
Merge "Support preliminary Hindi Keyboard"
2012-03-16 01:12:37 -07:00
Jean Chalard
d0d25ac8ec
Merge "Remove UserUnigramDictionary."
2012-03-16 01:11:52 -07:00
Jean Chalard
f73efa9077
Merge "Move the UserUnigramDictionary functionality over"
2012-03-16 01:05:10 -07:00
Tadashi G. Takaoka
53eca32f9e
Support preliminary Hindi Keyboard
...
Bug: 5964777
Change-Id: Id12c75966f6302e6f4ebbd4a8f474e05c601c88a
2012-03-16 17:04:58 +09:00
Jean Chalard
7dcbed04d9
Remove UserUnigramDictionary.
...
This isn't used any more.
Change-Id: Ie63ae621bcac9342b869b9f236f35bf66ec3a09b
2012-03-16 17:04:41 +09:00
Jean Chalard
c68d1bbfaf
Move the UserUnigramDictionary functionality over
...
UserBigramDictionary now assumes both functionalities. It will
be renamed to UserHistoryDictionary in a future change.
There are several reasons to do this. First, there is a lot of
duplicate code in User{Unigram,Bigram}Dictionaries that are
factored by the few lines of code in this change. Also, other
dictionaries like BinaryDictionary or ContactsDictionary all
assume both responsibilities, as should be the case
theoretically.
It is also possible to do this because previous versions don't
write any unigram data that we'd want to reuse. For even older
versions that do write data, we can't really make any sense out
of it. Bigram data however can be useful, and this allows us to
reuse it easily.
Change-Id: I755525f92744e1536eaef097527e8151b7859a30
2012-03-16 17:01:57 +09:00
Tadashi G. Takaoka
9945f36406
Merge "Don't reset animation alpha value when keyboard is set"
2012-03-15 21:12:49 -07:00
satok
c59e383977
Merge "Do not change the proximity orders"
2012-03-15 21:09:46 -07:00
satok
ef08daddea
Do not change the proximity orders
...
Bug: 4343280
Change-Id: I4e2dfb00d9c843a8a285d409ac5ab8fca5fb1694
2012-03-16 12:54:17 +09:00
Jean Chalard
c24f66e180
Streamline some user history dictionary code
...
A lot of things don't really make sense in the old code.
Let's streamline it for now so that we have a cleaner interface
to work with. This is preliminary work for bug 4192129.
Change-Id: If01a5974cfadc43afced610c57fcf7fde67c1346
2012-03-16 12:22:39 +09:00
Tadashi G. Takaoka
b9720a55b4
Don't reset animation alpha value when keyboard is set
...
The keys' blinking that mentioned in the bug is caused by switching
keyboard layout resets the animation's alpha value to opaque but the
animation is still running and changing the alpha value
asynchronously.
I think that switching keyboard layout between alphabet and symbols
doesn't imply that the user stops typing. So the keyboard view should
continue typing state timer to keep animations' alpha values changing
and never reset the value.
Bug: 6174273
Change-Id: Id795feaf44750358f30c1b3dc8e783a7e62aefe8
2012-03-16 10:08:48 +09:00
Eric Fischer
40a50ad738
Import translations. DO NOT MERGE
...
Change-Id: I128134e201273b00478beb3d091952dd5530230c
2012-03-15 15:13:26 -07:00
Tadashi G. Takaoka
5bee1b00c8
Merge "Remove touch dead zone"
2012-03-15 05:16:56 -07:00
Tadashi G. Takaoka
723aaa2eeb
Remove touch dead zone
...
KeyDetector should use the distance from the hit box to detect the
key.
Bug: 6174250
Change-Id: Id1745d90222d1d1a10467f194b45307c12449944
2012-03-15 20:16:43 +09:00
Jean Chalard
3fe263fac6
Extract an annoying method call
...
Change-Id: I78f22bb38222fea54a55e460fcf728bf941d15e9
2012-03-15 19:30:15 +09:00
Jean Chalard
6ec1209a33
Fix a bug where quotes and dashes are considered letters
...
Bug: 6174065
Change-Id: I702760d44ead0eeb60d06360aa3bb03c2ec73325
2012-03-15 18:18:52 +09:00
Jean Chalard
2be7a37acf
Small cleanup
...
Exit-fast, update comment, make a method private
Change-Id: Id103bf03aeef43a1a4d064ecabb819490dc5d39a
2012-03-15 15:54:25 +09:00
Jean Chalard
7c5f2bbd2a
Remove useless code
...
I tracked all the calls to the constructor, and the passed
list is never null. It's also final, so it's safe.
Change-Id: I320f907acee0b237bb286a9a183c18106809174a
2012-03-15 15:10:07 +09:00
Jean Chalard
042557b45b
De-duplicate a method
...
Change-Id: Ia1c80eeff00a55573bb311f07e1275da23bdcf98
2012-03-15 15:04:29 +09:00
Jean Chalard
e8ddfe4273
Remove useless code
...
Change-Id: I58de87c1ba4cd1130419191f63ff83b685604356
2012-03-15 14:51:22 +09:00
Jean Chalard
4e74658883
Optimization
...
All calls to this methods are made with an actual String. No sense
beating ourselves with an interface stick.
Change-Id: I6ef98286be6f81f73864b04f3a17e68f36a6e542
2012-03-15 14:48:47 +09:00
Jean Chalard
123407261c
Stop meaningless explicit null passing
...
Change-Id: I6950897d262f610d502b7f8293b9dd8d2b53e6e8
2012-03-15 14:37:40 +09:00
Jean Chalard
3187ba5dfe
Remove a now-useless flag.
...
This has been moved to the SuggestedWords object and is now
represented by a single flag instead of a flag in each suggestion.
Change-Id: I6e9a7cff5a7701de7e61b4de13baac25c9a87b1b
2012-03-15 14:21:02 +09:00
Jean Chalard
4f6cf258fe
Use the unique flag in SuggestionsView
...
Also, the first word in a sugestions list can never be
obsolete.
Change-Id: Ib21439aac8db4e6ce5b15b7a2aabe4222bc354db
2012-03-15 14:11:41 +09:00
Jean Chalard
03a3517075
Add info for obsolete suggestions in SuggestedWords
...
Change-Id: I9684c7b08244b34853ce8a99b6e9d885389f6687
2012-03-15 13:12:08 +09:00
Jean Chalard
5f9593593e
Remove useless stuff
...
Change-Id: I43dae30774c40a9d6e7396f8fa73ed4b82a7c777
2012-03-15 12:47:05 +09:00
Jean Chalard
ca3e7cbdf4
Move a computation closer to where it's used.
...
Change-Id: I5aee4c36ceaacbb1dbfc47c011f1e4aec4b9dca6
2012-03-15 12:23:16 +09:00
Jean Chalard
eb5ffdac90
Merge "Some readability improvement"
2012-03-14 18:47:32 -07:00
Jean Chalard
c787db51ed
Merge "Cut out a private method to make things more readable"
2012-03-14 18:47:26 -07:00
Jean Chalard
b9a5cb77f0
Merge "Minor optimization"
2012-03-14 18:47:21 -07:00
Jean Chalard
53d57ad6d3
Merge "Some code simplification"
2012-03-14 18:47:16 -07:00
Eric Fischer
03bcc5faff
Import translations. DO NOT MERGE
...
Change-Id: I792cacc137b1b782c28b258bf91bf475bd0ced89
2012-03-14 14:45:18 -07:00
satok
05c54ffc7f
Merge "Really pass the y - touch correction to the native code"
2012-03-14 06:47:19 -07:00
satok
853d9020ed
Really pass the y - touch correction to the native code
...
Bug: 4343280
Test: I11f8518d9ee
Change-Id: I4b90bdffffed9736af223ac83c1a54019add70bb
2012-03-14 21:54:52 +09:00
Tadashi G. Takaoka
6bc9186457
Disabled key should respond if it is in the altCodeWhileTyping state
...
Bug: 6128215
Change-Id: I81e9980f8ffa5c5eaba30676c8433f542645de1d
2012-03-14 20:17:42 +09:00
Tadashi G. Takaoka
3848ca6729
Merge "Gray out "alt-code-while-typing" key icon while typing"
2012-03-14 03:36:56 -07:00
Tadashi G. Takaoka
73a46bfeb7
Gray out "alt-code-while-typing" key icon while typing
...
Bug: 6128215
Change-Id: Ie9c13d9d38aad6e92cc465e22f3ef20c80e0a36a
2012-03-14 19:36:24 +09:00
Tadashi G. Takaoka
b8c471af47
Merge "Fix SuggestedWords.toString"
2012-03-14 03:28:22 -07:00
Tadashi G. Takaoka
ea51bfd8a8
Fix SuggestedWords.toString
...
Change-Id: Ide3f605ce40e8c230f217bbf37ab016457ee91f1
2012-03-14 19:23:15 +09:00
satok
2d5c40d873
Send key information even when the touch position correction is not triggered.
...
Bug: 4343280
Change-Id: Id24935f9f0f66ebaa799bb92537d842033427c4c
2012-03-14 19:01:08 +09:00
Tadashi G. Takaoka
02e70cf999
Merge "Use HashSet to hold keys in Keyboard"
2012-03-14 02:54:21 -07:00
Tadashi G. Takaoka
a5f7969f5b
Use HashSet to hold keys in Keyboard
...
This partially reverts Ie0554362.
Change-Id: I0de971c5efb4e8eb093be2a0793a08bd79baee22
2012-03-14 18:51:01 +09:00
Jean Chalard
271e5b6cb7
Some readability improvement
...
In-place replacements of visibly identical things.
Change-Id: I02b51bd7f63597e3428f0650b239e9a39ef5a7c7
2012-03-14 18:50:08 +09:00
Jean Chalard
0d0f182959
Cut out a private method to make things more readable
...
Change-Id: I791700890338e023bd86b8794dbc90379b91dc7d
2012-03-14 18:43:32 +09:00
Jean Chalard
ac5e463402
Minor optimization
...
We know the size in advance, this may save a few allocations
Change-Id: I2fb9a725f34ba2da4f34ed335652f10447d5d166
2012-03-14 18:35:07 +09:00
Jean Chalard
def4551c2a
Some code simplification
...
Just write the same thing in a more succint manner
Change-Id: I08a2c5edd52a3502914541061fd5b6ee7a92ebc4
2012-03-14 18:33:57 +09:00
Jean Chalard
4a08b2f0e4
Cleanup & optimization
...
Renaming some variables, and obvious optimizations.
Change-Id: Ib716748e9f3d602cf276dcd4e73f3bcfb819585e
2012-03-14 18:29:06 +09:00
Jean Chalard
f985efe39c
Remove a useless parameter
...
Change-Id: I03005240238fb004c20b2df0d836796e2e8b307f
2012-03-14 18:12:12 +09:00
Jean Chalard
bdf6d1b18b
Remove a useless method
...
Change-Id: I208dd2e725e37c2fb3cd51fe48194679e5912f6b
2012-03-14 15:59:04 +09:00
Jean Chalard
eda7d8af60
Remove the Builder
...
Change-Id: Idef22e6a82d59e3ec95b95ad237debcb07daf000
2012-03-14 15:42:26 +09:00
Jean Chalard
33cc825374
Match the constructor of SuggestedWords to the Builder call.
...
We have to match one way or another, and the argument order to the
Builder call is more logical.
Change-Id: Iac7c3a351c2687cb294d6a4924fd9cb20ca95177
2012-03-14 15:42:22 +09:00
Jean Chalard
7d55c891af
Make the Builder private
...
Change-Id: I2184084f4b7729c4324f8291d548bd4c4c2872a1
2012-03-14 15:42:14 +09:00
Jean Chalard
5b0643f50d
Re-sequence the last calls to build()
...
Change-Id: If77ee5aa9483d3ca03c52812f31665dee6468e99
2012-03-14 14:19:24 +09:00
Jean Chalard
d42b0238f9
Merge "Move up the static methods of the Builder"
2012-03-13 21:22:22 -07:00
Jean Chalard
7d384c73da
Merge "Kill the last place where the Builder was being used"
2012-03-13 21:22:03 -07:00
Jean Chalard
88bf1ba526
Move up the static methods of the Builder
...
Change-Id: Ic3e07b745b7b24cae0f772ea49e0de615b44caf9
2012-03-14 13:10:22 +09:00
Jean Chalard
8e19b1183e
Kill the last place where the Builder was being used
...
I had missed that one
Change-Id: I9a5040a7a61e294396aa424de96a69dbb15f037a
2012-03-14 13:10:12 +09:00
Tadashi G. Takaoka
f147da0436
Merge "Use XML animator definition"
2012-03-13 21:10:08 -07:00
Tadashi G. Takaoka
d7c4ba1709
Use XML animator definition
...
Change-Id: Ic2f6d3f8fdd2c0b0a00f004f49f95b00d474ee4b
2012-03-14 13:08:27 +09:00
Tadashi G. Takaoka
0bae6abffd
Merge "ZWNJ key on Persian shouldn't be altCodeWhileTyping key"
2012-03-13 20:35:25 -07:00
Jean Chalard
7b2d6a8f98
Merge "Make the Builder fully immutable at last"
2012-03-13 20:30:16 -07:00
Jean Chalard
76e3861981
Merge "Straighten out the last bastion of the Builder"
2012-03-13 20:23:16 -07:00
Jean Chalard
febf9929ca
Merge "Add to SuggestedWords a missing parameter, and use it."
2012-03-13 20:15:34 -07:00
Tadashi G. Takaoka
f71c2cfb65
ZWNJ key on Persian shouldn't be altCodeWhileTyping key
...
Change-Id: I69301a2c61c2e465058309337672f983669e7967
2012-03-14 10:27:02 +09:00
Tadashi G. Takaoka
9319e94606
Merge "Support Persian Keyboard"
2012-03-13 17:39:58 -07:00
Eric Fischer
c56ef928d5
Import translations. DO NOT MERGE
...
Change-Id: I23a7371b635d689966afe63c2c1e42032579a193
2012-03-13 15:42:07 -07:00
Tadashi G. Takaoka
82793f2f85
Merge "Avoid using interface member, use concrete collection class instead"
2012-03-13 06:25:39 -07:00
Tadashi G. Takaoka
ce96959518
Avoid using interface member, use concrete collection class instead
...
Change-Id: I8b647e8c260aec58c557ce07f3a2d8987c24d7be
2012-03-13 22:20:34 +09:00
Tadashi G. Takaoka
0bd4699f9c
Merge "Update other alt keys' graphics"
2012-03-13 06:19:53 -07:00
Tadashi G. Takaoka
faad353fea
Update other alt keys' graphics
...
Change-Id: I12699907a514f5fc2e110a0a711fb91c14a8756f
2012-03-13 22:12:40 +09:00
Tadashi G. Takaoka
fe8555536a
Support Persian Keyboard
...
This is a first trial implementation based on Arabic layout.
Bug: 5456620
Change-Id: Ifa21d7fbd408853a44678623c13b9c078283732c
2012-03-13 22:02:40 +09:00
Tadashi G. Takaoka
e1a91d0b26
Merge "Avoid using collection interface, using array instead"
2012-03-13 05:19:47 -07:00
Tadashi G. Takaoka
b4fbbe57f5
Avoid using collection interface, using array instead
...
Change-Id: Ie0554362b73967bfcbbab6ad19c24683066a608e
2012-03-13 20:53:15 +09:00
Jean Chalard
e3afb7d192
Make the Builder fully immutable at last
...
Change-Id: Ie399ca7a9e76ccab44a92bc378d11f92392fed2c
2012-03-13 20:33:13 +09:00
Jean Chalard
6ffb5018c1
Straighten out the last bastion of the Builder
...
...and go for the kill
Change-Id: I5ad57211b250d2578ca22a5dae93344d52f9da80
2012-03-13 20:26:47 +09:00
Jean Chalard
ec471c72f8
Add to SuggestedWords a missing parameter, and use it.
...
Also stop using Builder between its creation and the call to
the #build() method.
Change-Id: Ie1fc3ec7b6f4c7c3789f672f4e26b4bf58c3e062
2012-03-13 20:19:21 +09:00
Jean Chalard
2e2519ee91
Make still more members of the Builder final.
...
Change-Id: Ic455f97247da5e40d4939555ab639ecffef36e2d
2012-03-13 20:05:00 +09:00
Tadashi G. Takaoka
edf5daa8ed
Merge "Support invalidating multiple keys in KeyboardView"
2012-03-13 04:00:15 -07:00
Jean Chalard
bd4ba23d2b
Some code reorganization.
...
Use the same local variable inside both branches of an if.
Change-Id: I61f7d506d984f3723ec90604416d1875dd97cd8c
2012-03-13 19:54:56 +09:00
Jean Chalard
b5eeb724fc
Make some more Builder attributes final.
...
Change-Id: I3132b7fe4ee97c566736bfc21c3783cfc79fc7ff
2012-03-13 19:53:38 +09:00
Jean Chalard
c60fea852d
Make the suggested word list final in Builder.
...
Change-Id: I2ddfab00dc8c141fc989a051f16eb2b3571b7e86
2012-03-13 19:37:17 +09:00
Jean Chalard
08adb09e14
Remove unused stuff.
...
Remove 2 methods that were left only for tests to compile in
another project, but are not used any more now that the tests
have been updated.
Also remove an attribute that is never read.
Change-Id: Ic9ba1f52a465199c82c923d77ed7450460e8a4b9
2012-03-13 19:37:16 +09:00
Jean Chalard
9ffaae71d9
Merge "Make an add into a set."
2012-03-13 03:35:17 -07:00
satok
728fd52b63
Merge "Pass the locale to the native code"
2012-03-13 03:27:11 -07:00
satok
7ef1dabd92
Pass the locale to the native code
...
Change-Id: I8f73b9b33cca56b3fa44ec6259c0896be22f4a47
2012-03-13 19:16:33 +09:00
Jean Chalard
674ffcdf93
Make an add into a set.
...
This method now only sets words, so it should be named set.
The functionality is identical since there are no more places
where the list is reused.
This will also allow to make the list final in an upcoming change.
Change-Id: I25b0c7d7f13c3fa5d89806f01f48f1026769603f
2012-03-13 19:07:42 +09:00
Tadashi G. Takaoka
299ac263b3
Support invalidating multiple keys in KeyboardView
...
Change-Id: I347ccfc2cf60c17f5f0eddec6566662cb3a954ca
2012-03-13 18:55:05 +09:00
Jean Chalard
d6662ecd30
Cleanup
...
Remove an unused method, make others static, fix a formatting
issue
Change-Id: I40cb0b5e01a6f8e2f7b953bd9aad3168dfee71d1
2012-03-13 18:34:19 +09:00
Jean Chalard
4ee186920e
Remove a method that causes annoying side-effects.
...
...and replace by a call to a central method.
Change-Id: I93d0a2c2e99963a5b69923d1062d0e01853216b6
2012-03-13 18:22:49 +09:00
Jean Chalard
b8753eb31c
Merge "Kill the StringBuilderPool."
2012-03-13 02:14:37 -07:00
Jean Chalard
adf218eed5
Kill the StringBuilderPool.
...
The intention may have been nice originally but these end up
being copied anyway :/
Let's remove them now, and in a later change, just keep
references to the created objects.
Change-Id: Ifba8357c20384f9eb40cd916665ed1fc6dc8cab1
2012-03-13 17:59:49 +09:00
satok
8e08bfb8de
Merge "Implement additional proximity characters in the native code Bug: 4343280"
2012-03-13 01:41:46 -07:00
satok
552c3c27f0
Implement additional proximity characters in the native code
...
Bug: 4343280
Change-Id: I9bbc5cab2fef1ee80c1fe32017df811ef8af10bc
2012-03-13 17:38:50 +09:00
Tadashi G. Takaoka
aee5f03d6e
Use integer alpha value instead of factor for animation
...
Change-Id: I3099a7625e0176a1d2be42e58d6eb5fa95797bcb
2012-03-13 16:47:45 +09:00
Jean Chalard
95fcb0cce9
Merge "Remove a useless parameter."
2012-03-13 00:26:06 -07:00
Tadashi G. Takaoka
dabf96896e
Move language on spacebar parameters to LatinKeyboardView attributes
...
Change-Id: I06e5d7d158a9b14b00df34e68b12cd012faf17d1
2012-03-13 16:17:13 +09:00
Jean Chalard
d0d4074392
Remove a useless parameter.
...
Change-Id: I7625bf17158c207ad7e8cd496bef825704173c4c
2012-03-13 15:34:06 +09:00
Tadashi G. Takaoka
6fbcd0d219
Merge "Use Animator to draw language name on spacebar"
2012-03-12 22:57:57 -07:00
Tadashi G. Takaoka
4c0c638a18
Use Animator to draw language name on spacebar
...
Note that Animator class exists in framework only on Honeycomb or
later.
Change-Id: Ie3392dbf8acc1547ebb2d16e04086c911d961aed
2012-03-13 14:25:57 +09:00
Jean Chalard
7c9bff96f0
Kill methods with side-effects, take 2
...
...working this time
Change-Id: I80e377e6250d3817f1e067a551bca2a557740764
2012-03-13 14:18:30 +09:00
Tadashi G. Takaoka
041c3d3841
Merge "Tweak 7 inch layout a bit"
2012-03-12 21:01:56 -07:00
Jean Chalard
70a9bcf8c0
Merge "Revert "Kill methods with side-effects""
2012-03-12 19:42:42 -07:00
Jean Chalard
b26af7eae7
Revert "Kill methods with side-effects"
...
This reverts commit ca0e048688
2012-03-12 19:42:29 -07:00
Jean Chalard
ae649580f4
Merge "Kill methods with side-effects"
2012-03-12 19:17:21 -07:00
Eric Fischer
8b4148e757
Import translations. DO NOT MERGE
...
Change-Id: I8546456a3d567b821a5a409a7459f9043fa04315
2012-03-12 15:25:23 -07:00
Jean Chalard
ca0e048688
Kill methods with side-effects
...
Change-Id: I42baeec68eb2540e7d8f8538ae2dceeef5594391
2012-03-12 19:48:32 +09:00
Tadashi G. Takaoka
9aa13b58d1
Tweak 7 inch layout a bit
...
* For 10-9-7 (qwerty, qwertz), keys' width are 9.0%-9.0%-9.0%
* For 10-10-7 (azerty, hebrew, spanish), keys' width are 8.5%-8.5%-8.5%
* For 11-11-{7,8} (arabic, bulgarian, nordic), keys' width are 7.6%-7.6%-7.6%
* For {11,12}-11-9 (south_slavic, east_slavic), keys' width are 7.6%-7.6%-7.363%
Change-Id: Ife4ce0ac587bd179afcfce0cb5dffb8d82fee4f1
2012-03-12 19:29:58 +09:00
Jean Chalard
f62d6f50f2
Merge "Consolidate words into SuggestedWordInfo"
2012-03-12 03:14:54 -07:00
Jean Chalard
c3c4ed91cf
Consolidate words into SuggestedWordInfo
...
We can't get rid of SuggestedWordInfo because it conveys
the information about whether a suggestion is outdated or
not. It is always created anyway. So it makes sense not
to have separate lists and to just keep everything in the
SuggestedWordInfo object.
Change-Id: Idd79dc267d97633901d3d2869da457736963e178
2012-03-12 18:58:20 +09:00
Tadashi G. Takaoka
fe2dc348e5
Add AZERTY compatible symbols/symbols shifted layouts for tablet
...
This change also adds Spanish compatible symbols/symbols shifted
layouts for tablet.
Bug: 6100832
Change-Id: Ib5ed9856573657b2680e08f9e64fd09b12a0a27d
2012-03-12 17:53:23 +09:00
Tadashi G. Takaoka
546692daac
Merge "Support disableAdditionalMoreKeys and disableKeyLabelHint"
2012-03-12 01:48:05 -07:00
Tadashi G. Takaoka
b03529aa01
Support disableAdditionalMoreKeys and disableKeyLabelHint
...
Change-Id: Idfa586417acd4a223380d52f044e3a86eb780b21
2012-03-12 17:45:57 +09:00
Jean Chalard
a3f2ce1f31
Merge "Fix an OOB"
2012-03-12 01:12:40 -07:00
Jean Chalard
c0c20b386f
Fix an OOB
...
The combination of I6b0262fe which removes the internal
size() > 1 test in the safety net calculation and I642a5893
which assumed DBG means there is at least one suggestion.
This change writes the test correctly.
Change-Id: Ib63bce4e163a785f408dd145c23d64cd58fa8c90
2012-03-12 16:50:58 +09:00
Tadashi G. Takaoka
b6895aec05
Merge "Rename keyboard XML files"
2012-03-12 00:42:03 -07:00
Tadashi G. Takaoka
47141f7011
Rename keyboard XML files
...
* Slavic to East Slavic
* Serbian to South Slavic
* Scandinavian to Nordic
Bug: 6150183
Change-Id: I8f5641aa07b83cbb225f5fd73e351a6f8abe0784
2012-03-12 16:39:29 +09:00
Jean Chalard
30936116d8
Merge "Make a method accessible for tests"
2012-03-12 00:23:29 -07:00
Jean Chalard
9dedec7c29
Make a method accessible for tests
...
Tests are using a wrapper method that's going to disappear soon.
The method that becomes package-visible now is destined to be
removed too a little later.
Change-Id: If99b1c77ed52e050b47216cc7afab5f35c4bbb38
2012-03-12 16:11:16 +09:00
Jean Chalard
1dfef0336d
Make a method static
...
Change-Id: Ie1d460562d38105abe91ae2da17cafd49e2cd394
2012-03-12 15:00:36 +09:00
Tadashi G. Takaoka
2de0c4b754
Merge "Separate Greek semicolon key from row"
2012-03-11 21:01:53 -07:00
Tadashi G. Takaoka
0acfaa77ac
Merge "Breakdown Slavic keyboard into rows"
2012-03-11 21:01:48 -07:00
Tadashi G. Takaoka
b30e719286
Separate Greek semicolon key from row
...
Change-Id: Ie568da868a0bed4f72652cf7475bdeb752be1f5b
2012-03-12 12:30:24 +09:00
Tadashi G. Takaoka
df22f71a16
Merge "Breakdown Serbian keyboard into rows"
2012-03-11 20:06:47 -07:00
Tadashi G. Takaoka
b577005a36
Breakdown Serbian keyboard into rows
...
This change also slightly re-design 7-inch and 10-inch tablet layout
Change-Id: Ibfe11386d865f7c3becf4a60286557921f95036d
2012-03-12 11:30:12 +09:00
Tadashi G. Takaoka
2f85034c5d
Breakdown Slavic keyboard into rows
...
Change-Id: Iff2048839a51e14351ba235ef9d7f5ecbef159e3
2012-03-12 11:29:27 +09:00
Tadashi G. Takaoka
fd7b510b24
Breakdown Hebrew keyboard into rows
...
Change-Id: I25c928a3251424280e2ac4f065126c3019734d20
2012-03-12 10:25:13 +09:00
Ken Wakasa
c1ca8815f5
Fix an obvious bug in handleLanguageSwitchKey()
...
bug: 5759092
Change-Id: I8c7b2ef024cbab399d96f6b3ec553da4e9d2fb18
2012-03-11 00:44:47 +09:00
Eric Fischer
1ce5ff63b1
Import translations. DO NOT MERGE
...
Change-Id: Ie0609f97096ad1e9dfa8f9b778047723dcf9868f
2012-03-09 14:04:54 -08:00
Jean Chalard
1a85b74adb
Entirely remove safety net memory.
...
mHasAutoCorrectionCandidate now includes the fact that this
did not get caught by the safety net. This is more intuitive.
Change-Id: I6502bbf1ca64a0a6d64f55d723305cf78352a656
2012-03-09 22:10:25 +09:00
Jean Chalard
68823ae08e
Make the safety net memory private
...
Change-Id: I10959d47c980d2e8f2ea995955acf02193e3ff7b
2012-03-09 22:01:15 +09:00
Jean Chalard
ebbb7e9665
Recompute safety net in debug cases instead of memorizing
...
Change-Id: I67f3a31db081afa4871ec441dd461c56e098c668
2012-03-09 22:00:23 +09:00
Jean Chalard
682c2d53cc
Make access to the safety net calculation easier
...
Change-Id: If33897b38af94ae81b05e5ef140a542724b9f34a
2012-03-09 21:44:40 +09:00
Jean Chalard
151d5cb532
Extract a condition from a method
...
Change-Id: I6b0262fe7cb3f7a31cc19d724c301467be932640
2012-03-09 21:37:44 +09:00
Jean Chalard
36c1b37914
Remove a useless argument
...
Change-Id: I713433a3225193489fad5bdafcf302b529903116
2012-03-09 21:24:47 +09:00
Jean Chalard
28e59b98c6
Remove a useless escape
...
Change-Id: I1ef0685cc9888c9cef9f60015d32b66dde75ef9b
2012-03-09 21:10:55 +09:00
Jean Chalard
d5f618e90a
Remove a useless test
...
If we are not composing a word here, we have already returned
Change-Id: I63281abace777e3658286d4df6781d2cd5a29c33
2012-03-09 20:53:45 +09:00
Jean Chalard
c5d2bb786e
Don't use an intermediate object with a different meaning
...
Change-Id: Ie89916b49c852a51385ffd61cb596a58f23a46a0
2012-03-09 20:51:33 +09:00
Jean Chalard
ed9986824e
Move some auto-correction logic to where it belongs
...
Change-Id: I897c5ec3a630a4a6bfc593906df4d3fc7b244482
2012-03-09 20:45:37 +09:00
Jean Chalard
dfd4abe818
Fix a shameful bug
...
I must have been sleeping when I wrote that
Change-Id: I887180ab610785a2000636adeeed99230b3c5390
2012-03-09 19:31:35 +09:00
Jean Chalard
0cf422fbb7
Reduction, step 8
...
Change-Id: I54334039597e235e24f169e34c1d44109180ee88
2012-03-09 19:00:29 +09:00
Jean Chalard
a333ff19ef
Reduction, step 7
...
Change-Id: I177ef2f29c8b6000c5e3d021c016c5d216fe3fc6
2012-03-09 18:59:20 +09:00
Jean Chalard
a3ee019331
Reduction, step 6
...
Change-Id: I22ad4cea0e0cac23813da7e788f5c94974ce0ebf
2012-03-09 18:58:01 +09:00
Jean Chalard
dbd140504d
Reduction, step 5
...
Change-Id: Iac52e62c2bdffad14f916f69eade2b785bb41767
2012-03-09 18:44:23 +09:00
Jean Chalard
0b96bc4b2b
Reduction, step 4
...
Change-Id: Ib27dc6e9486c3f0f2ec1e94a88a52d12c1af2d38
2012-03-09 18:44:20 +09:00
Jean Chalard
5a61d03f31
Reduction, step 3
...
Change-Id: I0e08b102c9539d97c473505b9d42176c4a7c8853
2012-03-09 18:44:16 +09:00
Jean Chalard
8abd15b59f
Reduction, step 2
...
Change-Id: I06e117df43d25dbaf9fc7a7366efd9355a6215ce
2012-03-09 18:44:10 +09:00
Jean Chalard
f08f30176b
Reduction, step 1
...
Change-Id: Ic3ed04300cfd4c0b69b93b27379aca4093b32f67
2012-03-09 18:38:44 +09:00
Jean Chalard
de165aed2a
Separate bigram prediction from suggestion process
...
Change-Id: Ibdef206fbd6688a45cebbd7fb8a9f6cd175d03b0
2012-03-09 18:38:20 +09:00
Jean Chalard
6f722c8301
Remove useless stuff
...
Change-Id: I462d24da2d26661990d6aab2a13fde851763fd61
2012-03-09 18:36:52 +09:00
Jean Chalard
67af2a2415
Export some more logic out of Latin IME
...
Change-Id: Ib264533a05e9e09347bf254789e6ab5beec92400
2012-03-09 18:36:49 +09:00
Jean Chalard
df9fce5df1
Export some logic out of LatinIME
...
Hopefully that will end in Suggest/SuggestedWords being autonomous
and won't need the logic spoon-fed to them
Change-Id: I915661bce13c69c8a5b8e5d4a8c41e18fea594cf
2012-03-09 18:36:45 +09:00
Jean Chalard
0cb7b00704
Merge "Small optimization"
2012-03-09 00:40:19 -08:00
Jean Chalard
d17ff7225a
Merge "Small reorganization"
2012-03-09 00:40:10 -08:00
Jean Chalard
91e55ac000
Small optimization
...
We only use some of those results in one branch of an if() test.
Let's not compute those that are not needed.
Change-Id: I6ca068646b86d2980fb88e75b110ad077362c4ff
2012-03-09 16:47:43 +09:00
Jean Chalard
195419b1ec
Small reorganization
...
...resulting in a slight optimization
Change-Id: I83a9b8c92c3d93ce75988285997ec138b3ffe52e
2012-03-09 16:41:35 +09:00
Tadashi G. Takaoka
d492e2bf8d
Merge "Breakdown Greek keyboard into rows"
2012-03-08 23:37:02 -08:00
Tadashi G. Takaoka
b4fba675f9
Merge "Breakdown Georgian keyboard into rows"
2012-03-08 23:36:55 -08:00
Tadashi G. Takaoka
df0c7711a7
Merge "Breakdown Bulgarian keyboard into rows"
2012-03-08 23:24:57 -08:00
Tadashi G. Takaoka
e955323ae0
Breakdown Greek keyboard into rows
...
Change-Id: I160c0e26058b3841b3820ec95b91d59b295339ca
2012-03-09 16:24:48 +09:00
Jean Chalard
af8092e093
Merge "Remove useless test"
2012-03-08 23:15:49 -08:00
Tadashi G. Takaoka
d2732d459f
Breakdown Georgian keyboard into rows
...
Change-Id: Id257ea33586e07a91674f654c33003ec2d5aa73d
2012-03-09 16:10:50 +09:00
Tadashi G. Takaoka
258bd90853
Breakdown Bulgarian keyboard into rows
...
Change-Id: Ie0da26a48b186be081ad61858116e519019d1973
2012-03-09 16:00:57 +09:00
Jean Chalard
838629aea0
Remove useless test
...
typedWord may not be null here
Change-Id: I9e7afb89fafbf6fcbc91fbc132aecc06aec8979f
2012-03-09 15:52:23 +09:00
Tadashi G. Takaoka
4e67085a15
Breakdown Arabic keyboard into rows
...
Change-Id: Ie2215d8baf501dc7dd87c464deb47fe4267171f6
2012-03-09 15:50:54 +09:00
Tadashi G. Takaoka
9a6ccf9bb0
Merge "Breakdown AZERTY keyboard into rows"
2012-03-08 22:32:24 -08:00
Tadashi G. Takaoka
efe029be2f
Merge "Breakdown QWERTY keyboard into rows and share"
2012-03-08 22:29:15 -08:00
Jean Chalard
d48b76267a
Merge "Remove a useless test (B7)"
2012-03-08 22:26:20 -08:00
Tadashi G. Takaoka
22375e025b
Breakdown AZERTY keyboard into rows
...
Change-Id: Ibd202d7b141209b3e4310499134522cbd1a8c16c
2012-03-09 15:26:16 +09:00
Jean Chalard
2d82757fc6
Merge "Rename a parameter (B6)"
2012-03-08 22:23:33 -08:00
Jean Chalard
de19ab878d
Merge "Remove useless tests (B5)"
2012-03-08 22:22:56 -08:00
Jean Chalard
5a7cb9305a
Merge "Remove a provably useless test (B4)"
2012-03-08 22:22:20 -08:00
Tadashi G. Takaoka
85d594a80e
Breakdown QWERTY keyboard into rows and share
...
Change-Id: I0b8ad39120a73395ff5a5b1a32e0f3fe681c062b
2012-03-09 15:02:27 +09:00
Jean Chalard
54392438c5
Merge "Optimize and clean up (B2)"
2012-03-08 22:00:02 -08:00
Jean Chalard
90bd4efd10
Remove a useless test (B7)
...
consideredWord is provably never null.
Change-Id: Ifaa0d2471c46f14967e70ad004d2b82f841a4566
2012-03-09 14:55:46 +09:00
Jean Chalard
cf8bc92ba0
Rename a parameter (B6)
...
This is not necessarily the typed word. Actually, the parameter
that's passed here has trailing single quotes culled out of it.
Change-Id: Ia2038faa2cbbd3a5b8263e6c0fb5b8e670993fe9
2012-03-09 14:52:35 +09:00