nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
32924 commits 1 branch 0 tags 363 MiB
Commit graph

3470 commits

Author SHA1 Message Date
Tadashi G. Takaoka
dc1097ee2e Merge "Update AOSP launcher icon" into lmp-dev 2014-09-11 15:28:53 +00:00
Tadashi G. Takaoka
ed9e100449 Update AOSP launcher icon 
Bug: 16635354
Bug: 16635354
Change-Id: I68f9c4ec21a01b9db0fc73c1785c972f5d7ac05b
 2014-09-12 00:25:43 +09:00
Tadashi G. Takaoka
31544dcb43 Add xxxhdpi assets 
Bug: 17432407
Change-Id: I68e5f660425db567688d4e119c94fc34430f8ff3
 2014-09-11 15:09:30 +00:00
Tadashi G. Takaoka
63ee10d63a am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action key background 
* commit 'c29276b782cfc45be5ab79177e991f2cba8fb04b':
  Keep aspect ratio of Material action key background
 2014-09-09 15:03:15 +00:00
Baligh Uddin
b575170e64 Import translations. DO NOT MERGE 
Change-Id: Id31c38a0c1c737071e3659fc374eaca40f441102
Auto-generated-cl: translation import
 2014-09-09 04:23:48 -07:00
Baligh Uddin
02729904ab Import translations. DO NOT MERGE 
Change-Id: I760fae2840e78c7dce10f6caf9cae4fffdef71c1
Auto-generated-cl: translation import
 2014-09-09 04:20:58 -07:00
Tadashi G. Takaoka
12814352dd am 486c4894: Keep aspect ratio of Material action key background 
* commit '486c4894ce0917fc7b18eaee4bfd031051f2b05b':
  Keep aspect ratio of Material action key background
 2014-09-09 06:19:02 +00:00
Tadashi G. Takaoka
486c4894ce Keep aspect ratio of Material action key background 
Bug: 15681452
Change-Id: Ie4b823dca541b76b68cade580845a21ff0b21e2f
 2014-09-09 14:28:46 +09:00
Jean Chalard
b41ee67194 Fix the sentence separator for Hindi. 
Change-Id: I623e4ccbc324751eb67ec4bb777e2be5ae2a60d1
Bug: 17418371
 2014-09-08 21:54:28 +09:00
Tadashi G. Takaoka
c106efa7cd am 50e8d585: am 56c7ceb4: am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev 
* commit '50e8d5854b981b7fbad24fdb9c141ddf39eb904a':
  Mark isDefault="true" for all supported subtypes
 2014-09-08 10:25:14 +00:00
Tadashi G. Takaoka
56c7ceb47d am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev 
* commit '42665f0ee26407fae984446b306309376aac2b36':
  Mark isDefault="true" for all supported subtypes
 2014-09-08 10:05:34 +00:00
Tadashi G. Takaoka
42665f0ee2 Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev 2014-09-08 09:56:25 +00:00
Yohei Yukawa
b9bd524b58 am c1ee8857: am a6c53d31: am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev 
* commit 'c1ee88572232235d5972220ec1e5232de58a916e':
  Revert "Use right arrow for the commit indicator"
 2014-09-08 09:17:31 +00:00
Tadashi G. Takaoka
5314e5c38c Mark isDefault="true" for all supported subtypes 
Bug: 17381393
Change-Id: I3a2852c76d6f3dda551529673e7d4e957ced53ca
 2014-09-08 18:14:51 +09:00
Jean Chalard
a1d2315499 Merge "Fix a bug with the Greek question mark." 2014-09-08 08:58:27 +00:00
Yohei Yukawa
a6c53d31fd am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev 
* commit '257dfa79f7f19eac5f3481f1b8fe28038d1e0c5e':
  Revert "Use right arrow for the commit indicator"
 2014-09-08 07:58:01 +00:00
Yohei Yukawa
257dfa79f7 Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev 2014-09-08 07:49:22 +00:00
Yohei Yukawa
b915753a07 Revert "Use right arrow for the commit indicator" 
This reverts commit 2412d9ae3c.

