Commit Graph

8278 Commits (407f8a3216ad1ec403ed1c3aeb7c46192eae3cd8)

Author SHA1 Message Date
Jatin Matani 8c2591eec8 Bring back shortcuts and add to dictionary UI
For JB and lower devices, the UI is surfaced by the IME.
Bug: 22200135
Change-Id: Icca08500ee0683e2ceb5357b0bc430cd1712220e
2015-07-06 17:32:13 -07:00
Dan Zivkovic d23dd5978d Don't prompt before downloading.
We don't pay attention to the answer, so don't ask.

Bug 22069694.

Change-Id: Ic048d5570e68fbc9438c6577e27e6c7f68428606
2015-06-25 15:01:04 -07:00
Dan Zivkovic 5e4c0caac3 Add some more logging. Why not.
Change-Id: I536212e1b3c35d75ed93f9ab3762908e3deb9a97
2015-06-24 18:56:48 -07:00
Dan Zivkovic 3aad142435 Load metadata.json from resources on DB reset.
This will ensure that a new (or upgraded) keyboard instance will know which
dictionaries are available for download so it requests missing dictionaries.
In addition, we increment the database version number to ensure upgrades of
existing Fava instances start with a clean slate.

Bug 22069694.

Change-Id: Id71310412682543a3931f9c5c03cb0369fa7b9ac
2015-06-24 18:40:34 -07:00
Tom Ouyang c32389ce11 Merge "Small optimization to eliminate a >0 check in RichInputConnection." into jb-ub-latinimegoogle 2015-06-24 19:44:37 +00:00
Tom Ouyang 96640a110b Small optimization to eliminate a >0 check in RichInputConnection.
Change-Id: Ibdf97726008c1f94c970461196ba445ce328a8cb
2015-06-24 12:00:04 -07:00
Dan Zivkovic 563d7935a9 Extend laggy connection timeout for initial load.
The initial reloadTextCache() operation needs to read 1k characters, and it
could be slow on low-end devices. Also, the initial load is not blocking key
strokes, so it can take a little longer.

Bug 22062102.

Change-Id: I134424e8910c0d6131c311a862bdc87eccd3af44
2015-06-24 11:57:59 -07:00
Dan Zivkovic ecea6a6113 Merge changes Iaed8abfb,I8e55b57c into jb-ub-latinimegoogle
* changes:
  LatinIME portion of StatsUtil change.
  Do not decorate committed spans.
2015-06-23 20:55:23 +00:00
Tom Ouyang 67eaf613f7 Merge "Workaround for preserving responsiveness on a slow InputConnection." into jb-ub-latinimegoogle 2015-06-23 20:35:09 +00:00
Tom Ouyang 912016b69f Workaround for preserving responsiveness on a slow InputConnection.
1. Add mechanism to detect a slow or non-resonsive InputConnection (IC)
2. When IC slowness is detected, skip certain IC calls that are known
   to be expensive (e.g., getTextAfterCursor).
3. Similarly, disables learning / unlearning on a slow IC.
4. IC slowness flag is reset when starting input on a new TextView or
   when a fixed amount of time has passed.

Note: These are mostly temporary workarounds. The permanent solution is
to refactor RichInputConnection so that it is less sensitive to IC
slowness in general.

Bug: 21926256
Change-Id: I383fab0516d3f3a8e0f71e5d760a8336a7730f7c
2015-06-23 10:34:44 -07:00
Dan Zivkovic ee6de1466b Do not decorate committed spans.
Users rarely tap on committed words, and the cost of sending the spans back
through the input connection, back and forth to the target app, is too high.

Bug 21926256.

Change-Id: I8e55b57ce2148ed313dc927425b6d9c958634958
2015-06-23 10:25:58 -07:00
Dan Zivkovic 4e9d260826 Do not force downloads on package replace.
This is causing issues we can't deal with in a safe and timely manner.
Furthermore, users who need downloaded dictionaries already have them by now.

Bug 21797386.

Change-Id: I97e5fd84edcf2b16f04db57b7ae4a13fa9ce993f
2015-06-23 10:15:34 -07:00
Mohammadinamul Sheik bf7c0106b0 Fix the previous downloads logic to not missing any downloads.
Bug: 21797386
Change-Id: Ic09698b28e31b4f16831898d7cb08853f4e5df4a
2015-06-22 20:23:27 -07:00
Dan Zivkovic 73aaf68337 Detection and logging of slow input connections.
Also adds a hook to log using StatsUtils.
Proto change is coming in a separate CL.

