Yuichiro Hanada
66597f5e5f
Add deleteWord.
...
bug: 6669677
Change-Id: I1a5b90ee05e5cffd74a5c140384a3e37c79e7e70
2012-09-21 12:40:07 +09:00
Yuichiro Hanada
d36245fad2
Add getTerminalPosition.
...
Change-Id: If04d779db23b1aea2cc12e5e9b8cecfcb35a5737
2012-09-20 18:02:16 +09:00
Yuichiro Hanada
65feee12e5
Make BinaryDictIOUtils.
...
Change-Id: I45830235ee738233e8eb2bd91d659705b698f58c
2012-09-19 15:37:37 +09:00
Yuichiro Hanada
bf45dc4860
Make writePlacedNode write the linked-list node.
...
Change-Id: I60feda815ea08cf73300fccca1ae12b97550f116
2012-09-18 21:20:07 +09:00
Jean Chalard
90a9127244
Take space state into account for caps (A11)
...
Bug: 6950087
Change-Id: I8a1bca24db64b4dd54db8ac74d90cf43cbdddab6
2012-09-18 16:16:28 +09:00
Jean Chalard
252da38fcd
Take locale into account for caps (A10)
...
Bug: 4967874
Change-Id: Ic7ce7b2de088308fa00865c81246c84c605db1e5
2012-09-14 19:42:05 +09:00
Jean Chalard
50e61b8628
Remove an unused function (A8)
...
Change-Id: I0578068946d32192c4faf14b3e86624b7301c7d9
2012-09-14 19:01:37 +09:00
Jean Chalard
2c0d916287
Fix abbreviations processing for English (A7)
...
It's still incorrect for non-English languages.
Bug: 4967874
Change-Id: I3d4379265f72e1c0435eba90ab878a80bbcf55ce
2012-09-14 19:01:25 +09:00
Yuichiro Hanada
7e35841053
Add tests for BinaryDictInputOutput.
...
Change-Id: I2ca66fd9a3568d5b6ece79d954095383d23a0a9f
2012-09-13 18:06:45 +09:00
Yuichiro Hanada
1a347723c5
Move FormatOptions and FileHeader to FormatSpec.
...
Change-Id: I232e35598635113bf2c81825669c744aadc79efe
2012-09-13 16:35:41 +09:00
Yuichiro Hanada
be5db53a09
Add tests for readDictionaryBinary with byte array.
...
Change-Id: I2c2815e9d4867687fb3f5b0c661e6162b88c0a0c
2012-09-06 20:35:33 +09:00
Yuichiro Hanada
13b85c4167
Refactor BinaryDictIOTests.
...
Change-Id: I6eef88ab436f478a9255cc20ea59a24cd472807e
2012-09-06 18:06:14 +09:00
Yuichiro Hanada
6e422af881
Check shortcuts in checkDictionary.
...
Change-Id: I150913833e586bf7d3f0b9b2e796a61f89fa4f83
2012-09-06 16:32:54 +09:00
Yuichiro Hanada
2a2b5edc21
Change BinaryDictIOTests's package.
...
Change-Id: Ie9df2f7767cd925051c5e1fdcc325cc3359bca20
2012-09-05 18:23:53 +09:00
Yuichiro Hanada
83dfe0fd8c
Add FormatOptions.
...
Change-Id: Ibad05a5f9143de1156b2c897593ec89b0a0b07e7
2012-09-05 18:05:43 +09:00
Jean Chalard
c61bed6860
Add a preliminary test for basic Russian spell check
...
Bug: 6981919
Change-Id: I5ec6a6468cb616e7a4369c79b4dbfc84f3d8de59
2012-09-04 17:47:44 +09:00
Jean Chalard
5d96585a38
Add a first test for the spell checker
...
Bug: 6981919
Change-Id: Idd34150cec70e71bde652428f1631693bbc4a9ff
2012-09-04 17:19:26 +09:00
Jean Chalard
2035b946a3
Merge "Reinstate the shortcut-only attribute" into jb-mr1-dev
2012-09-02 19:28:01 -07:00
Jean Chalard
72b1c93941
Reinstate the shortcut-only attribute
...
Also add the blacklist attribute
Bug: 7005742
Bug: 2704000
Change-Id: Icbe60bdf25bfb098d9e3f20870be30d6aef07c9d
2012-08-31 22:11:52 +09:00
Yuichiro Hanada
666a433802
add UserHistoryDictIOUtils.
...
Change-Id: I8a70e43b23f65b5fd5f0ee0b30a94ad8f5ef8a8a
2012-08-31 15:08:57 +09:00
Yuichiro Hanada
b2a43a2ed4
add readUnigramsAndBigramsBinary.
...
Change-Id: I7967f11211221d4877bf0a0c30183af885f45390
2012-08-31 14:39:19 +09:00
Tadashi G. Takaoka
35ff94547c
Separate inner classes of keyboard package out under internal package
...
Change-Id: Ia3969bd5ddec5aa5d81d05ad4cf676d818587922
2012-08-30 15:37:55 +09:00
Jean Chalard
5cc596160a
Merge "Use ByteBuffer when reading FusionDictionary from file." into jb-mr1-dev
2012-08-23 21:56:02 -07:00
Yuichiro Hanada
d4fe7fda30
Use ByteBuffer when reading FusionDictionary from file.
...
Change-Id: Ia71561648e17f846d277c22309ac37c21c67a537
2012-08-24 13:31:08 +09:00
Tadashi G. Takaoka
64a26b4389
Fix bug in InputPointers.append
...
Change-Id: I39825757bbae32b66c4b61cb6c4fbcaa2e0c9c47
2012-08-23 17:59:08 +09:00
Tadashi G. Takaoka
9fc6af325e
Fix SubtypeSwitcher initialization path
...
This change also removes the reference of LatinIME from
SubtypeSwitcher.
Bug: 7026856
Change-Id: I78a266f3682b11f09b49bbcdcdb6aee713e6af37
2012-08-22 16:05:34 +09:00
Tadashi G. Takaoka
5f282ea9e4
Add CollectionUtils class to create generic collection easily
...
Change-Id: I6b4de9187e122298e5e9cd8ddc9070d062df6a89
2012-08-22 10:21:38 +09:00
Tadashi G. Takaoka
ac78633be2
Rename and consolidate some constants
...
Change-Id: I7863936cca18b28bf0117afcbcf544a5fd7f185d
2012-08-21 17:54:53 +09:00
Tadashi G. Takaoka
6785b90727
Remove touch coordinate from pickSuggestionManually
...
Change-Id: I33b1b4bc6fdfd263c4b2bb7125c07b4bddcf3c9f
2012-08-21 17:13:45 +09:00
Yuichiro Hanada
0d35c159fe
fix findWordInTree.
...
Change-Id: I8f42df28f76188677db9d4e55885e1fc6a40b53f
2012-08-17 10:23:01 +09:00
Yuichiro Hanada
66f338983b
fix findWordInTree.
...
Change-Id: I9d81c815494a0670afa81219ad7bad82274d997e
2012-08-16 20:21:47 +09:00
Tadashi G. Takaoka
7ae1fd02d4
Use ArrayList to implement PointerTrackerQueue
...
Change-Id: Ie386e6c7869df4df940e09fccffc5cd661134557
2012-08-08 14:18:30 +09:00
Tadashi G. Takaoka
0cc425bd9c
Add PointerTrackerQueue unit tests
...
This is a groundwork to elminate LinkedList from PointerTrackerQueue.
Change-Id: Ib77780537ceb0b4273fb8e483977ab76124c5ce7
2012-08-07 16:56:41 +09:00
Ken Wakasa
bf505d9899
Add <uses-sdk> in manifest files of test apks
...
Change-Id: If5d0aeba8fadb25f67bcd9132dd6c56e5bf9899e
2012-07-31 19:53:31 +09:00
Jean Chalard
f68fe7a9c9
Don't forward phantom space state on stripper input
...
Bug: 6890540
Change-Id: I923b24e3bc17e7b923be4940ad739b58dca24a1f
2012-07-31 01:48:10 +09:00
Tadashi G. Takaoka
c8e45ddb03
Rename LatinKeyboardView to MainKeyboardView
...
Change-Id: I8f3123b8d727c7beb72e226f80c17794f89c8b60
2012-07-23 12:11:43 +09:00
Tadashi G. Takaoka
7abdcf1ed3
Implement ResizableIntArray.fill
...
Change-Id: I570641bc2f32d016c247db6c065a138d8235ab8c
2012-07-20 16:05:37 +09:00
Tadashi G. Takaoka
c49c85f835
Implement ResizableIntArray.setLength and .get
...
This change revises ResizableIntArrayTests as well.
2012-07-20 12:02:38 +09:00
Tadashi G. Takaoka
9370ab9ada
Make ScalableIntArray public as ResizableIntArray
...
Change-Id: Ibbbc117214912ffa192c694bde5b7d55154f40c4
2012-07-19 20:37:53 +09:00
Tadashi G. Takaoka
f583098887
Update InputPointers unit test comments
2012-07-19 20:02:01 +09:00
Tadashi G. Takaoka
57f7de0ba6
Add default capacity parameter to InputPointers' constructor
...
Change-Id: I02f23096f0682d30effe4dfc1ca57881a1e4aedc
2012-07-19 12:06:00 +09:00
Tadashi G. Takaoka
7247bff6d6
Fix InputPointers.append
...
Change-Id: I6995f9b2ed00b9f948e1299e576a5e24725d58f8
2012-07-13 11:46:03 +09:00
Tadashi G. Takaoka
2ad6d12a30
A little optimization of InputPointers.copy
...
Change-Id: Id83b34e076ef91e06d7c1dd2b3ee7bb64d01b8cb
2012-07-10 13:05:43 +09:00
Jean Chalard
d579f1aefc
Consolidate methods that do the same thing (A74)
...
Change-Id: I6e7c3aba2b40ecefa483c9680978bc806368e96e
2012-07-09 15:06:16 +09:00
Jean Chalard
0e9e7e337d
Cleanup (A57)
...
We stopped cancelling manual picks a few weeks ago. This code
is dead.
Change-Id: I4032fcc3c95e9379f1839fe860a1b8a9bd7d0bc7
2012-07-06 13:07:30 +09:00
Jean Chalard
f254e3fec7
Fix a bug where the caps mode would not be changed
...
Bug: 6766059
Change-Id: I378f9d35c4904c4f373260bda5863235d833eb31
2012-07-06 11:08:20 +09:00
Jean Chalard
83f4a9866a
Cleanup, part 10 : remove from the code obsolete options (C10)
...
Change-Id: Id0806ad3dc7ccb632713eebaca76f0bab26ece5d
2012-06-21 10:07:05 +09:00
Jean Chalard
b0561ae980
Remove a member (B5)
...
The new call in the test ensures getCurrentInputEditorInfo actually
works.
Change-Id: I2ee407bd9927d22db537d12f339e2b977a38054a
2012-06-19 03:27:37 +09: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
02308bec63
Merge RichInputConnection with EditingUtils
...
Change-Id: I9982ff325bef56694402caef28a77683c52ccd71
2012-06-08 20:04:09 +09:00
Tadashi G. Takaoka
2033d9880e
am 08c295c5
: am 9a321180
: Add unit tests for double tap shift key
...
* commit '08c295c5bb8d48b26a4486ed42a32a955b39ddd3':
Add unit tests for double tap shift key
2012-05-29 03:31:09 -07:00
Tadashi G. Takaoka
8f3b46fc69
am c79a7104
: am 2959fc0f
: Delay shift lock transient until long pressed shift key is released
...
* commit 'c79a710445cca2a69dca9600a2c06eadcb253b62':
Delay shift lock transient until long pressed shift key is released
2012-05-29 03:31:08 -07:00
Tadashi G. Takaoka
9a3211802b
Add unit tests for double tap shift key
...
Bug: 6568746
Change-Id: I84db31ce86e3e043ac9f9bb971663a629fa3d3c7
2012-05-29 19:23:45 +09:00
Tadashi G. Takaoka
d231d5d322
am 57da84da
: am fb0a4ba8
: Add unit tests for long press shift key
...
* commit '57da84dac4618c0848af02509b42cf913376f382':
Add unit tests for long press shift key
2012-05-29 03:03:19 -07:00
Tadashi G. Takaoka
2959fc0f13
Delay shift lock transient until long pressed shift key is released
...
Bug: 5424586
Change-Id: Ib602af1b38b1b109bdac9cb0c53132169556db2f
2012-05-29 18:14:11 +09:00
Tadashi G. Takaoka
9afa42ddf0
am 7291fbce
: am 16531ad5
: Merge "More precise KeyboardState unit test" into jb-dev
...
* commit '7291fbce4776519f764a4a175951a9ae2a1c2a30':
More precise KeyboardState unit test
2012-05-29 02:11:59 -07:00
Tadashi G. Takaoka
fb0a4ba8fd
Add unit tests for long press shift key
...
Bug: 5424586
Change-Id: I8465b7e2cebb07a135e24ea33eb7b7fb6752f7a2
2012-05-29 18:11:07 +09:00
Tadashi G. Takaoka
0d6d4c20ce
More precise KeyboardState unit test
...
Bug: 5424586
Change-Id: I838c82e3fe4629929cbd6e21111d139e7becab55
2012-05-29 16:42:43 +09:00
Tadashi G. Takaoka
59f5f250cf
am e03f6b39
: am e0952029
: Merge "Make KeySpecParser case sensitive again" into jb-dev
...
* commit 'e03f6b3917f71a7c9f9459765264b547cc80b751':
Make KeySpecParser case sensitive again
2012-05-28 03:33:28 -07:00
Tadashi G. Takaoka
0a3362d264
Make KeySpecParser case sensitive again
...
Partially revert I76c3e917.
Bug: 6561272
Change-Id: I5649a8ecb44bd11c67785ea97ddbb67b0a019ccc
2012-05-28 19:07:51 +09:00
Tadashi G. Takaoka
1b6caa9fe6
am ee78fb26
: am 7ab7f66c
: Fix adjusting key\'s label/code case
...
* commit 'ee78fb2634e7bf74d3e21faf9630e5d8cd67cda0':
Fix adjusting key's label/code case
2012-05-27 21:12:32 -07:00
Tadashi G. Takaoka
7ab7f66c2d
Fix adjusting key's label/code case
...
With this fix, we may probably be able to revert I76c3e917 (Make
KeySpecParser case insensitive).
Bug: 6561272
Change-Id: Ic7571560d7b422ffc9a07f0acecd388e0b330d50
2012-05-28 12:34:49 +09:00
Jean Chalard
37e9eb2b56
am e0f8476f
: am ab619812
: Merge "Fix some of the input logic tests" into jb-dev
...
* commit 'e0f8476f71be89e78530f739bee91dd78cdbbc44':
Fix some of the input logic tests
2012-05-22 02:40:08 -07:00
Jean Chalard
ab619812a5
Merge "Fix some of the input logic tests" into jb-dev
2012-05-22 02:35:33 -07:00
Jean Chalard
f83a6821bb
Fix some of the input logic tests
...
This behavior has been changed for bug#6105732
Bug: 6516976
Change-Id: Ief8225b26d831cd92a051ce25cc005270b6b1776
2012-05-22 18:28:05 +09:00
Tadashi G. Takaoka
d4577f738b
am 82ffc9fe
: am 16950d65
: Reset automatic upper case when chroding key is pressed
...
* commit '82ffc9fe5f7255c902e371bb5353bdef97205fd6':
Reset automatic upper case when chroding key is pressed
2012-05-21 14:29:59 -07:00
Tadashi G. Takaoka
4071470d69
am 168147fa
: am 65331d6e
: Merge "Add multi touch and shift chording unit tests" into jb-dev
...
* commit '168147fa11b275d4c21ba0ac909dd499f8252bfe':
Add multi touch and shift chording unit tests
2012-05-21 14:29:47 -07:00
Tadashi G. Takaoka
6fbb8c8fc3
am 628a5745
: am 75c60bf3
: Merge "Change auto caps mode argument to int type" into jb-dev
...
* commit '628a5745e19d227cdff2370704a4958e2791eb5a':
Change auto caps mode argument to int type
2012-05-21 14:10:50 -07:00
satok
ef04186ce8
am 9a06a1e9
: am 468ac358
: Merge "Add utils for forgetting curve" into jb-dev
...
* commit '9a06a1e9eab191838a623aa074c65fd77a2ac7d9':
Add utils for forgetting curve
2012-05-21 12:44:31 -07:00
Tadashi G. Takaoka
16950d65c3
Reset automatic upper case when chroding key is pressed
...
Bug: 6501446
Change-Id: Idc3b88b5370c0d7968cc388885e9066f922cfcf3
2012-05-21 19:24:43 +09:00
Tadashi G. Takaoka
2972ccb851
Add multi touch and shift chording unit tests
...
Bug: 6501446
Change-Id: Iac423d152702241adae77fe1c343541d70608269
2012-05-21 15:01:41 +09:00
Tadashi G. Takaoka
553e2f19c1
Change auto caps mode argument to int type
...
Bug: 6501446
Change-Id: I3f7bc0fc39edd29ebf96107c3d43b9ccc9b8022e
2012-05-18 17:46:05 +09:00
satok
607a924486
Add utils for forgetting curve
...
Bug: 4192129
Change-Id: Iebb7ac355e1c1891da31c33754315bd76a61889b
2012-05-18 14:50:05 +09:00
Kurt Partridge
aec44d50a7
include text context in researchLogger
...
when logging LatinIME.onUpdateSelection(), now include the current word and
preceding word. no escaping of the word is performed; this is temporary
until the output format is cleaned up.
also fix EditingUtils.getWordRangeAtCursor to support supplementary
UTF-16 characters.
Bug: 6188932
Change-Id: If4612a2627537d5d8bb2f9585a3ad1b4e56c2e26
2012-05-14 09:55:26 -07:00
Tadashi G. Takaoka
ca93442026
Fix newly created custom input style display name
...
This will revert I4263632e
Bug: 6443665
Bug: 6410653
Change-Id: Id9ad1a204ed9802488abfc2c536a95d62d55afe0
2012-05-07 02:42:08 +09:00
Tadashi G. Takaoka
757c12556b
Get subtype name string resource from its own locale
...
Bug: 6443655
Change-Id: Ib9ee55178f0d0f885aa0640b9cba4a179cf0c566
2012-05-07 00:44:54 +09:00
Tadashi G. Takaoka
27b42ced86
Fix "no language" subtype name (DO NOT MERGE)
...
* Move SubtypeLocale.get{Full,Middle,Short}DisplayName() to
LatinLeyboardView and add unit tests (SpacebarTextTests).
* Add SubtypeLocale.getSubtypeDisplayName()
This is a cherry-pick of I57420c6a from Master.
Bug: 6393865
Change-Id: I68748189c17c73984ac4ae05a5a40fb54bf46453
2012-04-26 11:50:28 +09:00
Tom Ouyang
0806bb01d9
Binary bigram lookup checks both uppercase and lowercase when previous word is uppercase.
...
Bug: 6363029
Change-Id: I71a1ed5b88f54fcc15bfaf89d3645b8f17ebb821
2012-04-22 17:48:00 -07:00
Tadashi G. Takaoka
38026b4f03
Predefined keyboard layouts are configurable via XML resource
...
Bug: 4460018
Change-Id: Ia03ec826fb3853ea814d9764686903dbe31a6507
2012-04-20 19:19:24 +09:00
Tadashi G. Takaoka
6bfd5f6319
Fix confusable "label" usage, use "text" instead
...
* Rename makelabel tool to maketext
* Rename KeyboardLablesSet class to KeyboardTextsSet
* Rename "!label/name" to "!text/name"
Change-Id: Ia9494a89fe56f20ca8e8fedb253adbcf8b771bd3
2012-04-20 15:48:30 +09:00
Tadashi G. Takaoka
cf41aff251
Use string attribute for icon name
...
Change-Id: I336acf33c7e6bc993b9da9b17ec689975fa8127d
2012-04-20 15:31:42 +09:00
Tadashi G. Takaoka
050b577bfb
Merge "Make KeySpecParser case insensitive"
2012-04-19 21:21:18 -07:00
Tadashi G. Takaoka
2f16fd40fa
Make KeySpecParser case insensitive
...
Change-Id: I76c3e9179dd8777d3cf3138ad76513d83672debf
2012-04-20 13:20:08 +09:00
Kurt Partridge
48a7681e06
researchLogger detail on IME sessions
...
log device type, screen size, etc. also simplification inside ResearchLogger
to use exceptions better, and fix ResearchLoggerTests to not change
preferences to specify the logfile.
multi-project change with Idfd193b16260215cca32886e288f03a0c12b2781
Bug: 6188932
Change-Id: Idd3ca6eb8e8e3934f68234b241c7fd7d0cc3bcd5
2012-04-19 20:19:55 -07:00
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
Tadashi G. Takaoka
55d28fd1b2
Cleanup InputMethodManagerCompatWrapper
...
Change-Id: Id3b84ee19bb504ed8fbb398e260cc663a5b5ae0d
2012-04-18 18:01:29 +09: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
Kurt Partridge
9bfb620215
add logPoint for manual correction (inc touch pos)
...
Bug: 6188932
Change-Id: Ibcc4901bcfab6632ee4c59cb58d35452218a288d
2012-04-16 16:52:25 -07:00
Jean Chalard
9f7392ea9d
Adjust a test for a new default setting
...
Bug: 6338940
Change-Id: I8f14ce0de768ddb0394eb2b584d8753e0df82a28
2012-04-16 18:34:30 +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
Jean Chalard
f338f8b50d
Add a test for umlauts
...
Change-Id: I2c15e9dc7a1cf846c92a1900d68f661aa70e77b9
2012-04-13 17:38:16 +09:00
Tadashi G. Takaoka
8abde7db6b
Refatcor InputMethodSubtype related stuff a bit
...
Change-Id: Iaded72331660afbaeddda085f2b633b681d4b6df
2012-04-13 16:24:11 +09:00
Brett Chabot
5abbf24eb0
Remove format method from tests.
...
Will be added to superclass.
Bug 5826326
Change-Id: I61478661b822823112f774745a6642a6185366d3
2012-04-11 19:03:19 -07: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
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
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
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
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
3bf57a5624
Use "No language (QWERTY)" for language agnostic QWERTY keyboard name
...
Bug: 6010147
Change-Id: I401c2e3fcd639c0e1a03e64489a0d792810caa18
2012-04-04 12:58:42 +09:00
Tadashi G. Takaoka
e0d06fa793
Merge "Use InputMethodInfo.getSubtypeAt() to list all subtype in test"
2012-04-03 20:27:06 -07:00
Tadashi G. Takaoka
52d50f9bd1
Use InputMethodInfo.getSubtypeAt() to list all subtype in test
...
Change-Id: Ie42effc1c67870d70d0b6a5daed44b811063942b
2012-04-04 11:57:16 +09:00
Tadashi G. Takaoka
fab089dac5
Fix restoring debug mode in InputTestBase
...
Change-Id: I71f01b86c0e8b1e56d39d85795dc0a844cc6285f
2012-04-04 11:21:59 +09:00
Tadashi G. Takaoka
9cc2c94c8b
Remove InputMethodSubtypeCompatWrapper
...
Bug: 6129704
Change-Id: I8f84f0f61a2205ac1fcd1cd40e3a586ee535282d
2012-04-03 15:31:26 +09:00
Ken Wakasa
25d59687c8
Fix the build. Corresponding to I0f1a0dee
...
Change-Id: Ibe31549a200f4c307fa4c1d4ef9ddac0a5952218
2012-03-30 23:30:57 +09: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
6aaa105a85
Fix coordinates of InputTestsBase.type
...
Bug: 6225317
Change-Id: I5c9adb3e65e5742680309b4f2d1a9f2b83ce546f
2012-03-28 20:21:26 +09: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
Kurt Partridge
2482e6c386
add tests for ResearchLogger
...
Bug: 6188932
Change-Id: Icf407f9d145d2b25b70d5d7bc30ee3d64561620c
2012-03-26 17:21:50 +09:00
Jean Chalard
0d708b0cf5
Separate input logic tests in several categories.
...
The intent is to make things easier to read.
Change-Id: Ida95ac8bd4119a2497d3e2a4d92485a96316962d
2012-03-23 14:22:47 +09:00
Jean Chalard
8592ed408e
Split input logic tests to make creating new tests easier
...
This will allow easier reuse of the complicated set up code
and the various helper methods.
Change-Id: I864eb0da476cbf0fe087ddb1713af80d3c3eb850
2012-03-23 14:15:50 +09: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
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
274a0643b1
Give InputLogicTests the ability to change language
...
Also fix a typo, and increase the time allowed to load the main
dictionary to 2 secs instead of 1.
Bug: 6114326
Change-Id: I5f70b34fc4277c55977b18466253152aa98a2507
2012-03-08 16:39:29 +09:00
Jean Chalard
845b24d9d3
Fix a bug with successive manual picks
...
Bug: 6121571
Change-Id: Ib16fbef1087da3b7da5539901ec57156f242f089
2012-03-07 17:32:42 +09:00
satok
231ef8fa3e
Merge "Integrate the logic to calculate the proximities"
2012-03-05 23:25:29 -08:00
satok
ca7ec2097c
Integrate the logic to calculate the proximities
...
Bug: 4343280
Change-Id: I0f6a7e6912ed4abea07c10d266da4c7ccb0dae76
2012-03-06 15:34:27 +09:00
Jean Chalard
cbad260cf3
Fix a test
...
To some extent, the test was wrong here.
After space is typed in this case, we wait a small delay before updating
the suggestion strip so that we can display bigram predictions without
introducing delays. The suggestion strip is not displayed until then.
The test was bypassing this by simulating a press on the suggestion
strip, but for LatinIME it was not displayed yet, hence the bug.
The new code waits for the delay, makes sure the suggestion strip is
actually displaying punctuation marks, then press the mark and do
the intended test on space.
Change-Id: I18f82da1bc0a8e584e9b1bac59ff48823d78ec12
2012-03-06 14:00:11 +09:00
Tadashi G. Takaoka
3a1844c33b
Merge "Support dividers in MoreKeysKeyboard"
2012-03-02 03:58:13 -08:00
Tadashi G. Takaoka
5ef4fccbb9
Support dividers in MoreKeysKeyboard
...
Bug: 6080806
Change-Id: Iacd78c6aab6abf948717d34da7489a79c41316d2
2012-03-02 20:52:25 +09:00
Tadashi G. Takaoka
a3abbac47a
Merge "Remove obsolete tests"
2012-03-01 21:23:54 -08:00
Tadashi G. Takaoka
8d7cb928d8
Remove obsolete tests
...
Change-Id: Ibfbe6b39580ae13e4c32fb2ceab7a6c6f3a24ccb
2012-03-02 14:18:08 +09:00
Jean Chalard
f717c5685e
Add basic tests for auto-correct indicator.
...
Bug: 5975557
Change-Id: I39e782f89813b9d585e369e590d6288e696168a2
2012-03-02 11:08:46 +09:00
Tadashi G. Takaoka
42fd1d2d72
Refactor more keys spec handling
...
Change-Id: Ibd95eff0725724ea35ad58e1d1ec7ec3d02a6e90
2012-03-01 16:07:02 +09:00
Tadashi G. Takaoka
d054aa17da
Merge "Reset previous symbols shifted state when auto switch backed"
2012-02-29 08:05:58 -08:00
Tadashi G. Takaoka
4ba2216219
Reset previous symbols shifted state when auto switch backed
...
Bug: 6072517
Change-Id: I00337b3ed5c85df4627e8f5a02465d406c4d9178
2012-03-01 01:01:09 +09:00
Jean Chalard
d9f6a0ebb7
Add a method to run the handler's messages from the tests
...
This is really brutal, but after trying many many things I didn't
find a better way. It works with the current implementation of
MessageQueue.
Since this only introduces a utility method it doesn't really do
anything, but the functionality it provides will be essential to
Bug: 5975557
Change-Id: I81c4113a08f9a8d8a88294d7dd3b6c8c483c8b1d
2012-02-29 11:52:33 +09:00
Jean Chalard
bb15f92d4f
Add some unit tests.
...
- Type "tgis", manually pick "thus", press backspace.
Backspace should revert the manual pick.
Check "tgis" is the result.
- Type "tgis" followed by a period.
Period should trigger auto-correct to "this".
Check "this" is the result.
- Type "tgis" followed by a period, then backspace.
Period should trigger auto-correct to "this", and backspace should
revert the auto-correction.
Check "tgis." is the result.
Change-Id: I7e23c8a26fbdbe23336149a05ff01bc51707422e
2012-02-22 01:35:11 -08:00
Tadashi G. Takaoka
fed72d6038
Merge "Support fixed order more keys"
2012-02-17 01:01:28 -08:00
Tadashi G. Takaoka
aeeed75848
Support fixed order more keys
...
Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870
2012-02-17 00:49:18 -08:00
Tadashi G. Takaoka
beb08b398f
Remove unnecessary and harmful KeyboardState.onUpdateShiftState call
...
This change also cancels double tap and long press timers if other
letter key is pressed after shift key.
Bug: 5693999
Bug: 6017610
Change-Id: I3b5f3debfb8915fa73a93b409a38afadf24132e9
2012-02-16 18:02:17 -08:00
Tadashi G. Takaoka
6213983fa1
Refactor MoreKeysKeyboard.Builder
...
Change-Id: Ib5f58b1143be60c748b81299ccc3b237d2587846
2012-02-10 18:53:54 +09:00
Tadashi G. Takaoka
614cb02a91
Merge "Rename mini keyboard to more keys keyboard"
2012-02-08 00:04:16 -08:00
Tadashi G. Takaoka
2affaf91a0
Rename mini keyboard to more keys keyboard
...
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
2012-02-08 16:12:31 +09:00
Jean Chalard
9159b9953d
Fix the auto-composer to support supplementary chars
...
Change-Id: I61ff218ae2ca4eb443a370e581b677755258670a
2012-02-08 15:45:51 +09:00
Jean Chalard
fd6a52c8d5
Merge "Add some unit tests for punctuation and special keys"
2012-02-07 17:36:39 -08:00
Tadashi G. Takaoka
c217dc9237
Convert one letter Key.outputText to Key.code
...
This change also uses Key.code instead of Key.outputText for the
variety of parentheses keys taht introduced by I85998f17.
Bug: 5975484
Change-Id: I86879c9942d264edc71e5893325a2f582763d12f
2012-02-07 22:34:20 +09:00
Jean Chalard
de60d87a60
Add some unit tests for punctuation and special keys
...
Bug: 5962053
Change-Id: I7dd68767be6e724675428910fa2c00290f76e869
2012-02-07 20:34:56 +09:00
Jean Chalard
816a8a0fd8
Fix a race condition that makes tests unstable
...
Change-Id: Ic19d380eb64855884bc6ded8547c200dd772ffe9
2012-02-07 19:22:37 +09:00
Tadashi G. Takaoka
f6cf387edc
Merge "Recursively resolve @string/resource reference in key key spec parsing"
2012-02-03 03:20:37 -08:00
Tadashi G. Takaoka
aca8870128
Recursively resolve @string/resource reference in key key spec parsing
...
Change-Id: I9d172605e90e828e00f7c4c8d49548498aa3b50d
2012-02-03 20:03:23 +09:00
Jean Chalard
9f17de5b4d
Merge "Stop inserting a space after a manually picked word."
2012-02-03 02:09:05 -08:00
Tadashi G. Takaoka
9f491e34ac
Merge "Filter out empty entry from more keys CSV"
2012-02-03 01:54:49 -08:00
Tadashi G. Takaoka
24cd2617f5
Filter out empty entry from more keys CSV
...
Change-Id: I9a26aaa58f0f502b3bfef9de422370d2b0add8d8
2012-02-03 18:48:01 +09:00
Jean Chalard
fb684cebe8
Stop inserting a space after a manually picked word.
...
Bug: 4994861
Change-Id: I6ae256a94dbaddea4304304779d17025620c5025
2012-02-03 18:45:44 +09:00
Tadashi G. Takaoka
0de2fbd7b6
Fix KeySpecParserTests to read correct icon id
...
Change-Id: Ic002e7fbe84a7001874ebd59e6af8ba695d173de
2012-02-03 18:40:38 +09:00
Tadashi G. Takaoka
909b2940db
Merge "Get rid of Key.setIcon(Drawable)"
2012-02-02 21:51:51 -08:00
Tadashi G. Takaoka
e7948a8692
Get rid of Key.setIcon(Drawable)
...
Change-Id: If6ebbdefcbfd0cc14c72858f9bb44861e8abe079
2012-02-03 14:38:17 +09:00
Jean Chalard
825e2bbd91
Fix a bug when deleting the last char
...
And unit test
Change-Id: Ic4fc3626f8b86e10156d770d41cd6deab5d31f39
2012-02-03 13:03:54 +09:00
Jean Chalard
9242a2bcf8
Fix string iterations in a couple places.
...
Seems I didn't get how to iterate on a String correctly >.>
Talk about a big bug. Anyway, I think it's working now.
Bug: 5955228
Change-Id: I988c900cf2a16c44b9505cfd4f77c7cda7e592f0
2012-02-03 11:15:46 +09:00
Tadashi G. Takaoka
5852a2594f
Parse escaped sequence strictly in CSV parser
...
This change alters the CSV parser behavior. The parser only resolves
* String resource reference. ["@string/res" -> "<content_of_res>"]
* Other occurrence of escape sequence will be intact. ["\x" -> "\x"]
Before this change, escape sequence in moreKeys string is parsed three
times. At first in parsing string resource, next in CSV parser, and at
last in KeySpecParser. So that representing single escape character
itself is a bit annoying, "\\\\\\\\".
Now we can represent single escape character itself in string resource by "\\\\".
Change-Id: Ib978e17b779cc82585eed8241ac3857508b14bc7
2012-02-02 20:19:26 +09:00
Jean Chalard
a456c755ee
Merge "Add unit tests in prevision of magic space removal"
2012-02-02 01:35:36 -08:00
Jean Chalard
cca2183f5a
Add unit tests in prevision of magic space removal
...
Bug: 4994861
Change-Id: I114a1117cf19aa6e514ac7342f733175dc5d5df1
2012-02-02 18:21:10 +09:00
Tadashi G. Takaoka
0086861d5a
Move CSV parser to KeySpecParser
...
Change-Id: I424fb47bc70e9b6aaa5a16ae9b2500d23da75c26
2012-02-02 16:10:14 +09:00
Tadashi G. Takaoka
e01d272603
Make KeySpecParser and CSV parser code point aware
...
This change also renames MoreKeySpecParser to KeySpecParser
Change-Id: I35733cdbb344f16b57ffa2cfe79055c089b4e409
2012-02-02 15:51:40 +09:00
Tadashi G. Takaoka
ff858c7ff5
Use MoreKeySpecParser to parse puctuations strip resources
...
This change also
* Doesn't use Key.getRtlParenthesisCode to get correct parentheses
code in RTL context. Intead uses the outputText feature of
moreKeys specification.
* Move CVS string parser from KeyStyles to Utils.
Bug: 5948247
Change-Id: I45752c7d01b4f7d3f3da900b110a2185b336a1f0
2012-02-01 19:33:26 +09:00
Tadashi G. Takaoka
a5c96f376a
Move long press shift handling from PointerTracker to KeyboardState
...
This change also
* Rename phone shift keyboard to phone symbols keyboard.
Use CODE_SWITCH_ALPHA_SYMBOL code to switch between phone and phone symbols keyboard.
* Remove phone symbols keyboard from tablet.
* Introduces enableLongPress flag of Key.keyActionFlags attribute.
* Remove clumsy long press code from PointerTracker.
* Remove CODE_CAPSLOCK handling from LatinIME.
* Make KeyboardSwitcher to invoke haptic and audio feedback.
Change-Id: I00e1f697a10ab5112aec75e36853b96246ff5054
2012-02-01 19:04:21 +09:00
Tadashi G. Takaoka
3feb99fa6c
Merge "Save/restore alphabet shift locked state while rotating even in symbols mode"
2012-01-31 02:26:41 -08:00
Tadashi G. Takaoka
49bd49c8fb
Save/restore alphabet shift locked state while rotating even in symbols mode
...
Bug: 5730212
Change-Id: Id2342dacd149d6385d61001f880ebcd1883cf0b4
2012-01-31 19:11:39 +09:00
Tadashi G. Takaoka
88e079ae6b
Cleanup redundant methods of KeyboardSet
...
Change-Id: I69fa1b5661695d0323222c2969679f4792b6ef0d
2012-01-31 18:27:37 +09:00
Tadashi G. Takaoka
0ed2d3a449
Fix double tap shift key enable/disable shift locked mode
...
Bug: 5942452
Change-Id: I2c7b1605bceac2b2f929cd4d97c417ef15c6f754
2012-01-31 18:06:54 +09:00
Tadashi G. Takaoka
15c99e9f1a
Support addtionalMoreKeys
...
This change also removes
* Unused more_keys_for_q, w, and p.
Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f
2012-01-30 17:04:25 +09:00
Tadashi G. Takaoka
f057b25cdd
Save and restore previous mode keyboard state at KeyboardState.toggleAlphabetAndSymbols
...
Bug: 5881820
Change-Id: I9b1718b16c60f27c05ba727724c0189aa5284334
2012-01-27 16:03:51 +09:00
Tadashi G. Takaoka
757f8d96ee
Add KeyboardState.SwitchActions.setAlphabetShiftLockShifted
...
Change-Id: I6c49d8eb0a8272840ff03e0940d88a31c3d20bd9
2012-01-26 18:25:48 +09:00
Jean Chalard
a02e703289
Add a missing brace
...
Change-Id: Ia51da6506d78a295b8b70a241208fb81602cf0ea
2012-01-26 16:08:53 +09:00
Jean Chalard
9184d8b235
Add a test for moving cursor then backspace
...
This is a test for the case in
Bug: 5851148
Change-Id: I58ee459d85f463b445a28137bdc6c40bc3067ff5
2012-01-26 15:39:29 +09:00
Jean Chalard
41df8a98fd
Add a test case for backspace at start of line
...
Tests the behavior from
Bug: 5784542
Change-Id: I78ec9d77c5dd1e3ea8eff530f9d7d284a1c094d4
2012-01-26 15:36:27 +09:00
Jean Chalard
60e7718462
Add tests for double space behavior
...
Bug: 5875776
Change-Id: Icc28b6c5c0132a3afc8d603841c9e321f720b7c9
2012-01-26 10:10:38 +09:00
Jean Chalard
d9702a375a
Merge "Add a test for auto-correction."
2012-01-25 02:33:39 -08:00
Jean Chalard
0bfe359ee4
Add a test for auto-correction.
...
Fix two related subtle bugs:
- Stop singling out fat-finger-only corrections for rejection
when touch coordinates are not available.
- Remove a racy check that would happen only in debug mode
Change-Id: Ic904f9b27c091ca6b369052c4e65a630bff81257
2012-01-25 19:29:40 +09:00
Tadashi G. Takaoka
38d6a18821
Use String instaed of CharSequence in Key class
...
Change-Id: Ia76a41daede402ed2a509e110ae97d6bb660c760
2012-01-25 17:04:00 +09:00
Jean Chalard
20f437cc49
Merge "Test that delete actually removes any selected text."
2012-01-24 01:19:26 -08:00
Jean Chalard
1e4684ad24
Test that delete actually removes any selected text.
...
Bug: 5699301
Change-Id: I09a967eb03690251e8bd69503285c982d6958a7d
2012-01-24 18:17:09 +09:00
Tadashi G. Takaoka
83d81f2e34
Fix sliding shift input in caps lock mode
...
Bug: 5881820
Change-Id: I4cbe3eda83c09edc9da8efbdff7d3359c1e140d5
2012-01-24 17:58:23 +09:00
Tadashi G. Takaoka
747ed9e99a
For get the symbols shifted state when switch back from alphabet layout
...
Bug: 5881820
Change-Id: Ic478264e1cd366affc34fbf4cd59f1b6e7efede7
2012-01-24 17:28:00 +09:00
Tadashi G. Takaoka
0f05076990
Get rid of setShifted/setShiftLocked from SwitchActions
...
Change-Id: Ib54b0575be190556690ef2dfb14077842745f038
2012-01-24 12:27:09 +09:00
Tadashi G. Takaoka
9507b4a086
Merge "Add more sliding input unit test"
2012-01-23 19:00:56 -08:00
Tadashi G. Takaoka
373f452584
Add more sliding input unit test
...
Bug: 5881820
Change-Id: I9249d8b702ba9afbd1c7d0a4889ac5b2e929f85d
2012-01-24 11:49:00 +09:00
Tadashi G. Takaoka
3611068bc6
Move string resources for unit test to donottranslate.xml
...
Bug: 5904617
Change-Id: I2eb677a4dd9686f87fec9f11051775a5c9c670a1
2012-01-24 11:29:16 +09:00
Tadashi G. Takaoka
530f5d7e15
Merge "Support @icon/icon_name for more keys specification"
2012-01-20 03:20:40 -08:00
Tadashi G. Takaoka
b009a24b83
Support @icon/icon_name for more keys specification
...
Change-Id: I8842e5ce77f9d27a0969df947de292c1830e36b7
2012-01-20 20:09:02 +09:00
Jean Chalard
482588c5a2
Merge "Enable DEBUG mode for logic tests."
2012-01-20 02:27:34 -08:00
Jean Chalard
bc10e4145e
Enable DEBUG mode for logic tests.
...
This enables a wealth of useful checks. We want to run unit
tests with debug mode on.
Change-Id: Ic45caaf43a889287f5aec203e7d1ba63136fc58e
2012-01-20 19:23:34 +09:00
Tadashi G. Takaoka
e54a4005d5
Support @string reference in moreKeys attribute
...
Change-Id: If0056d0601149d2ddd0e231a81e7b2409b37fc06
2012-01-20 18:46:33 +09:00
Tadashi G. Takaoka
3eede315dc
Merge "Move MoreKeySpecParser.getResourceId to Utils"
2012-01-20 00:01:29 -08:00
Tadashi G. Takaoka
86641ef6e8
Merge "Change more key specification type to String from CharSequence"
2012-01-20 00:01:24 -08:00
Tadashi G. Takaoka
0718590486
Move MoreKeySpecParser.getResourceId to Utils
...
Change-Id: I0640dbe76a8ff2dc45b504eca631942811571736
2012-01-20 16:28:18 +09:00
Tadashi G. Takaoka
bd7b160cfb
Change more key specification type to String from CharSequence
...
Change-Id: I5e910f8225a248fc6403771836dec4c0b7294caa
2012-01-20 16:27:32 +09:00
Jean Chalard
83c72d1dae
Add the first tests for the input login in LatinIME class
...
Change-Id: Ifcf9ab55ee01bf7c6c6829e699246e5654975456
2012-01-20 13:00:40 +09:00
Tadashi G. Takaoka
f36f90a173
Fix KeyboardState switching back from alphabet-chording input correctly
...
Bug: 5881820
Change-Id: I108bbc25baa331cc87f00955b48188b3557d10dd
2012-01-19 18:53:38 +09:00
Tadashi G. Takaoka
d26d63b35d
Fix KeyboardState to pass KeyboardStateMultiTouchTests
...
Change-Id: If2b9ee7cf3fad7633d64b98758f802792d66f7a8
2012-01-19 18:48:02 +09:00
Tadashi G. Takaoka
01d9fc966a
Cleanup KeyboardState a bit
...
Rename KeyboardShiftState variable and reorder some statements.
Change-Id: I7e8842836f35876f8697f9906343f7d4a1f9db4f
2012-01-19 18:42:11 +09:00
Tadashi G. Takaoka
23bacdb6a5
Fix MoreKeySpecParser to be able to handle outputText correctly
...
The issue was introduced by Id2320f4d.
Bug: 5887936
Change-Id: Ifec3aefb5b168f790de696ece104b84cdab46539
2012-01-19 12:51:27 +09:00
Tadashi G. Takaoka
06bc1db017
Add more multitouch tests
...
Change-Id: I424a4b608fec084cb787003ef4417ccf273366ae
2012-01-18 19:35:01 +09:00
Tadashi G. Takaoka
60c4594ee6
Get rid of hasDistinctMultitouch reference from KeyboardState
...
Change-Id: I0a783a425302fbc381d056f5b0d757c27f2a9f14
2012-01-18 18:11:46 +09:00
Tadashi G. Takaoka
64e01baade
Add KeyboardStateTestsBase and helper methods
...
Change-Id: I17d908b60bbf784dae7add8355f699a63f7eb90a
2012-01-18 16:46:38 +09:00
Tadashi G. Takaoka
5731b939c7
Remove KeyboardSwicther.toggleCapslock
...
Change-Id: Id613c06e2df770659095d78d42637aed063d0c70
2012-01-17 19:26:24 +09:00