Change-Id: Ie8090735850e2f2d075d0bdaf3ef628d866b5514
 2014-09-08 07:46:11 +00:00
Jean Chalard
b526a894db Fix a bug with the Greek question mark. 
Bug: 17398284
Change-Id: If49593e2c959935a183a4cd9d988407cc1160599
 2014-09-08 15:33:51 +09:00
Tadashi G. Takaoka
100a8aec5b am ad4de3fc: am 9ca6658e: am 0f33e614: Implement Floating Action Button more keys keyboard 
* commit 'ad4de3fc819d658775eed470fc74ad76da5caad2':
  Implement Floating Action Button more keys keyboard
 2014-09-08 06:07:52 +00:00
Tadashi G. Takaoka
9ca6658e9a am 0f33e614: Implement Floating Action Button more keys keyboard 
* commit '0f33e614c0799fa3a14a2c32db4bf0654df039da':
  Implement Floating Action Button more keys keyboard
 2014-09-08 05:48:19 +00:00
Tadashi G. Takaoka
e1b10aedd7 am 3aabf655: am f21c77d7: am 727e818e: Move more keys divider to MoreKeysKeyboardView 
* commit '3aabf655d0125fb824e5e47687f5084b2df6979c':
  Move more keys divider to MoreKeysKeyboardView
 2014-09-08 05:42:32 +00:00
Tadashi G. Takaoka
0f33e614c0 Implement Floating Action Button more keys keyboard 
Bug: 15681452
Change-Id: I8484e4fe4d989b391f2b5230836dc9dfac218429
 2014-09-08 14:34:33 +09:00
Tadashi G. Takaoka
f21c77d7b7 am 727e818e: Move more keys divider to MoreKeysKeyboardView 
* commit '727e818e95ef68460ebafb2eb3b11c23a2d8fcd8':
  Move more keys divider to MoreKeysKeyboardView
 2014-09-08 05:24:19 +00:00
Tadashi G. Takaoka
727e818e95 Move more keys divider to MoreKeysKeyboardView 
Bug: 15681452
Change-Id: I1b32719cc927a24db4c41fdeb812b39f7e98a85c
 2014-09-08 11:02:07 +09:00
Tadashi G. Takaoka
8b7ed7f6c6 am 079f9c3f: am 1b430219: am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev 
* commit '079f9c3f5ae7b2f7926321522b6020affd422b52':
  Create donottranslate debug settings string resources file
 2014-09-05 17:23:45 +00:00
Tadashi G. Takaoka
6e259d560e am 82c8696f: am c7b8858e: am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev 
* commit '82c8696f526d3ab121a7e8d188acf30ce6ae8e9c':
  Refactor action label/icon definitions
 2014-09-05 17:23:44 +00:00
Tadashi G. Takaoka
1b43021949 am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev 
* commit '6888ec009951ffd900c04a0ad179a94d47eca03c':
  Create donottranslate debug settings string resources file
 2014-09-05 15:37:02 +00:00
Tadashi G. Takaoka
c7b8858ec1 am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev 
* commit '6ba84dcd96418a7a568afeaf064aa64cf94a1839':
  Refactor action label/icon definitions
 2014-09-05 15:37:01 +00:00
Tadashi G. Takaoka
6888ec0099 Merge "Create donottranslate debug settings string resources file" into lmp-dev 2014-09-05 08:29:35 +00:00
Tadashi G. Takaoka
6ba84dcd96 Merge "Refactor action label/icon definitions" into lmp-dev 2014-09-05 08:25:12 +00:00
Tadashi G. Takaoka
5166e9f0ff Refactor action label/icon definitions 
Bug: 15782668
Change-Id: Ibf1205d46e9293d516a56030ba10841128f57450
 2014-09-05 11:44:18 +09:00
Tadashi G. Takaoka
f0f49f9806 Create donottranslate debug settings string resources file 
This is a follow up of the I26e4d292de.

Bug: 15678343
Bug: 17385083
Change-Id: I2c2b08b8dd991ac981aa8f8c8436de9e4399da5f
 2014-09-05 11:38:29 +09:00