Bug 22010482.

Change-Id: I08065fc7a5cd116e50ff84cb14bbbc44c4f14bc7
2015-06-22 17:36:53 -07:00
Mohammadinamul Sheik 5a51e4a0a8 Clear/remove all the scheduled downloads in Download Manager
Bug: 21797386
Change-Id: I60f50a2fe890af46f5e847c34df2edf719d40ac4
2015-06-22 12:57:31 -07:00
Chieu Nguyen 779d4bb429 Disable download notifications.
Change-Id: I25263fe227ae88afa2021454b0dac2b0c7b9bfe0
2015-06-19 21:52:20 -07:00
Dan Zivkovic 0232e73dfa Cleanup before fixing getTextAfterCursor().
We never delete text after the cursor, so constrain the API accordingly.
Define the number of characters to read before and after.
Set them to reasonable values.
The next CL will start caching text after the cursor.

Bug 21926256.

Change-Id: Idd58daf68614de4a69344aa3c8a4323720c5d3a0
2015-06-19 12:06:18 -07:00
Dan Zivkovic 02c28453fc Do not restrict downloads to WiFi networks.
Bug 21900337.

Change-Id: I82991b492ea4c02a28a1ccc898d6f12741f1b793
2015-06-17 12:53:55 -07:00
Dan Zivkovic 764a18cd92 Revert "Remove "Personal dictionary" link from settings."
This reverts commit 76de0a8f52.

Bug 21881199.

Change-Id: I53f42a1e8f25d214de97264f4d25813bc637cafa
2015-06-16 18:26:02 -07:00
Mohammadinamul Sheik 94b4ffa17a Merge "Hide Notification when downloading the keyboard metadata" into jb-ub-latinimegoogle 2015-06-16 00:23:02 +00:00
Mohammadinamul Sheik 851a8b5489 Hide Notification when downloading the keyboard metadata
Bug: 21797386
Change-Id: Iebe9d2f18c5c8325a5601d49d8c4c65166b67036
2015-06-15 16:04:43 -07:00
Dan Zivkovic a9c235b533 Change metadata fetch interval back to 4 days.
Bug 19774872.

Change-Id: Icd790414d9462ee74a7eac11dd255fddf3048dce
2015-05-28 13:29:10 -07:00
Dan Zivkovic 7891733c73 Remove dogfood history reset.
Change-Id: I1d7ebe5962fc3176c376e1ce34c7ac98cdf41373
2015-05-21 10:24:15 -07:00
Dan Zivkovic 0e15ff6b48 Fix on-commit bug in AOSP keyboard.
Bug 21272977.

Change-Id: Id561040c29a7f2576cd9ef0514c31751a4360ef8
2015-05-19 10:45:19 -07:00
Mohammadinamul Sheik b08f434482 Make the DictionaryService check for download every day.
Bug: 20103664
Change-Id: Iba019d5f79f46c560171e0594c2b5114b477923a
2015-05-12 13:49:35 -07:00
Mohammadinamul Sheik 44caf52581 Merge "clean up debug tags." into jb-ub-latinimegoogle 2015-05-12 20:46:29 +00:00
Mohammadinamul Sheik 142294a9fe clean up debug tags.
Change-Id: I2ca37bd691abcc036ead8071045d37d72b2d088d
2015-05-12 10:46:12 -07:00
Dan Zivkovic f7a8edba2f Merge "Update the DB version." into jb-ub-latinimegoogle 2015-05-08 19:28:55 +00:00
Dan Zivkovic f4590b0e28 Update the DB version.
Bug 20103664.

Change-Id: I1e2b72979df148d8aa71e3e58437a5853e63c261
2015-05-08 12:25:47 -07:00
Jatin Matani e09da0aeb9 Set syncAutomatically for sync users
Note: this doesn't mean that sync would happen.
It only unblocks users who are already opted into
cloud sync

Change-Id: I91836efadac89d0429d7f2e9c9190a873a638743
2015-05-07 20:52:34 -07:00
Dan Zivkovic bdc55e77f7 Metadata URI does not need additionalId.
Bug 20701628.

