nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,696 Commits
1 Branch
0 Tags
363 MiB
Commit Graph

3637 Commits (697033f93f50fb9641faa0e82d2e4e2b834a03bf)

Author SHA1 Message Date
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