Tadashi G. Takaoka
626e174519 am d9458302: am 9d3db691: am 79eae0ad: Merge "Update active key backgrounds" into lmp-dev 
* commit 'd9458302ea69301c521c2d77dc52cb1ae0499d19':
  Update active key backgrounds
 2014-09-05 00:38:10 +00:00
Tadashi G. Takaoka
9d3db6914b am 79eae0ad: Merge "Update active key backgrounds" into lmp-dev 
* commit '79eae0ada40d7af096ad95e03ab1f32c8369cb2c':
  Update active key backgrounds
 2014-09-05 00:13:46 +00:00
Tadashi G. Takaoka
79eae0ada4 Merge "Update active key backgrounds" into lmp-dev 2014-09-05 00:06:23 +00:00
Baligh Uddin
5feaf11852 Merge "Import translations. DO NOT MERGE" 2014-09-04 19:21:09 +00:00
Baligh Uddin
c11f977645 Merge "Import translations. DO NOT MERGE" 2014-09-04 19:21:03 +00:00
Baligh Uddin
62181eeefe Merge "Import translations. DO NOT MERGE" 2014-09-04 19:21:00 +00:00
Baligh Uddin
059c535fbd Import translations. DO NOT MERGE 
Change-Id: I054d5673b4b3fcb9303e53c8409f3ba26226e335
Auto-generated-cl: translation import
 2014-09-04 05:03:06 -07:00
Baligh Uddin
c146718960 Import translations. DO NOT MERGE 
Change-Id: I33d3e1e6dc9695ef779be31952ba4126d5233df2
Auto-generated-cl: translation import
 2014-09-04 05:00:46 -07:00
Baligh Uddin
3305a02dc3 Import translations. DO NOT MERGE 
Change-Id: I198c14a1374a0b61bf5aa3cdf013fca8260bc97f
Auto-generated-cl: translation import
 2014-09-04 04:57:43 -07:00
Baligh Uddin
6146bc0bca Import translations. DO NOT MERGE 
Change-Id: I7fbf4df1000e05cbd5a12a95bd60d36b5eac14d9
Auto-generated-cl: translation import
 2014-09-04 04:50:29 -07:00
Tadashi G. Takaoka
dcb49afd0c Update active key backgrounds 
Bug: 15681452
Change-Id: I05f06b35748d090a58f3524df719586093431d07
 2014-09-04 14:31:02 +09:00
Tadashi G. Takaoka
91b5fa5831 am 2ff7865e: am cc5050d7: Update spacebar background for Material 
* commit '2ff7865e87bf8bc27e6c3f6d6067caec8828ebbf':
  Update spacebar background for Material
 2014-09-03 17:55:55 +00:00
Tadashi G. Takaoka
964877a8f2 am c297197b: am 1c2cf719: Add new value "spacebar" to Key.backgroundType attribute 
* commit 'c297197b1548307c31017ba3dc89bbb6bbf2223e':
  Add new value "spacebar" to Key.backgroundType attribute
 2014-09-03 17:55:54 +00:00
Tadashi G. Takaoka
e355274642 am ec7d6752: am 5a9c9649: Removes "customAction" value from Key.backgroundType attribute 
* commit 'ec7d67529e0dd4e5bf87e3b96c4b78db44adb96f':
  Removes "customAction" value from Key.backgroundType attribute
 2014-09-03 17:55:53 +00:00
Tadashi G. Takaoka
6a4e9218ca am 2a7a5740: am 0af2472a: Add new "keyboardTheme" <case> predicator 
* commit '2a7a5740e929503a0aca23f376175a9c118b7a83':
  Add new "keyboardTheme" <case> predicator
 2014-09-03 17:55:52 +00:00
Tadashi G. Takaoka
96e4828f10 am 836987c0: am ca70bd5f: Fix depedency of debug settings 
* commit '836987c0cd3d290425b37209e98295734aedb017':
  Fix depedency of debug settings
 2014-09-03 17:41:45 +00:00
Tadashi G. Takaoka
cc5050d7ca Update spacebar background for Material 
Bug: 17318036
Change-Id: Iaa091b525433d56db9aca9e0301f3727ce392605
 2014-09-03 14:39:13 +00:00