Change-Id: Ifba1e7dd7f9934c8c13279dfb95bf02c0e30e650
2015-05-06 09:30:47 -07:00
Dan Zivkovic 9bad1ac33f Look up thresholds during decoder reset.
Bug 20701628.

Change-Id: I4de89587776a0859aeda5d2ed76ab1eb4f918458
2015-05-04 14:48:28 -07:00
Mohammadinamul Sheik f01cd568f0 Merge "Make the DictionaryService stage the downloaded files" 2015-05-04 19:04:15 +00:00
Mohammadinamul Sheik a0d9c82921 Make the DictionaryService stage the downloaded files
Bug: 20641948
Change-Id: I6639c995b12c033bc30241cd219201dd483ee516
2015-05-04 11:57:31 -07:00
Dan Zivkovic f22571e2d9 Delete history on upgrade in LatinIME.
Bug 20733902.

Change-Id: Ibe27e6cafe4db87ba62d7df708229e0d8564ffa8
2015-05-01 12:45:07 -07:00
Tom Ouyang 89f9070264 Do not learn from cursor corrections when autocorrection is disabled.
Bug: 20681528
Change-Id: I80e7095b70a151f3ccc36856d7e0837613a35972
2015-04-30 15:10:50 -07:00
Dan Zivkovic 459b4f353e Spelling cannot cache words across invocations.
We want to let the facilitator decide if a word is valid or invalid, and cache
the answer in the facilitator's cache. The spell checker session doesn't need
its own word cache, except as a crutch to communicate suggestions to the code
that populates the suggestion drop-down. We leave that in place.

Bug 20018546.

Change-Id: I3c3c53e0c1d709fa2f64a2952a232acd7380b57a
2015-04-29 14:30:49 -07:00
Chieu Nguyen 767c0bf71b Restore preference change update to show app icon setting.
Bug: 20544640
Change-Id: I6e2a26a8a5e43360dfefcc85bb46eae28f5e3867
2015-04-27 13:53:17 -07:00
Dan Zivkovic 784233dbc6 Specify fileName argument as Nullable.
Bug 20526371.

Change-Id: If53a81f925fbb1b29ad945ba0ec2192d92ae1eff
2015-04-23 14:12:33 -07:00
Chieu Nguyen a2376cd2b4 Restore switch for showing app icon.
Bug: 20307420
Change-Id: I95969de40936d2ea992669324d0c4df7e8de2bd9
2015-04-22 15:46:40 -07:00
Yohei Yukaw 490fa47a46 Always specify non-null Locale object to SuggestionSpan
Confusingly, specifying a null Locale object to the constructor
of SuggestionSpan does not necessarily mean that
SuggestionSpan#getLocale() returns null.  The constructor in
question also receives Context object, and Context's locale can
be used as a fallback locale to initialize locale of
SuggestionSpan.

With this CL, LatinIME always specify non-null Locale object
when instantiating SuggestionSpan object.  It basically
corresponds to the active main dictionary, but can be
Locale#ROOT when one locale is not determined for some reasons.

BUG: 20435013
Change-Id: I2c152466410327300e7dba4d7ed9a22f57c17c4f
2015-04-20 20:29:44 -07:00
Martin Paraskevov 54e891e2bd Merge "Fix bug in regular expression stripping quotes." 2015-04-21 03:04:13 +00:00
Martin Paraskevov ab8482a34b Fix bug in regular expression stripping quotes.
Change-Id: Iaf84a9a1f00b31daf7225991c4cfc5f17b578028
2015-04-20 19:58:45 -07:00
Tom Ouyang cdfe8b93ec Merge "Add affinity model for contact names." 2015-04-17 01:05:44 +00:00
Martin Paraskevov c155f7f5fd Merge "Strip quotes from begining/end of a word before checking its validity." 2015-04-16 23:46:40 +00:00
Tom Ouyang 44a175732d Add affinity model for contact names.
This allows us to:
1. Rank contacts and only add the top N names to the keyboard LM.
2. Avoid adding duplicate names.

Note: The affinity calcualuation is limited by the fact that some apps
currently do not update the TIMES_CONTACTED counter. To better handle
this case, the new measure also takes into account whether or not a
name is in the visible contacts group.

