Tadashi G. Takaoka
9a6ccf9bb0
Merge "Breakdown AZERTY keyboard into rows"
2012-03-08 22:32:24 -08:00
Tadashi G. Takaoka
22375e025b
Breakdown AZERTY keyboard into rows
...
Change-Id: Ibd202d7b141209b3e4310499134522cbd1a8c16c
2012-03-09 15:26:16 +09:00
Tadashi G. Takaoka
85d594a80e
Breakdown QWERTY keyboard into rows and share
...
Change-Id: I0b8ad39120a73395ff5a5b1a32e0f3fe681c062b
2012-03-09 15:02:27 +09:00
Tadashi G. Takaoka
1dba7c2d67
Merge "Split tablet symbols and symbols shifted layout into separated rows"
2012-03-08 21:05:53 -08:00
Tadashi G. Takaoka
174d29f468
Split tablet symbols and symbols shifted layout into separated rows
...
Bug: 6100832
Change-Id: I6771364ceca2c152bd9c55e22159f57c3468cc31
2012-03-09 12:41:56 +09:00
Tadashi G. Takaoka
b1de2912b8
Add ":" to ";" key on Greek keyboard
...
Bug: 5679585
Change-Id: I92d4b4d1eff9561adbb1bae607a1c27b4b5168ba
2012-03-09 12:22:34 +09:00
Eric Fischer
ff29b1f8e8
Import translations. DO NOT MERGE
...
Change-Id: Idab425b956341eb8556df92fb0ac33e4036e5a6e
2012-03-08 14:15:38 -08:00
Tadashi G. Takaoka
9c7db965cd
Fix forgotten resource name change
...
Change-Id: I27ea28c7ea93e50ea8f0d947df95e3ab6d146f11
2012-03-08 21:53:37 +09:00
Tadashi G. Takaoka
7d6d98ecc5
Merge "Cleanup keyboard theme switching code"
2012-03-08 03:24:38 -08:00
Tadashi G. Takaoka
411749a4ba
Cleanup keyboard theme switching code
...
Change-Id: I023769b765d07237b2129d8f1b2a02ffd4c4f09d
2012-03-08 19:17:31 +09:00
Tadashi G. Takaoka
bcbaffd9dd
Fix centering more suggestions panel on tablet
...
Bug: 6129726
Change-Id: I8dac3251eec68ad3fb523c632ff39f3cc661c81f
2012-03-08 19:02:22 +09:00
Eric Fischer
77541fc92e
Import translations. DO NOT MERGE
...
Change-Id: Iab45cb6beb91770c53ca6a8c0947f9e7ab838bf4
2012-03-07 14:44:44 -08:00
Tadashi G. Takaoka
c648b88779
Merge "Dynamically determine key preview backing view height"
2012-03-07 04:17:52 -08:00
Tadashi G. Takaoka
c8b0e5797e
Dynamically determine key preview backing view height
...
Bug: 6023947
Change-Id: I53a5c0eb99100a0dfe3e025808f5dc55747d1287
2012-03-07 20:33:17 +09:00
Tadashi G. Takaoka
898d84190b
Merge "Tweak vertical corrections for more keys in the "ICS" theme"
2012-03-07 02:06:46 -08:00
Tadashi G. Takaoka
48f6321630
Tweak vertical corrections for more keys in the "ICS" theme
...
Bug: 6129435
Change-Id: I3800a7a6926967c456e1b9b0dead94717063039a
2012-03-07 18:34:15 +09:00
Tadashi G. Takaoka
e9bfc13bff
Add readable unicode point names
...
Change-Id: I5689711429526a2bad409f235b6825a7ed4c7bc2
2012-03-07 16:35:51 +09:00
Tadashi G. Takaoka
81d4e3cd66
Add language switch key only to the phone layouts
...
Bug: 5759092
Change-Id: Ic7d7d4812976654c0e85fecabd1128eadfc52c5c
2012-03-07 10:03:21 +09:00
Jean Chalard
00ed3be95c
Correct special space handling of punctuation
...
This fixes two defects:
- One where some separators should promote a phantom space to
a real space. This bug had a unit test but wasn't tracked.
- One where French punctuations would behave incorrectly. Tracked
Bug: 6113693
Change-Id: Ia7f86fc960e00141757632ab2c9bce9168dd6966
2012-03-06 14:00:34 +09:00
Eric Fischer
97b6343a38
Import translations. DO NOT MERGE
...
Change-Id: If76e0272d3a4b1ec294ce905accf7bd0280b96dd
2012-03-05 15:49:15 -08:00
satok
907371b54f
Merge "Change the name of AOSP LatinIME spell checker"
2012-03-04 23:11:46 -08:00
satok
e54723d84d
Change the name of AOSP LatinIME spell checker
...
Change-Id: I8b93f66c272d91ba02888da31d56a9811ba2a1f0
2012-03-05 15:39:07 +09:00
Tadashi G. Takaoka
e5cbc94d10
Merge "Support embedded more key"
2012-03-04 22:10:22 -08:00
Tadashi G. Takaoka
e491be6e86
Support embedded more key
...
This is a followup change to Ie10b3e0b.
Change-Id: I1f91d96e32357b83bd0546537d561d638b6ff0c6
2012-03-05 14:22:52 +09:00
Tadashi G. Takaoka
c7b0105114
Suppress more keys that share the same meaning with the parent key's imeAction
...
Bug: 6080806
Change-Id: Ifc3145fd79f10b39442b95432a8d19a624c2fdfd
2012-03-05 12:24:28 +09:00
Tadashi G. Takaoka
13057e7c05
Support Greek Keyboard
...
Bug: 5679585
Change-Id: I540d5ea42a830be8b85440e794cfcee92a23838e
2012-03-02 21:00:38 +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
3790353472
Merge "Support Macedonian Keyboard"
2012-03-02 03:43:46 -08:00
Tadashi G. Takaoka
775d8d8885
Support Macedonian Keyboard
...
This change also fixes missing Cyrillic DJE key of Seribian keyboard
on 10-inch tablet.
Bug: 5934396
Change-Id: I18ae5f0e54f788b65f649a52bdbbef1813334d96
2012-03-02 20:35:44 +09:00
Tadashi G. Takaoka
ede2133cb1
Support time, date, and datetime keyboard
...
Bug: 6030364
Change-Id: I2bd4daf264757d8f3fa7c946d10a39c36ccf5905
2012-03-02 14:01:07 +09:00
Tadashi G. Takaoka
e4c45c6ef9
Explicitly specify that labels might be in more keys
...
Bug: 6080806
Bug: 6081427
Change-Id: I455a0210e65ea2a7774e0e0071cea5f4a99577bd
2012-03-01 20:03:47 +09:00
Tadashi G. Takaoka
9b764e0cc5
Shift+Smiley can register enter in textMultiLine field
...
Bug: 2498607
Change-Id: Ied2217c49665394a01c7d3451a93c0bc647d392f
2012-02-29 17:21:55 +09:00
Eric Fischer
5a0661eae8
Import translations. DO NOT MERGE
...
Change-Id: I6e4e75a7713a683dcb4d9159179103b412ab41be
2012-02-24 14:15:04 -08:00
Eric Fischer
e2d43ef528
Import translations. DO NOT MERGE
...
Change-Id: Ibcf6712652c6faf320cefb3fe408b172adf130e0
2012-02-22 14:58:07 -08:00
Eric Fischer
f127fb7960
Merge "Import translations. DO NOT MERGE"
2012-02-22 09:38:51 -08:00
Tadashi G. Takaoka
8fe892945a
Merge "Add Georgian keyboard"
2012-02-21 23:27:12 -08:00
Tadashi G. Takaoka
0771671a39
Add Georgian keyboard
...
Bug: 5002108
Change-Id: Ia5751181bffc96e2e6c5daed3c7de8408078f91b
2012-02-21 23:24:13 -08:00
Tadashi G. Takaoka
1b3c16c183
Merge "Add next/prev navigate action more keys and remove tab key"
2012-02-21 23:09:58 -08:00
Tadashi G. Takaoka
05bfd189a8
Add next/prev navigate action more keys and remove tab key
...
Bug: 6037537
Bug: 5961814
Change-Id: I9c6dedf953452a180fcd5bce7bfadfd3c821f224
2012-02-21 22:50:50 -08:00
Tadashi G. Takaoka
c6993e4947
Merge "Add "#" and "%" to punctuation more keys"
2012-02-21 22:43:38 -08:00
Tadashi G. Takaoka
3710a04740
Add "#" and "%" to punctuation more keys
...
Bug: 6029665
Change-Id: I976326a900876a0d39067a760459366f52101c96
2012-02-21 19:43:47 -08:00
Jean Chalard
b141c9cd3f
Rename resources to reflect current usage
...
Bug: 6010403
Change-Id: Ia02ff31007296fdf6901504f238dfd9e4621f658
2012-02-21 18:54:44 -08:00
Eric Fischer
da21000957
Import translations. DO NOT MERGE
...
Change-Id: Ic09c089b8b42fdd672138d14f52a0ffb21733677
2012-02-21 14:57:14 -08:00
Eric Fischer
d1a37520d0
Import translations.
...
Change-Id: I59fdeb4d9df08e82e56d5545ffaaa66e5a04304e
2012-02-17 16:31:50 -08:00
Tadashi G. Takaoka
97bde43740
Settings key always exists in more keys of shortcut/f1 key
...
This change also
* Fix comman/f1 key for Arabic keyboard.
* Removes "show settings key option" and related stuff.
* Renames and simplifies F2 key to shortcut key on 7 inch tablet.
Change-Id: Ib1cf99ad00d9780a2f0d170260e756771e161521
2012-02-17 01:04: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
Eric Fischer
482e0ef983
Import translations.
...
Change-Id: I20bcfc0d6296dc3606ab027e9c78f17e960e62dc
2012-02-16 15:29:44 -08:00
Jean Chalard
a252e0547f
Reactivate the bigram prediction option
...
Change-Id: Ib4dcd05c4ecf38bdf3d28371fcd9e2259a59ec0c
2012-02-15 19:25:12 -08:00
Eric Fischer
05f09b6d58
Merge "Import translations."
2012-02-14 16:36:51 -08:00
Eric Fischer
a476f75209
Import translations.
...
Change-Id: I9ee2da4706d6847b00f37766f79e73f83ea930d8
2012-02-14 16:32:59 -08:00
Ken Wakasa
95dc18a7c4
Follow up to Ie2416ccd
...
space   got lost in some parsing process
Change-Id: I36f5a9ca7172013ce049041886b9cd98659d38f9
2012-02-15 08:23:34 +09:00
Ken Wakasa
a56639613b
Use more standard Unicode notations in keyboard layout resource files.
...
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
2012-02-15 06:44:09 +09:00
Eric Fischer
b396ea9ede
Import translations. DO NOT MERGE
...
Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b
2012-02-13 15:19:16 -08:00
Ken Wakasa
f6f40539aa
Minor string updates in Android keyboard settings
...
bug: 5999345
Change-Id: I77560b02c71c3ba0c525572b7062ebbfd66b3b85
2012-02-14 03:32:39 +09:00
Ken Wakasa
09c677f56a
Replace UTF-8 string resources with their hex representations
...
bug: 5988656
Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
2012-02-11 23:05:23 +09:00
Eric Fischer
1bd181fefa
Import translations.
...
Change-Id: I126a880289de548e914ac442740e789e067e5124
2012-02-10 14:14:38 -08:00
Charles Chen
4baf767fac
Merge "Improved shift key and symbol/alpha switch key accessibility feedback."
2012-02-09 15:33:40 -08:00
Eric Fischer
0d1a5bad54
Import translations. DO NOT MERGE
...
Change-Id: I221670b8e4796346d13a44848f8958904e9bac80
2012-02-09 12:46:37 -08:00
Eric Fischer
7ef97ea1f9
Import translations. DO NOT MERGE
...
Change-Id: I02629c1f8dd311899b3aba89bfb1390150ace7ac
2012-02-08 13:56:30 -08:00
Tadashi G. Takaoka
5962312b07
Custom action label should be a part of keyboard identifier
...
Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
2012-02-08 20:09:39 +09:00
Tadashi G. Takaoka
7a39bd4454
Shift+Smiley key will register newline character of textMultiLine
...
This change also
* Honors the custom action label in EditorInfo.actionLabel.
* Invokes InputConnection.performeEditorAction if action is specifed
at EditorInfo.imeOptions or actionLabel/actionId.
* Stops using InputMethodService.sendKeyChar. Implements
sendKeyCodePoint instead.
Bug: 2498607
Bug: 5961809
Bug: 5368408
Change-Id: If4cd5eb3dacfc6b6a7ea434b0617c2438e06e42d
2012-02-08 19:31:35 +09:00
Tadashi G. Takaoka
2affaf91a0
Rename mini keyboard to more keys keyboard
...
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
2012-02-08 16:12:31 +09:00
alanv
8d4f0d5d1d
Improved shift key and symbol/alpha switch key accessibility feedback.
...
Bug: 5933165
Change-Id: Id71f38874640785b7ad43b7a70e27f40c13be748
2012-02-07 13:14:18 -08:00
Eric Fischer
5b7f50b10b
Import translations. DO NOT MERGE
...
Change-Id: I01b1e6476b50108810eb61ad45a198db2b52b7de
2012-02-07 11:14:31 -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
Eric Fischer
3f8fc4de9a
Import translations. DO NOT MERGE
...
Change-Id: I9e403e4199935cbb8f356f78316671373324d452
2012-02-03 13:02:58 -08: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
Tadashi G. Takaoka
56d1dc5a58
Shift + smiley key become return key
...
Bug: 2498607
Change-Id: Iec902d8f0035a81e4e793251006d905025bd81cf
2012-02-03 12:28:57 +09:00
Eric Fischer
fbd83a8712
Restore deleted string still referenced from code to fix the build.
...
Change-Id: Ideb39da09730960f555f2b928d699819c986531b
2012-02-02 13:57:15 -08:00
Eric Fischer
8a0bb00989
Import translations. DO NOT MERGE
...
Change-Id: I5d9c89dfe2e5667ef004d1e8b9106279bd23f6f5
2012-02-02 13:10:41 -08: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
satok
e05b3f4b3a
Support additional proximity characters
...
Change-Id: Ifbe0d7e4eafea1926bbce968eae4724dd5769689
2012-02-02 16:07:16 +09:00
Charles Chen
02dd837805
Merge "Removed spoken descriptions for characters supported by TTS or TalkBack."
2012-02-01 10:00:17 -08:00
Tadashi G. Takaoka
71c695da22
Remove BIDI mirroring hack from Key
...
This change also removes isRtlKeyboard attribute from <Keyboard/>
Bug: 5948247
Change-Id: I85998f17ae146a4c8cd0f419ab820b746cb8974f
2012-02-01 22:58:16 +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
alanv
f3e951b259
Removed spoken descriptions for characters supported by TTS or TalkBack.
...
Change-Id: Iddef18559bc6af9487e536a33607b0a0b07df282
2012-01-31 13:02:33 -08:00
Tadashi G. Takaoka
ca2f051cc1
Auto generate various shift states alphabet keyboard automatically
...
If any shift state variants of alphabet keyboard layout is not
specified in KeyboardSet.Element, it will be automatically generated
from base alphabet keyboard definition.
This change also
* Eliminates KeyboardShiftState object from Keyboard.
* Removes various set shift state methods from Keyboard.
* Removes KeyboardSet.Element.elementAutoGenerate attribute.
* Separates "sticky" Key.backgroundType to "stickyOff" and "stickyOn"
* Add preserveCase flag to smiley, .com, and labeled special keys.
* Rename KeyboardShiftState class to AlphabetShiftState.
* Rename some attributes from *UppercaseLetter* to *ShiftedLetterHint*.
* Introduce shiftedLetterActivated to Key.keyLabelFlags
Change-Id: I01a0a8efeeaa76820ae728a5bdfa8d02b6ce74b7
2012-01-31 12:55:45 +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
38a3ad3e3c
Merge "Rename keyboard XML resource files"
2012-01-29 16:36:22 -08:00
Eric Fischer
49761501db
Import translations. DO NOT MERGE
...
Change-Id: I89dcb839308eadb722f91ccd4327208d8d477dc2
2012-01-27 12:02:20 -08:00
Tadashi G. Takaoka
d1630a3add
Rename keyboard XML resource files
...
* <Keyboard> XML file should be kbd_*.xml
* <Row> XML file should be rows_*.xml or row_*.xml
* <Key> XML file should be key_*.xml or keys_*.xml
* <key-style> XML file should be key_styles_*.xml
Change-Id: Ie57d5d78389c13d6c066ace4e3588518d1f25f13
2012-01-28 01:07:29 +09:00
Tadashi G. Takaoka
344a767b33
Share kbd_row3_smiley.xml
...
Change-Id: Ie5e68f972a739ab151201bd13bb1771e164313e6
2012-01-27 21:48:25 +09:00
Tadashi G. Takaoka
566cded5e7
Merge "Use kbd_row3_comman_period.xml"
2012-01-27 04:21:53 -08:00
Tadashi G. Takaoka
ab7cb71b8f
Create separate XML for number password keyboard
...
Change-Id: I1d73a03bfce9180106575e180bfeb422da03b9fb
2012-01-27 21:09:55 +09:00
Tadashi G. Takaoka
3db07d05a3
Use kbd_row3_comman_period.xml
...
Change-Id: Ie2ce2f4f03e70477d4932072a44fb9aeb7cd7784
2012-01-27 21:07:37 +09:00
Tadashi G. Takaoka
425e1996b8
Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags
...
Change-Id: I6c7dc79cbad360602b278283f4c3a24c54040622
2012-01-27 18:11:43 +09:00
Tadashi G. Takaoka
736d740aa5
Merge "Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker"
2012-01-26 00:17:56 -08:00
Tadashi G. Takaoka
160f01211d
Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker
...
This change introduces the following attributes.
* KeyboardView
- keyPreviewLingerTimeout
* LatinKeboardView
- keyHysteresisDistance
- touchNoiseThresholdTime
- touchNoiseThresholdDistance
- slidingKeyInputEnable
- keyRepeatStartTimeout
- keyRepeatInterval
- longPressKeyTimeout
- longPressShiftKeyTimeout
- longPressSpaceKeyTimeout
- ignoreSpecialKeyTimeout
- showMiniKeyboardAtTouchedPoint
Change-Id: I25159a87289b12447e20031add173523070e9b03
2012-01-26 16:10:20 +09:00
Tadashi G. Takaoka
09f8b126e5
Add Key preserveCase enum to keyLabelOptions attribute
...
To support auto generate key depending keyboard element id, the
KeysCache class is introduced to hold whole keys and reuse.
Change-Id: Icb81b5f1c1b3aaa31968dcdb93aa0a856e737f78
2012-01-25 20:16:21 +09:00
Tadashi G. Takaoka
83306b914f
Add element predicator to <switch><case> condition of Keyboard
...
Change-Id: I8f9eb8eb28707d23e421e88f979022d844a3b3ee
2012-01-25 19:09:18 +09:00
Tadashi G. Takaoka
117c124c13
Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard
...
This is the first step to support separate Keyboard for elementName.
This change is the second attempt of Icef66564.
Change-Id: I78ea6cb9ea3d965ff89e0ff5d896a6b11ba5c670
2012-01-25 13:19:53 +09:00
Tadashi Takaoka
8bb20bc682
Revert "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard"
...
This reverts commit b5b92f9b78
Bug: 5908440
2012-01-24 15:20:05 -08:00
Tadashi G. Takaoka
b5b92f9b78
Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard
...
This is the first step to support separate Keyboard for elementName.
Change-Id: Icef66564b6938910fa06ecab664dce4be84c9505
2012-01-24 18:31:11 +09:00
Tadashi G. Takaoka
b009a24b83
Support @icon/icon_name for more keys specification
...
Change-Id: I8842e5ce77f9d27a0969df947de292c1830e36b7
2012-01-20 20:09:02 +09:00
Tadashi G. Takaoka
3fbf9f85a2
Add Bulgarian keyboard
...
Bug: 5864001
Bug: 5738545
Change-Id: I3aa8a0e531e091680c0e05c55e72edd05e5ebc77
2012-01-19 12:59:59 +09:00
Tadashi G. Takaoka
7dde805745
Enable usability study mode option
...
Change-Id: Iadd69fbde42b895dd30f98890f59b56cdcdd4007
2012-01-18 20:17:57 +09:00