Tadashi G. Takaoka
1c2cf71921 Add new value "spacebar" to Key.backgroundType attribute 
Bug: 17318036
Change-Id: Ie84438a6aa3adc14a9db603d0cd4d5e37a55d612
 2014-09-03 23:37:03 +09:00
Tadashi G. Takaoka
5a9c9649db Removes "customAction" value from Key.backgroundType attribute 
Bug: 17318036
Change-Id: I6a36d50ba2e69eafbb0faa049014281bd4d4ddfc
 2014-09-03 23:35:39 +09:00
Tadashi G. Takaoka
0af2472a69 Add new "keyboardTheme" <case> predicator 
Bug: 17318036
Change-Id: Ief386c84969d8646fb5cfe2050a2f59a7db16c88
 2014-09-03 23:26:46 +09:00
Tadashi G. Takaoka
ca70bd5f3a Fix depedency of debug settings 
This is a follow of the I26e4d292de.

Bug: 15678343
Change-Id: I364d6df386cf32102e4ebb0151d18e49dcc5bd2c
 2014-09-03 05:05:07 +00:00
Yohei Yukawa
961cb1abf3 am 15c29c35: am 6ef88a65: Merge "Use right arrow for the commit indicator" into lmp-dev 
* commit '15c29c3538695145d34b883a1ad8222458eb6eaa':
  Use right arrow for the commit indicator
 2014-09-02 19:14:25 +00:00
Yohei Yukawa
6ef88a65a2 Merge "Use right arrow for the commit indicator" into lmp-dev 2014-09-02 18:30:15 +00:00
Tadashi G. Takaoka
d27af1a5d4 am 3ad86d91: am afa9d6d8: Merge "Add theme aware key popup preview animation" into lmp-dev 
* commit '3ad86d91f1e3d251635303e0fb9a83dce22efa3a':
  Add theme aware key popup preview animation
 2014-09-02 17:44:10 +00:00
Tadashi G. Takaoka
012d749ef1 am 3e9bbf17: am f4383ed3: Fix missing Material light more keys\' background 
* commit '3e9bbf17350d385352e62ce2326ad5898619fb88':
  Fix missing Material light more keys' background
 2014-09-02 17:43:30 +00:00
Yohei Yukawa
2ea06d5e7e am 446f53f9: am ee0d8077: Show the commit indicator only for word to be auto-corrected 
* commit '446f53f9c03a7846bd3d13cf61f1a7851cc8ae74':
  Show the commit indicator only for word to be auto-corrected
 2014-09-02 17:34:13 +00:00
Tadashi G. Takaoka
afa9d6d8de Merge "Add theme aware key popup preview animation" into lmp-dev 2014-09-02 12:17:57 +00:00
Tadashi G. Takaoka
ac88f3d845 Add theme aware key popup preview animation 
Bug: 15678343
Change-Id: I26e4d292deab37724387cc9ebc03033fcd698c60
 2014-09-02 18:45:23 +09:00
Tadashi G. Takaoka
f4383ed3a2 Fix missing Material light more keys' background 
Bug: 15782668
Change-Id: I8b59d8a4dabe03418e520c18d5d64e2d10f4cae2
 2014-09-02 10:59:23 +09:00
Baligh Uddin
509b6c9ad6 Merge "Import translations. DO NOT MERGE" 2014-09-01 21:45:59 +00:00
Baligh Uddin
c5e9f51d3d Import translations. DO NOT MERGE 
Change-Id: I7f8ff7d676862ccba5c3f4bf4675d8252e6669db
Auto-generated-cl: translation import
 2014-09-01 04:12:00 -07:00
Baligh Uddin
8b0db442fa Import translations. DO NOT MERGE 
Change-Id: Ic84804506b360a3d1d756f907be7f3dcedf26a23
Auto-generated-cl: translation import
 2014-09-01 04:10:46 -07:00
Yohei Yukawa
2412d9ae3c Use right arrow for the commit indicator 
Change-Id: I5074acd2eec451f77b47378bf9a5f7a14c792ce6
 2014-08-29 22:29:25 -07:00