Bug: 20053274
Change-Id: I2741cb8958667d4a294aba8c437a45cec4b42dc7
2015-04-16 11:33:54 -07:00
Martin Paraskevov 8ff42d1581 Strip quotes from begining/end of a word before checking its validity.
Bug: 20142633

Change-Id: Ia0f3661ac3028473c00f83df72dcb9e1fd134247
2015-04-15 19:00:45 -07:00
Mohammadinamul Sheik 3a5de64110 Do not re-download the unused dictionaries.
Does the following
1. Uses dictionaries from the files/ directory while populating the
   entries into the pendingUpdates table. So that a download happens only
   if the metadata.json says so.
2. Delete an unusable dictionaries from the files/ directory.

Bug: 20142708
Change-Id: Ibd738793585c39735868e324b8ad682dff0eba34
2015-04-15 11:12:40 -07:00
Jatin Matani bf732e7001 Merge "Store raw strings for personal dictionary" 2015-04-14 18:03:56 +00:00
Mohammadinamul Sheik db96122787 Fix the NPE on selection string on unlearnWord
Bug: 20150386
Change-Id: I2ed69aba7b1fdaba1e2ac07b8218a265dfe23e09
2015-04-13 16:30:22 -07:00
Jatin Matani 1bfd7be208 Store raw strings for personal dictionary
The raw strings would be sent to personal LM for decoding.
Earlier lowercased strings were being used with the purpose
of isValid checks (spelling does not consider casing for spell
checking calls). But for showing these in suggestion, we need the
raw strings.

Note: PersonalDictionaryLookup#getWordsForLocale is used to feed
the personal LM in PersonalLanguageModelHelper.

Bug:20152986
Change-Id: I9d796fa57bf2073036bf11d86b143ff205a6199c
2015-04-13 16:28:26 -07:00
Dan Zivkovic 40f0f61bb3 Merge "Personal dictionary feeds a personal LM." 2015-04-10 01:43:35 +00:00
Dan Zivkovic 541ef56e05 Personal dictionary feeds a personal LM.
Bug 20043003.

Change-Id: I5ccac344c089855474263d1cdc547da1e6779301
2015-04-09 18:35:57 -07:00
Tom Ouyang 3952078a91 Extract fewer characters in getWordRangeAtCursor().
Use LOOKBACK_CHARACTER_NUM = 80 instead of the previous
EDITOR_CONTENTS_CACHE_SIZE = 1024 (which was overkill).

This speeds up many InputLogic operations.

Bug: 19987461
Change-Id: I62b6a589f87e5daab33376b3e48f1c615a66dcfb
2015-04-09 11:45:55 -07:00
Dan Zivkovic 7f386acdd1 Make logs less spammy.
Bug 19987461.

Change-Id: Ibf58f2b26c2d01f765ef32abb47c84be49e2ba9f
2015-04-07 11:43:18 -07:00
Dan Zivkovic 6bb7011559 Read less data from the input connection.
Currently, we read 256 (max word size) * 5 (max N-gram size + 1) characters
from the input connection when building our context. This is overkill. We
don't need more than 80 characters, regardless of which decoder we use.

Bug 19987461.

Change-Id: Ie3a321cf2482adbacd8006d9d86e6601097c15ed
2015-04-07 11:18:58 -07:00
Dan Zivkovic 3e66c6357d Skip decoding for in-vocabulary words.
The spell checker is decoding, and getting multiple sets of suggestions, for
every word it encounters. It even does that for in-vocabulary words, though
it will not underline or show suggestions for in-vocabulary words.

Bug 19987461.

Change-Id: Ie61101fa8ab8917f3f49c77768dbcffd96c1685e
2015-04-07 10:48:36 -07:00
Dan Zivkovic ec2891b007 Define stats for UserDictionaryLookup.
Bug 20071513.

Change-Id: Iaab909575da29bfe6e17bb3865ce51d1e7720e7c
2015-04-06 11:10:55 -07:00
Tom Ouyang e1b13a4550 Log timing for performUpdateSuggestionStripSync.
Change-Id: Id08daf7c06e874b43deed77a49b65969dadb1565
2015-04-03 15:23:52 -07:00
Mohammadinamul Sheik ceaafa2ff9 Merge "Do not throw NPE if the dictionary info is not available on db" 2015-04-03 01:09:53 +00:00
Mohammadinamul Sheik 9a3598b0ee Do not throw NPE if the dictionary info is not available on db
Bug: 20035793
Change-Id: Idc13af405eab5457954a93db3dddcd81f6eb6435
2015-04-02 17:50:48 -07:00
Dan Zivkovic 4c326c66e9 Merge "Log timing of commitChosenWord()" 2015-04-02 22:57:12 +00:00
Dan Zivkovic 5d2314fea0 Log timing of commitChosenWord()
Bug 19987461.