Yohei Yukawa
ee0d8077d6 Show the commit indicator only for word to be auto-corrected 
Change-Id: I61e25b960ae083857efc2704498a0761e0965ad3
 2014-08-29 17:31:36 -07:00
Tadashi G. Takaoka
2d713c87c6 am 2fabd50d: am f507d1fe: Support RTL layout in custom input style settings 
* commit '2fabd50df49f894afde15ac5f4ebd2ff5372a9c4':
  Support RTL layout in custom input style settings
 2014-08-29 19:07:04 +00:00
Tadashi G. Takaoka
f507d1febb Support RTL layout in custom input style settings 
Bug: 17322353
Change-Id: I3b211ab8729121271563a8a243558a58ee7847c2
 2014-08-29 18:28:53 +09:00
Jean Chalard
98e56c6905 am 3ef26ac1: am 6bd267f4: Merge "Add new attributes to our notification" into lmp-dev 
* commit '3ef26ac13b677bc8d7adeed378ce6d6cbad171ee':
  Add new attributes to our notification
 2014-08-28 09:52:03 +00:00
Jean Chalard
a2928484f6 Add new attributes to our notification 
Bug: 17167221
Bug: 17128331
Change-Id: I6a045fd2398f40dbdc10c9d20993f7513e1f2cff
 2014-08-28 07:47:07 +00:00
Baligh Uddin
cb7d1a63f1 Merge "Import translations. DO NOT MERGE" 2014-08-27 18:33:41 +00:00
Baligh Uddin
723d24e5a8 Merge "Import translations. DO NOT MERGE" 2014-08-27 18:33:41 +00:00
Baligh Uddin
4b97e997f5 Merge "Import translations. DO NOT MERGE" 2014-08-27 18:33:38 +00:00
Baligh Uddin
6f67018d8d Merge "Import translations. DO NOT MERGE" 2014-08-27 18:33:34 +00:00
Tadashi G. Takaoka
8b5788d72b am 68a2a69a: am 37beaf15: Simplify onComputeInsets of LatinIME 
* commit '68a2a69ae35352650a4c6dfc0b0c69069c4a1e1d':
  Simplify onComputeInsets of LatinIME
 2014-08-27 10:44:51 +00:00
Tadashi G. Takaoka
37beaf1529 Simplify onComputeInsets of LatinIME 
This CL expands SoftInputWindow to the entire screen. Thus a key
review backing view is eliminated and onComputeInsets() gets
simplified too.

Bug: 17212702
Bug: 10841052
Bug: 10541453
Change-Id: I2d859f4e4698c64cabe399000821f13bab729996
 2014-08-27 19:20:38 +09:00
Ken Wakasa
c1596086d3 resolved conflicts for merge of 0268f736 to master 
Change-Id: Ib89ef55a8752f9b5e357eed3a05c79dd28d0ec0e
 2014-08-27 18:41:31 +09:00
Baligh Uddin
511e6729db Import translations. DO NOT MERGE 
Change-Id: I0e264ee268375e1de7cd887a15f5b5e58e088329
Auto-generated-cl: translation import
 2014-08-27 02:18:44 -07:00
Baligh Uddin
d002c54ec2 Import translations. DO NOT MERGE 
Change-Id: I632754d86444b86051d9d27becef3994c82a9458
Auto-generated-cl: translation import
 2014-08-27 02:13:38 -07:00
Baligh Uddin
d036341454 Import translations. DO NOT MERGE 
Change-Id: Icd839563ab1ac8d8233a8c8ad49daee02a87bd2b
Auto-generated-cl: translation import
 2014-08-27 02:12:14 -07:00
Baligh Uddin
bd187bd803 Import translations. DO NOT MERGE 
Change-Id: I067525751c072822661b855072b25e574f719a23
Auto-generated-cl: translation import
 2014-08-27 02:10:48 -07:00
Yohei Yukawa
bea17c49ec Introduce commit/add-to-dictionary indicators 
This CL introduces commit/add-to-dictionary indicators.

Note that the text is not yet highlighted when the commit
indicator is displayed. It will be addressed in subsequent
CLs.

Change-Id: I7e9b0fcfdc0776a50a1d8cfb41ee0add813317dd
 2014-08-26 21:20:27 -07:00
Yohei Yukawa
d8dfac6dcb am abf05cc0: am fdfe73ff: Merge "Use more descriptive names for some internal fields" into lmp-dev 
* commit 'abf05cc0da1ead7e270a7c99bf9f000dabf91f5b':
  Use more descriptive names for some internal fields
 2014-08-25 10:16:11 +00:00
Yohei Yukawa
a61b7245b0 Use more descriptive names for some internal fields 
This CL clarifies that delay parameters are specified with
milliseconds.

Change-Id: I401a60b8c09c2a04201af5b74babcdb091c07f4a
 2014-08-25 02:28:01 -07:00
Tadashi G. Takaoka
ef7c701e72 am 129af927: am 5e7a6fe0: Merge "Fix the bottom row of tablet keyboard layout" into lmp-dev 
* commit '129af92713c59016d13b957e55ce089984ccc4e8':
  Fix the bottom row of tablet keyboard layout
 2014-08-25 08:25:32 +00:00
Tadashi G. Takaoka
c9aa1beb6d Fix the bottom row of tablet keyboard layout 
This CL eliminates "_" and "/" keys from the bottom row of tablet
keyboard.  This CL also reorganizes the bottom row of tablet Dvorak
keyboard.

Bug: 16603887
Change-Id: Ic1570836dea1a475bed5d43aeb6a351507bf5428
 2014-08-25 12:34:58 +09:00
Baligh Uddin
19a7012db5 Merge "Import translations. DO NOT MERGE" 2014-08-22 18:29:52 +00:00
Baligh Uddin
bf32c26578 Merge "Import translations. DO NOT MERGE" 2014-08-22 18:29:52 +00:00
Baligh Uddin
dafd54f055 Merge "Import translations. DO NOT MERGE" 2014-08-22 18:29:48 +00:00
Baligh Uddin
f1d070eae2 Merge "Import translations. DO NOT MERGE" 2014-08-22 18:29:48 +00:00
Baligh Uddin
7bf6d900b9 Merge "Import translations. DO NOT MERGE" 2014-08-22 18:29:42 +00:00
Tadashi G. Takaoka
560876508f am cc4d21df: am 2637be27: Support Accept typed word UI 
* commit 'cc4d21df7b08c3143dd1c4af786609a279a0bb79':
  Support Accept typed word UI
 2014-08-22 14:27:26 +00:00
Tadashi G. Takaoka
2637be27c5 Support Accept typed word UI 
Change-Id: I58e95b2791a45afdc7dae8e26dcfc200b3b4b854
 2014-08-22 21:25:35 +09:00
Yohei Yukawa
5a96395b78 am 8cbc37f2: am 8e2fcaa3: Merge "Use FrameLayout for the backing view" into lmp-dev 
* commit '8cbc37f2c803fe5854237434742845a7b8ee32b9':
  Use FrameLayout for the backing view
 2014-08-21 18:38:12 +00:00
Tadashi G. Takaoka
d6696ae78b Add Hinglish (hi_ZZ) subtype 
Bug: 17169632
Change-Id: Ibee088d76c2b19f1d62a3c9c119452726e856ec8
 2014-08-21 19:12:25 +09:00
Baligh Uddin
8fb9874470 Import translations. DO NOT MERGE 
Change-Id: I3cae3b62faf27fea8cc7c24051ac18f415934399
Auto-generated-cl: translation import
 2014-08-18 23:15:21 -07:00
Baligh Uddin
2b250a1174 Import translations. DO NOT MERGE 
Change-Id: I9d51675746cc1b3987f2c7a2469a3deced820e69
Auto-generated-cl: translation import
 2014-08-18 23:14:04 -07:00
Baligh Uddin
0c4679699f Import translations. DO NOT MERGE 
Change-Id: Iacc87d9f13f21de7584cd5028527ec59c7c12802
Auto-generated-cl: translation import
 2014-08-18 23:09:41 -07:00
Baligh Uddin
71673204f0 Import translations. DO NOT MERGE 
Change-Id: Ieef69130fa6f1f9c9f95a8f308175fbec470af86
Auto-generated-cl: translation import
 2014-08-18 23:08:37 -07:00