Change-Id: If5bb798a350e9083ee8b67a84af132c100f0a7eb
2015-04-02 15:54:28 -07:00
Dan Zivkovic 3350f70371 Merge "Log timing of commitChosenWord()" 2015-04-02 22:46:57 +00:00
Dan Zivkovic 9731fadcb4 Log timing of commitChosenWord()
Bug 19987461.

Change-Id: Ibeebb9f1b1c4f3a9ed988c9e20209a9c83b5a359
2015-04-02 15:43:11 -07:00
Dan Zivkovic 915b1ed34a Merge "Log interrupted tasks in AOSP." 2015-04-02 22:15:19 +00:00
Dan Zivkovic 5a53505fe4 Log interrupted tasks in AOSP.
Bug 19987461.

Change-Id: Ia2714f555146f8f31a6d8c61f555d2b6fecdab7d
2015-04-02 14:47:36 -07:00
Dan Zivkovic a0a6663894 Merge "Add shortcut support to UserDictionaryLookup." 2015-04-02 19:17:12 +00:00
Dan Zivkovic 87eb7ac29c Add shortcut support to UserDictionaryLookup.
Also move the class to the parent package, since it's no longer tied to the
spell checking service.

Bug 19966848.
Bug 20036810.

Change-Id: I35014d212fd87281eb90def03ee92e6872dcd63e
2015-04-02 11:15:27 -07:00
Tom Ouyang f3392aca58 Learn corrections that were made in the middle of a word.
These occur when the user moves the cursor into a word.

Bug: 19571104
Change-Id: Ibc2e4f0146f7c1130ad078bd0c0a871dafa5d694
2015-04-02 10:20:08 -07:00
Tom Ouyang 1a58c47ebe Unlearn word when the user moves the cursor in to correct it.
Change-Id: I36358e551d6c51e786b6e09b1a1368ebf3c48f69
2015-04-01 17:26:35 -07:00
Dan Zivkovic 88f03707aa Specify argument nullability.
Bug 19996229.

Change-Id: I26938b26cd171b7947671a8406af6e3b7c8539f4
2015-03-31 10:05:26 -07:00
Jatin Matani 6d63989197 DictStats should mask account info in filename
Change-Id: I1985fcc352c1c0658c4177f906f1d71ee0d67c6f
2015-03-30 18:44:55 -07:00
Dan Zivkovic 76de0a8f52 Remove "Personal dictionary" link from settings.
Bug 19966848.

Change-Id: Ice6a030d2d2319822d5108c5b6a37efa4de1090f
2015-03-30 17:27:56 -07:00
Dan Zivkovic fa22abb94d Merge "Setup wizard status only available on Lollipop++" 2015-03-30 21:24:00 +00:00
Dan Zivkovic 94a1bea852 Setup wizard status only available on Lollipop++
Bug 19959791.

Change-Id: Iac2bf1a2550795e75e866aded57130dac1619a81
2015-03-30 21:23:44 +00:00
Jatin Matani e13f375411 Merge "Don't hide sync settings, v2 (cleaner)" 2015-03-30 20:04:57 +00:00
Jatin Matani 66f139889d Don't hide sync settings, v2 (cleaner)
Bug:19961809
Change-Id: I02d6bd773dc20112c8fa3b83ac305d0cdbbd58d0
2015-03-27 16:32:12 -07:00
Chieu Nguyen d4ee11f9a4 "spellcheking" needs spellchecking.
Change-Id: Iaf4cd5d11b113be4738182fb662e5dc54b2f5366
2015-03-27 14:48:20 -07:00
Chieu Nguyen 16c262abe5 Make Hebrew spellchecking spellcheck Hebrew.
Bug: 19966676
Change-Id: I657d2989966804cc1b6e3b12670a2123b6f06127
2015-03-27 14:42:27 -07:00
Dan Zivkovic f267e84548 Merge "Don't log stack trace for missing LM." 2015-03-27 21:00:20 +00:00
Dan Zivkovic 43ea67c23d Don't log stack trace for missing LM.
We only have "en" included in the APK. Everything else shows a stack trace.

Bug 19946159

Change-Id: Ie213529d52175eb929b2c875a5558aea347af01f
2015-03-27 13:47:30 -07:00
Jatin Matani 8de99ce3d8 Merge "Don't notify dictpack for updates for service dump" 2015-03-27 19:54:33 +00:00
Dan Zivkovic 23a7998edd Not all cyrillic scripts use east_slavic layout.
Bug 19963288.

Change-Id: I6d61110be11b260a4ec8e8c85fa0a32064e051e3
2015-03-27 12:19:47 -07:00
Jatin Matani 2cc2d31418 Don't notify dictpack for updates for service dump
Bug:19961803
Change-Id: I464e840bc5f75d164a519d84b0f09d8e64ed5061
2015-03-27 11:10:00 -07:00
Dan Zivkovic 68c8898217 Handle missing resources.
Needed for unit tests related to various bug fixes.

Bug 19930761.

Change-Id: I776ccccb032e3d1b181b02c6bb768500790870f7
2015-03-26 15:33:12 -07:00
Mohammadinamul Sheik 8f526c9a55 Use the complete Locale in generating the dictionary id.
- Also deleted a couple of dead methods.

Bug:19929051
Change-Id: I4f88dbc2a8204d5e2a20d1ad8c205a23c6319f8d
2015-03-25 16:45:56 -07:00
Jatin Matani 3b175a0b5d Merge "Check for accounts when enabling sync features." 2015-03-24 23:38:01 +00:00
Jatin Matani bb2773176f Check for accounts when enabling sync features.
Bug:19895917
Change-Id: I2f2f535f5a5c17c5642a5c44d2fd20a520ccfd73
2015-03-24 15:37:11 -07:00
Mohammadinamul Sheik 600cca16cb Merge "Force download the dictionaries after the apk package is updated." 2015-03-24 22:20:46 +00:00
Mohammadinamul Sheik 3bc3bc7971 Force download the dictionaries after the apk package is updated.
- Also display the notification when the dictionaries are auto updated


Bug: 19808828
Change-Id: If5c4efb73d8bb554d812afcf7deafec3ac40a462
2015-03-24 14:56:54 -07:00
Jatin Matani 3b0c2eb09f Merge "Avoid NPE when logging the entry point to Settings" 2015-03-24 19:57:08 +00:00
Jatin Matani 2fb8e5eecf Avoid NPE when logging the entry point to Settings
The populator class that serializes the proto uses a switch
and throws an NPE.

Bug:19911288
Change-Id: Id0fa371b3c64e706e14a13bb6e643406f94be035
2015-03-24 12:25:22 -07:00
Dan Zivkovic a8b14a4fdd Merge "Change DictionaryStats to report content version." 2015-03-24 19:20:27 +00:00
Ulas Kirazci e1b91d4138 Merge "DO NOT MERGE. Do not access metadatadb from main thread." 2015-03-24 18:28:53 +00:00
Dan Zivkovic 72278d3047 Change DictionaryStats to report content version.
Bug 19908719.

Change-Id: I5a00b5277e9cd7d964b53ff5823bada21be110fa
2015-03-24 11:19:34 -07:00
Chieu Nguyen f74005d888 Remove dependency in correction settings.
Autocorrection and next-word suggestion are independent,
but the settings UI creates a dependency.

Bug: 19896768.
Change-Id: Ibcdd497cdfd7b9c3a69c61e0c2d116d67df84ef8
2015-03-23 18:13:03 -07:00
Chieu Nguyen 1eedcfb290 Reenable next-word suggestion if autocorrection reenabled.
Bug: 19896768.
Change-Id: Ifeb3401612416e58bb362c5250ce0c15fc4b3c45
2015-03-23 17:16:10 -07:00
Jatin Matani fa296fa625 Merge "Move ManagedProfileUtils to overridable" 2015-03-23 20:17:13 +00:00
Jatin Matani cb27c4fe2e Move ManagedProfileUtils to overridable
Bug:19532354
Change-Id: I50b3ae11b6e58f07b482353b624b1a7a73eadc99
2015-03-23 11:57:48 -07:00