Dan Zivkovic
e8eceefe36
am bff393ce: Fix NPE in AccountSettingsFragment.
...
* commit 'bff393ce13554588d3906df4e5f464199acb23ae':
Fix NPE in AccountSettingsFragment.
2015-03-17 00:17:06 +00:00
Chieu Nguyen
93205b17ff
Add cloud sync setting to SettingsValues.
...
Bug: 19573092
Change-Id: I41174188743c8a78facebff547e378a2b467a8c7
2015-03-16 17:11:52 -07:00
Dan Zivkovic
bff393ce13
Fix NPE in AccountSettingsFragment.
...
Bug 19773815.
Change-Id: Ib5eb27cdf385c81d1a3822836f424fa29c0bbaa8
2015-03-16 17:08:35 -07:00
Dan Zivkovic
b0e4b90800
am 52dafe8c: Don\'t test format version 403 twice.
...
* commit '52dafe8c321663338ba458f7ad1a08c0c838f156':
Don't test format version 403 twice.
2015-03-16 21:49:27 +00:00
Dan Zivkovic
eb2c2f3f15
am f508209f: Remove unused imports.
...
* commit 'f508209f6af74498edcc6f66b1820bdf0dad8e6a':
Remove unused imports.
2015-03-16 21:39:08 +00:00
Dan Zivkovic
52dafe8c32
Don't test format version 403 twice.
...
BinaryDictionaryTests runs all tests 3 times for 3 format verisons.
Cut that number down by 33% to speed things up.
Change-Id: I8a2f78017fa30f46b5873dcf6a5f478f57af2ebd
2015-03-16 14:38:44 -07:00
Dan Zivkovic
d9a711d10d
am 4e1f0f1b: Redundant code matches multiple languages.
...
* commit '4e1f0f1bb03551efde3bc6b0a8e60465c088cda2':
Redundant code matches multiple languages.
2015-03-16 21:18:42 +00:00
Dan Zivkovic
f508209f6a
Remove unused imports.
...
Change-Id: Ic537cc7080a0ca98fc855a6f24a415d63f747891
2015-03-16 14:17:51 -07:00
Dan Zivkovic
4e1f0f1bb0
Redundant code matches multiple languages.
...
InputLogic should not have code that tweaks suggestion ranking based on the
language of the source dictionary.
Bug 19744396.
Change-Id: I8c0849555e74cec1302e78da04148dedd1cddabe
2015-03-16 14:11:59 -07:00
Dan Zivkovic
f1b330c692
am 2321c41b: Check boxes are replaced by switches in KitKat.
...
* commit '2321c41b5bf17661e7390b7afdcf0320fbd5f134':
Check boxes are replaced by switches in KitKat.
2015-03-16 19:28:03 +00:00
Dan Zivkovic
2321c41b5b
Check boxes are replaced by switches in KitKat.
...
Make the code work for both widgets by using the TwoStatePreference interface.
Bug 19596067.
Change-Id: I8352361dcf74b54136b6177de9aac3eb2942a4c0
2015-03-16 12:03:04 -07:00
Dan Zivkovic
651d7e9d4f
am 5455179b: Revert "Next-word suggestion bit in keyboard settings."
...
* commit '5455179b54eb8230577f518db082796a3055685a':
Revert "Next-word suggestion bit in keyboard settings."
2015-03-16 18:34:24 +00:00
Dan Zivkovic
5455179b54
Revert "Next-word suggestion bit in keyboard settings."
...
This reverts commit 1ae16dc3db
.
Bug 19596067.
Change-Id: Ie7286acbb70b215d7bd08e271bcf14526b68576f
2015-03-16 11:23:22 -07:00
Geoff Mendal
180a1e363f
Merge "Import translations. DO NOT MERGE"
2015-03-16 13:05:07 +00:00
Geoff Mendal
1f7c2e61e2
Import translations. DO NOT MERGE
...
Change-Id: Ibc8572551a250720cc2bdaca75432e71f571eb02
Auto-generated-cl: translation import
2015-03-16 05:51:40 -07:00
Geoff Mendal
940b30695f
Import translations. DO NOT MERGE
...
Change-Id: Ia4c53921b3a076533158579128023ab1ae56b28e
Auto-generated-cl: translation import
2015-03-16 05:49:05 -07:00
Geoff Mendal
51e41fd52f
Import translations. DO NOT MERGE
...
Change-Id: I2bf8c23befbf5c78632c87a37ce1529d5144c498
Auto-generated-cl: translation import
2015-03-16 05:46:22 -07:00
Mohammadinamul Sheik
248dfe1247
am 900502f1: Merge "Make RichInputMethodSubtype non-final for easy mocking"
...
* commit '900502f1ec0cb66bf27ed59ecccbfd1b44ddd635':
Make RichInputMethodSubtype non-final for easy mocking
2015-03-14 03:08:47 +00:00
Mohammadinamul Sheik
900502f1ec
Merge "Make RichInputMethodSubtype non-final for easy mocking"
2015-03-14 03:04:02 +00:00
Mohammadinamul Sheik
6fa6abae2f
am 29500ef4: Fix the BinaryDictionaryTests
...
* commit '29500ef4ba8e01f4c467a62399c8249d532ee82c':
Fix the BinaryDictionaryTests
2015-03-14 01:29:06 +00:00
Mohammadinamul Sheik
29500ef4ba
Fix the BinaryDictionaryTests
...
Change-Id: I09378d74705e6943946ea4f76b15664086a387ed
2015-03-13 18:21:22 -07:00
Mohammadinamul Sheik
f04e2ed83a
Make RichInputMethodSubtype non-final for easy mocking
...
Change-Id: I167bc56b5224eb389ec853aeb539d7fcf79b81e1
2015-03-13 17:05:11 -07:00
Mohammadinamul Sheik
b27553ed7e
am 93d2ab38: Add StatsUtils.onSettingsActivity to collect the settings page stats.
...
* commit '93d2ab38577fb3d7c919bc4fd19a769f5c93e654':
Add StatsUtils.onSettingsActivity to collect the settings page stats.
2015-03-13 23:20:47 +00:00
Mohammadinamul Sheik
93d2ab3857
Add StatsUtils.onSettingsActivity to collect the settings page stats.
...
Bug:19214944
Change-Id: I113f47c49d638790d770fe2781afe7cd1565619d
2015-03-13 16:12:14 -07:00
Tom Ouyang
89e2d93634
Deprecate SuggestedWords.mSourceDict
...
Change-Id: I29d9bec427660a7a501054fe9b1ea71be2d5ee3f
2015-03-13 14:30:18 -07:00
Chieu Nguyen
3b08ef1d5b
am 116e58c4: Remove autocorrection aggressiveness settings.
...
* commit '116e58c437526ea2503564317e2731b8126acaa4':
Remove autocorrection aggressiveness settings.
2015-03-13 21:09:32 +00:00
Chieu Nguyen
116e58c437
Remove autocorrection aggressiveness settings.
...
Replace multiple settings with binary switch for autocorrection.
Bug: 19589766
Change-Id: Ic8a0362dd36d18930493a55699851161e9cb23e8
2015-03-13 12:21:26 -07:00
Mohammadinamul Sheik
99846fab18
am 80f90349: Log.i on dictionary download start
...
* commit '80f90349555ac22f83175e6f19d1ed5e0d673d85':
Log.i on dictionary download start
2015-03-13 19:11:45 +00:00
Mohammadinamul Sheik
80f9034955
Log.i on dictionary download start
...
Change-Id: I8b501fb5512d4d3bbca75e4c4be7c7eb95f32020
2015-03-13 11:53:33 -07:00
Mario Tanev
e4ba918add
am b9a16b88: Bump up the current metadata database version.
...
* commit 'b9a16b88bf5b976e47b50f66b646f002954a5d83':
Bump up the current metadata database version.
2015-03-13 17:52:29 +00:00
Mario Tanev
b9a16b88bf
Bump up the current metadata database version.
...
Change-Id: Id2814a2224b90ba124f1c9801760a2c86f2dc2e2
2015-03-13 10:39:05 -07:00
Dan Zivkovic
48d8911597
am eaa710d4: Separate executor for the Spelling decoder.
...
* commit 'eaa710d4aaac75ff2b7e29608d004fe7662b392e':
Separate executor for the Spelling decoder.
2015-03-13 02:20:31 +00:00
Dan Zivkovic
eaa710d4aa
Separate executor for the Spelling decoder.
...
Bug 19710676.
Change-Id: I6e66eddd507c11e424105869833fe6841b90275d
2015-03-12 17:10:38 -07:00
Jatin Matani
44d4a1c524
Fix some i18n messaging
...
Bug:19538786
Bug:19542029
Change-Id: Ifc06064308f899527283378dda0c44223df7e9e9
2015-03-12 12:44:20 -07:00
Dan Zivkovic
326261181d
am 26fb83c4: Avoid creating empty String[].
...
* commit '26fb83c481034cb9dbc9504e60fde40c6b213e97':
Avoid creating empty String[].
2015-03-12 18:08:29 +00:00
Dan Zivkovic
26fb83c481
Avoid creating empty String[].
...
Minor cleanup on the way to fixing spelling for downloaded language.
Bug 19710676.
Change-Id: I7be25fa82248f0317d894d44802bede9dbc4fe2a
2015-03-12 10:49:29 -07:00
Dan Zivkovic
b724ff1d11
am 7e1dfaae: Merge "Remove ALS from LatinIME."
...
* commit '7e1dfaae3d6ca9aff1acfa9b358ad0b759ef0ec8':
Remove ALS from LatinIME.
2015-03-12 17:22:37 +00:00
Dan Zivkovic
7e1dfaae3d
Merge "Remove ALS from LatinIME."
2015-03-12 17:17:59 +00:00
Chieu Nguyen
2c3aae8a0c
am 74c37f40: Merge "Remove setting switch for phrase gesture."
...
* commit '74c37f4089441c9f98522bd785d7f39b271f3936':
Remove setting switch for phrase gesture.
2015-03-12 00:32:08 +00:00
Chieu Nguyen
3b23d1871e
am 4e0af436: Remove unused phrase gesture code.
...
* commit '4e0af43673936c336fff298bc9aeee1d75c3bc92':
Remove unused phrase gesture code.
2015-03-12 00:32:06 +00:00
Dan Zivkovic
107fb4c476
Remove ALS from LatinIME.
...
This fixes unit tests and brings us closer to a green build.
Change-Id: Iffcc392eda4a7671a238b79cc7367320ca648725
2015-03-11 17:29:12 -07:00
Chieu Nguyen
74c37f4089
Merge "Remove setting switch for phrase gesture."
2015-03-12 00:28:12 +00:00
Chieu Nguyen
4e0af43673
Remove unused phrase gesture code.
...
Bug: 19687841
Change-Id: I0862aa3127bf7f1564a4845efdf99ebf5ae4d5ac
2015-03-11 17:09:44 -07:00
Dan Zivkovic
9a2e1ef6b4
am 9a289da4: Remove deprecated distractor filtering methods.
...
* commit '9a289da4e6ea40417422a540e821069d5d6e4a82':
Remove deprecated distractor filtering methods.
2015-03-11 23:16:01 +00:00
Dan Zivkovic
9a289da4e6
Remove deprecated distractor filtering methods.
...
Change-Id: I10ccf75d9c00d66b4e85de6c3c019242f2e90b0e
2015-03-11 14:39:48 -07:00
Dan Zivkovic
5a447b846e
am 7472cc82: Mark method @UsedForTesting
...
* commit '7472cc824581b8a3c1ede286c8b0704040cef257':
Mark method @UsedForTesting
2015-03-11 21:06:34 +00:00
Dan Zivkovic
7472cc8245
Mark method @UsedForTesting
...
This prevents it from being optimized away.
Change-Id: Iecd317568e23e86e4c0ece8134a4926a7a56d65b
2015-03-11 14:00:30 -07:00
Dan Zivkovic
d65d8e71d4
am 820317f7: Make inner classes visible for testing.
...
* commit '820317f7aae3f5efd2354e2804ad4bd19f067677':
Make inner classes visible for testing.
2015-03-11 20:55:58 +00:00
Dan Zivkovic
820317f7aa
Make inner classes visible for testing.
...
We need this to assert the correct behavior in the facilitator.
Bug 19695605.
Change-Id: I3923d00791c99208bc72f7c4210ae1ea0a34bd0e
2015-03-11 13:40:20 -07:00
Chieu Nguyen
e787b3b761
Remove setting switch for phrase gesture.
...
Bug: 19687841
Change-Id: I74ed9acfd5330d7461233d4146395aefb9d2d9c4
2015-03-11 12:06:22 -07:00
Dan Zivkovic
14125949c6
am 4621365b: Merge "Delete user history files."
...
* commit '4621365b216559c3dd3d0e22ec05cdaba78acc3d':
Delete user history files.
2015-03-11 19:01:25 +00:00
Dan Zivkovic
4621365b21
Merge "Delete user history files."
2015-03-11 18:53:23 +00:00
Dan Zivkovic
bdd6c995ce
Delete user history files.
...
Bug 19669016.
Change-Id: I8069fe561347851bf3c27423dbd8ba99d38c049e
2015-03-11 11:46:15 -07:00
Geoff Mendal
74fa851030
Import translations. DO NOT MERGE
...
Change-Id: I58400f537f28e89f19faf95547d2f3ecb67368fa
Auto-generated-cl: translation import
2015-03-11 05:33:56 -07:00
Geoff Mendal
231bccb85c
Import translations. DO NOT MERGE
...
Change-Id: I43b3c50621f4e6d86f6eacc6db79e1d9a9e12a16
Auto-generated-cl: translation import
2015-03-11 05:31:19 -07:00
Dan Zivkovic
22af095f78
am 77fd5dbf: Remove dead code, including tests.
...
* commit '77fd5dbf3e432356dd16eb428c740e446c04373e':
Remove dead code, including tests.
2015-03-11 01:07:59 +00:00
Dan Zivkovic
77fd5dbf3e
Remove dead code, including tests.
...
Change-Id: Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c
2015-03-10 17:22:41 -07:00
Dan Zivkovic
a6f8f30622
am 70c096d9: Restart background executor.
...
* commit '70c096d9a1305d3002320eb0d7185b5abb81c086':
Restart background executor.
2015-03-10 17:16:56 +00:00
Dan Zivkovic
70c096d9a1
Restart background executor.
...
Bug 19671650.
Change-Id: I1a28a53e94bdb79aeb173f6905c1035022495acc
2015-03-10 10:03:17 -07:00
Chieu Nguyen
bc6b315c2b
am 21a28abc: Handle empty previous ngram context correctly.
...
* commit '21a28abc6ac3a2404e7b90327122b1364a283ec9':
Handle empty previous ngram context correctly.
2015-03-10 15:04:11 +00:00
Dan Zivkovic
13b43c1c7d
am 37503590: Kill+restart tasks before/after decoder init.
...
* commit '375035905de7932b3a34e91fc537fd7561bed6c8':
Kill+restart tasks before/after decoder init.
2015-03-10 15:04:09 +00:00
Chieu Nguyen
21a28abc6a
Handle empty previous ngram context correctly.
...
Fixes bug where empty previous ngram context not at the
beginning of a sentence incorrectly returned the
beginning-of-sentence marker.
Bug: 19612336
Change-Id: I5ddf3408e20dcedf70487b85c983cd3fc12550e7
2015-03-09 19:02:43 -07:00
Dan Zivkovic
375035905d
Kill+restart tasks before/after decoder init.
...
Bug 19625976.
Change-Id: I6d8b0d2b0a77ccda1bfc914501cf568b92862980
2015-03-09 18:54:48 -07:00
Dan Zivkovic
cca7e6f4f7
am bd1bc406: ExecutorUtils lets use schedule a runnable chain.
...
* commit 'bd1bc4067ff87ce1a21d12a48b1695fe58c8dd4d':
ExecutorUtils lets use schedule a runnable chain.
2015-03-10 01:27:13 +00:00
Dan Zivkovic
bd1bc4067f
ExecutorUtils lets use schedule a runnable chain.
...
Bug 19625976.
Change-Id: Iebbef7fed57a381498301dcf26fefa27d06802f7
2015-03-09 14:58:16 -07:00
Dan Zivkovic
1fa61ab61b
am f9e2d271: Use a single background executor.
...
* commit 'f9e2d271ca101a53a6aac772ca770242805793ef':
Use a single background executor.
2015-03-09 21:07:46 +00:00
Dan Zivkovic
f9e2d271ca
Use a single background executor.
...
Bug 19625976.
Change-Id: Ia03f440a31b059b5af42d162e1145330bf7b5ddf
2015-03-09 13:22:56 -07:00
Dan Zivkovic
fdd4fdb516
am 491ca900: Merge "Handle null InputMethodSubtype."
...
* commit '491ca900a7535ddb19c3ad633475bb68ba18113c':
Handle null InputMethodSubtype.
2015-03-09 16:20:06 +00:00
Dan Zivkovic
80b74754c6
am 2fcb7c5d: Merge "Log from LatinIME."
...
* commit '2fcb7c5de5834452f91cce20d0e43a6cf9ea622e':
Log from LatinIME.
2015-03-09 16:20:04 +00:00
Chieu Nguyen
e410a513be
am e3ac02e7: Merge "Sync setting disabled if no account."
...
* commit 'e3ac02e796d64c1cdef0c300338124afe27cfbec':
Sync setting disabled if no account.
2015-03-09 16:20:01 +00:00
Tom Ouyang
f9477310b3
am 8eb2fad5: Merge "Restart suggestions when backspacing into a reverted word."
...
* commit '8eb2fad5702d4d58476a015a5469a4d84adf4bbc':
Restart suggestions when backspacing into a reverted word.
2015-03-09 16:20:00 +00:00
Chieu Nguyen
17d8902885
am c4f6a8dc: Make privacy policy link clickable in sync settings.
...
* commit 'c4f6a8dcd4076ff04977199b4e3a4c79f7d06efe':
Make privacy policy link clickable in sync settings.
2015-03-09 16:19:58 +00:00
Geoff Mendal
2151095bb2
Merge "Import translations. DO NOT MERGE"
2015-03-09 13:52:01 +00:00
Geoff Mendal
0943bffd77
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2015-03-09 13:43:08 +00:00
Geoff Mendal
a2adee6510
Import translations. DO NOT MERGE
...
Change-Id: Ic46a661195724215df0687cf4395c599a1e84e31
Auto-generated-cl: translation import
2015-03-09 06:37:59 -07:00
Geoff Mendal
e617919b1b
Import translations. DO NOT MERGE
...
Change-Id: I251a51c5a8adf9579dcfce60773634fab4f6b87a
Auto-generated-cl: translation import
2015-03-09 06:37:15 -07:00
Geoff Mendal
9926dc1125
Import translations. DO NOT MERGE
...
Change-Id: Ifd0e7f67f2c4607557a295e9cbbdb35d77a53f91
Auto-generated-cl: translation import
2015-03-09 06:33:10 -07:00
Geoff Mendal
8e08c17407
Import translations. DO NOT MERGE
...
Change-Id: I0506166a097cc0388afd38c77419d83abf5f85d7
Auto-generated-cl: translation import
2015-03-09 06:32:28 -07:00
Dan Zivkovic
491ca900a7
Merge "Handle null InputMethodSubtype."
2015-03-06 22:51:35 +00:00
Dan Zivkovic
2fcb7c5de5
Merge "Log from LatinIME."
2015-03-06 22:45:17 +00:00
Dan Zivkovic
edaa83bb32
Log from LatinIME.
...
When the DEBUG setting is on, log from this critical class.
This will make it easier to diagnose issues.
Bug 19632709.
Change-Id: I5e14b3705f50cd021ad3d64af106ad28dc8b9321
2015-03-06 14:42:57 -08:00
Dan Zivkovic
b86ca76cea
Handle null InputMethodSubtype.
...
Bug 19627494.
Change-Id: I50dc77c59ced0f2e7c07a49ae0cb040197c2ab35
2015-03-06 14:34:57 -08:00
Chieu Nguyen
e3ac02e796
Merge "Sync setting disabled if no account."
2015-03-06 17:40:47 +00:00
Tom Ouyang
8eb2fad570
Merge "Restart suggestions when backspacing into a reverted word."
2015-03-06 02:29:35 +00:00
Chieu Nguyen
b717f91ffa
Sync setting disabled if no account.
...
Bug: 19361223
Change-Id: Id5e8d34920f5bf3bffb6d6d287557e85d7b72c79
2015-03-05 18:25:56 -08:00
Chieu Nguyen
c4f6a8dcd4
Make privacy policy link clickable in sync settings.
...
Bug: 19361223
Change-Id: I83128d771bf5214a446afd6a3d5244a184d0a4a8
2015-03-05 17:48:02 -08:00
Tom Ouyang
222f647137
Restart suggestions when backspacing into a reverted word.
...
This is required for the final corrected word to be learned,
as learning only occurs when suggestions are active.
Note: This is already happening when backspacing into a non-reverted
word
Bug: 19619907
Bug: 18465402
Change-Id: I99a1d4f0ca0d62a2cdfa24cc0833ce89391715d9
2015-03-05 17:42:35 -08:00
Dan Zivkovic
4d0d821d13
am 38b9bffa: Handle words longer tha 256 characters.
...
* commit '38b9bffa3f60785f30d7976879ddf936f747d7dd':
Handle words longer tha 256 characters.
2015-03-05 19:25:17 +00:00
Dan Zivkovic
38b9bffa3f
Handle words longer tha 256 characters.
...
Bug 19612315.
Change-Id: I75e84df88b4da5cfc6a39b956613972841342c4b
2015-03-05 10:56:14 -08:00
Dan Zivkovic
5512a84d3e
am 1ae16dc3: Next-word suggestion bit in keyboard settings.
...
* commit '1ae16dc3db170802d1b38273f477125a2a969d32':
Next-word suggestion bit in keyboard settings.
2015-03-04 23:08:09 +00:00
Dan Zivkovic
1ae16dc3db
Next-word suggestion bit in keyboard settings.
...
This feature works in supported languages.
We don't need a user setting.
Bug 19596067.
Change-Id: Icdded772745f9816da47f8a5e3b87b733083b121
2015-03-04 15:02:53 -08:00
Dan Zivkovic
34adcf9996
am 83e95e60: Remove SHORTCUT column in FROM clause.
...
* commit '83e95e601876a2f7938da8a3f773f9ef088a23ab':
Remove SHORTCUT column in FROM clause.
2015-03-04 18:20:47 +00:00
Dan Zivkovic
83e95e6018
Remove SHORTCUT column in FROM clause.
...
The column is no longer used, and is not available on pre-Jellybean devices.
Bug 19595958.
Change-Id: Ief54c7210698d6668b1b7815900a394cc7f27299
2015-03-04 10:16:28 -08:00
Geoff Mendal
9de4a2e4e5
Merge "Import translations. DO NOT MERGE"
2015-03-04 14:00:30 +00:00
Geoff Mendal
7edcc880c2
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2015-03-04 13:59:59 +00:00
Geoff Mendal
00c5719414
Import translations. DO NOT MERGE
...
Change-Id: I934e85a5a7cef5a490e62033a37e4c8969c36d43
Auto-generated-cl: translation import
2015-03-04 05:55:42 -08:00
Geoff Mendal
d878a8101d
Import translations. DO NOT MERGE
...
Change-Id: I3b6d9386687e987a6ca84a194a26b90a669c2562
Auto-generated-cl: translation import
2015-03-04 05:54:58 -08:00
Geoff Mendal
0774260ed3
Import translations. DO NOT MERGE
...
Change-Id: Ia6ea2cbd9e914d60bdf9220d40991fd60cf8fc43
Auto-generated-cl: translation import
2015-03-04 05:50:53 -08:00
Geoff Mendal
48494a1654
Import translations. DO NOT MERGE
...
Change-Id: I23cfe9a6401ca62eeb9f6b42a8f979e9d97345b0
Auto-generated-cl: translation import
2015-03-04 05:50:09 -08:00
Mohammadinamul Sheik
ebedd8bb8e
am 6e29d261: Introduce DictionaryHeaderUtils to get dictionary header values
...
* commit '6e29d261cb480ef0f0d90867d4582fabce0b9113':
Introduce DictionaryHeaderUtils to get dictionary header values
2015-03-04 00:38:25 +00:00
Mohammadinamul Sheik
6e29d261cb
Introduce DictionaryHeaderUtils to get dictionary header values
...
Change-Id: I86cef6c7f2f68a75428bb2b9c4d5a1dc1876b541
2015-03-03 16:17:27 -08:00
Chieu Nguyen
8d9c43b5ba
am 2281ba76: Merge "Add DictionaryFacilitator dump()."
...
* commit '2281ba76668db4343e1d01fff82e031657bfcfd5':
Add DictionaryFacilitator dump().
2015-03-03 23:21:50 +00:00
Chieu Nguyen
2281ba7666
Merge "Add DictionaryFacilitator dump()."
2015-03-03 23:16:49 +00:00
Chieu Nguyen
c809dc26a1
Add DictionaryFacilitator dump().
...
Change-Id: I8b75aded3fc2b9b33128b6ba5a3e8d943dfca352
2015-03-03 14:36:47 -08:00
Jatin Matani
1d22e76800
am 148aab12: Merge "Add util method in ngramcontext for context array"
...
* commit '148aab122883d5a53c890fd7795039f4aa087302':
Add util method in ngramcontext for context array
2015-03-03 22:03:02 +00:00
Jatin Matani
148aab1228
Merge "Add util method in ngramcontext for context array"
2015-03-03 21:59:52 +00:00
Jatin Matani
a568e0acb4
Add util method in ngramcontext for context array
...
Change-Id: I2e3e2ac7706be50ed2055b0c69b30e25a516a879
2015-03-03 13:20:53 -08:00
Dan Zivkovic
dd226fbe63
am 63a0bdb4: Forgot to remove reference to deleted class.
...
* commit '63a0bdb41bdc6dc3cd94f3354bf3bda4d057fa93':
Forgot to remove reference to deleted class.
2015-03-03 20:16:49 +00:00
Dan Zivkovic
63a0bdb41b
Forgot to remove reference to deleted class.
...
Change-Id: Ic662a536e468390a3f7266daf9c56e4fc5a70ac6
2015-03-03 12:11:00 -08:00
Dan Zivkovic
b128db8fc6
am 15cccfcb: Merge "Remove no-op broadcast receiver from LatinIME."
...
* commit '15cccfcb0d6d693883104b261f8750286084d718':
Remove no-op broadcast receiver from LatinIME.
2015-03-03 19:59:09 +00:00
Dan Zivkovic
15cccfcb0d
Merge "Remove no-op broadcast receiver from LatinIME."
2015-03-03 19:55:25 +00:00
Dan Zivkovic
fbfc62209a
Remove no-op broadcast receiver from LatinIME.
...
Bug 19583388.
Change-Id: Ia1ca481e2eae0c9791932f7f28a9072cc3dbbe7c
2015-03-03 11:03:11 -08:00
Geoff Mendal
e3abfc4e05
Merge "Import translations. DO NOT MERGE"
2015-03-03 08:45:00 +00:00
Geoff Mendal
b3ceffad18
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2015-03-03 08:44:47 +00:00
Chieu Nguyen
c36a0c37b4
am ddee4914: Merge "Move dictionary facilitator handling."
...
* commit 'ddee491450bd4447d1dcf102f472fe7038cbfb1d':
Move dictionary facilitator handling.
2015-03-02 23:34:01 +00:00
Chieu Nguyen
ddee491450
Merge "Move dictionary facilitator handling."
2015-03-02 23:30:42 +00:00
Chieu Nguyen
0103d75aaf
Move dictionary facilitator handling.
...
Change-Id: Ibd42982996a36ac52b4c916035491b835f8d14f9
2015-03-02 15:24:51 -08:00
Jatin Matani
49ef421bca
am 55d96519: Merge "Turn off cloud sync if we have managed profiles"
...
* commit '55d9651929729548c16270de0a83e3a01c7f2a9b':
Turn off cloud sync if we have managed profiles
2015-03-02 20:25:50 +00:00
Jatin Matani
55d9651929
Merge "Turn off cloud sync if we have managed profiles"
2015-03-02 20:21:29 +00:00
Jatin Matani
854edce6dd
Turn off cloud sync if we have managed profiles
...
UserManager#getUserProfiles > 1 implies managed
profile.
Workflow:
- Disable sync prefs
- Execute an async task to check for managed profile; if
managed profile is found, remove the sync prefs. If not, enable
the preference;
- Move the logging pref from Advanced to Account & Privacy.
Bug:19230544
Change-Id: I4dbd1fe8433b3263ccc74c35dc0ee0bb371122b3
2015-03-02 12:03:57 -08:00
Geoff Mendal
740f8d7224
Import translations. DO NOT MERGE
...
Change-Id: I95888bc0f4841f69b8c5cba881f92311c607347f
Auto-generated-cl: translation import
2015-03-02 10:03:04 -08:00
Geoff Mendal
27f1c79cf5
Import translations. DO NOT MERGE
...
Change-Id: I13b83c06aeb29a65f2eeea28415b041b654e48b6
Auto-generated-cl: translation import
2015-03-02 10:02:21 -08:00
Jatin Matani
d3b6619d9c
am 8b290806: Fix build breakage due to changed resource Id
...
* commit '8b2908066dc5259870fbf210e0af7eeb01d2b1ef':
Fix build breakage due to changed resource Id
2015-03-02 17:48:29 +00:00
Jatin Matani
8b2908066d
Fix build breakage due to changed resource Id
...
Change-Id: I09ba038930416d1261ef095ec503f1ac68cd92ea
2015-03-02 09:44:19 -08:00
Geoff Mendal
1312b216a8
Merge "Revert "Import translations. DO NOT MERGE""
2015-03-02 15:30:38 +00:00
Geoff Mendal
dd09e82f64
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 7989b88833
.
Change-Id: Ie0fb3fef89938938da661c030808b1d8110816c9
2015-03-02 15:30:10 +00:00
Geoff Mendal
8a6980828b
Merge "Revert "Import translations. DO NOT MERGE"" into jb-ub-latinimegoogle
2015-03-02 15:21:02 +00:00
Geoff Mendal
6504e6135f
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 2f0fcc1e30
.
Change-Id: I2d96e769a55a6f95888cb6cd86a185c86555ad83
2015-03-02 15:20:52 +00:00
Geoff Mendal
3d82160002
Merge "Import translations. DO NOT MERGE"
2015-03-02 15:10:59 +00:00
Geoff Mendal
e0ab979f0a
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2015-03-02 15:07:41 +00:00
Geoff Mendal
7989b88833
Import translations. DO NOT MERGE
...
Change-Id: I891a5bfa2cfebb4852ba0a1277cf7ae1aec912ae
Auto-generated-cl: translation import
2015-03-02 06:42:15 -08:00
Geoff Mendal
a9de6f589f
Import translations. DO NOT MERGE
...
Change-Id: I4cab7c63e46cfef30b344658d8af54e9e0247752
Auto-generated-cl: translation import
2015-03-02 06:41:33 -08:00
Geoff Mendal
2f0fcc1e30
Import translations. DO NOT MERGE
...
Change-Id: I0cc15dd7b0ad8c710df0c33325a37899d1bd6810
Auto-generated-cl: translation import
2015-03-02 06:37:25 -08:00
Geoff Mendal
cceb4c71a7
Import translations. DO NOT MERGE
...
Change-Id: I675c2cc5bdc246498b5b96058bc528f96ceee071
Auto-generated-cl: translation import
2015-03-02 06:36:42 -08:00
Dan Zivkovic
a3b7ff254d
am 9770336a: Merge "Label empty suggestions."
...
* commit '9770336a9b9b65fc62bde6f361e90909d4259769':
Label empty suggestions.
2015-02-27 21:36:56 +00:00
Dan Zivkovic
9770336a9b
Merge "Label empty suggestions."
2015-02-27 21:33:02 +00:00
Chieu Nguyen
33fdb46b5e
am 98886775: Merge "Handle double space inserting a period."
...
* commit '98886775cfb95dc7f6ab50653215373b94b13941':
Handle double space inserting a period.
2015-02-27 21:27:32 +00:00
Chieu Nguyen
98886775cf
Merge "Handle double space inserting a period."
2015-02-27 21:24:36 +00:00
Chieu Nguyen
fdf3cc41ee
Handle double space inserting a period.
...
Change-Id: I109f0e9cf3e972bf60aa3fbbe817337aef70ea3c
2015-02-27 13:19:21 -08:00
Mohammadinamul Sheik
35a9bdbee8
am 62cbaba7: Merge "Update the MAX supported file version for downloaded static Dictionaries."
...
* commit '62cbaba715878ea31811d4fc7300741510931f6d':
Update the MAX supported file version for downloaded static Dictionaries.
2015-02-27 21:18:30 +00:00
Mohammadinamul Sheik
62cbaba715
Merge "Update the MAX supported file version for downloaded static Dictionaries."
2015-02-27 21:09:04 +00:00
Dan Zivkovic
24c275ccb9
Label empty suggestions.
...
When talkback is enabled, empty strings will have a content description.
Bug 19479836.
Change-Id: I25679a2bdeff238a5330ba406d5bc7e6e2868ba1
2015-02-27 12:44:28 -08:00
Dan Zivkovic
29de00a52d
am 69c04cad: Race condition in cursor move.
...
* commit '69c04cadc7c017f9de53f13ea045347b80316d4a':
Race condition in cursor move.
2015-02-27 18:36:42 +00:00
Mohammadinamul Sheik
377ba98b75
Update the MAX supported file version for downloaded static Dictionaries.
...
Change-Id: I72d37cc21585b18f4a41ff32627024502f10e993
2015-02-27 10:30:23 -08:00
Dan Zivkovic
69c04cadc7
Race condition in cursor move.
...
The method WordComposer.moveCursorByAndReturnIfInsideComposingWord() iterates
through all the code points in the word that's currently being composed, and
it tries to adjust the cursor position by a given amount (left or right).
It copies the code points to a new array while processing. But the code point
count comes from a member variable. If the member variable changes while the
method is processing the copy of the code points, it can run over the length
of the code point array.
Bug 18876474.
Change-Id: Ib3a2d90a4e82b76d381efa774e6b3d6bca99c869
2015-02-27 10:29:47 -08:00
Jatin Matani
730151b3f4
am c83352d5: Merge "Refresh pref settings for cloud sync"
...
* commit 'c83352d527bbae430f52b6494ad3e391d950520a':
Refresh pref settings for cloud sync
2015-02-26 22:15:45 +00:00
Jatin Matani
c83352d527
Merge "Refresh pref settings for cloud sync"
2015-02-26 22:10:02 +00:00
Jatin Matani
8ec328fb2e
Refresh pref settings for cloud sync
...
- Show the opt-in text
- Show the account picker if user presses 'enable sync'. Previously
we disabled the sync pref which was confusing.
- Remove the debug tags from some prefs; and improve messaging overall
General rules;
- sync is turned ON : user checks 'enable sync' pref AND
accepts the opt-in AND chooses an account
- sync is turned OFF: when user signs out
Demo link
https://drive.google.com/a/google.com/file/d/0B9tNQOWdRuiWSUdVVE5rVDJudlk/view?usp=sharing
Change-Id: I2e7933796b15e47005ba9970a8c1294416ef31a0
2015-02-26 11:43:42 -08:00
Dan Zivkovic
e0c1315966
am edd94a44: Ignore the Emoji key when not connected.
...
* commit 'edd94a449e293c07779ac50e98aca3ad92910d92':
Ignore the Emoji key when not connected.
2015-02-26 19:33:49 +00:00
Dan Zivkovic
edd94a449e
Ignore the Emoji key when not connected.
...
When the LatinIME does not have an active InputConnection, it will not try
to toggle the Emoji keyboard.
Bug 19513415.
Change-Id: I31f928cd7db1cddd771c548cd3dc42f8af64d0e2
2015-02-26 11:10:37 -08:00
Jatin Matani
c8828eb8b4
am 48b07124: Merge "Share decoders among latinime components."
...
* commit '48b071249cd662a5448ae0178e16b0b5026ee4cf':
Share decoders among latinime components.
2015-02-26 18:00:12 +00:00
Jatin Matani
48b071249c
Merge "Share decoders among latinime components."
2015-02-26 17:54:26 +00:00
Dan Zivkovic
1512af3662
am 7d7f0820: Stop waking up to decay dynamic dictionaries.
...
* commit '7d7f082075768c03e4b1d4b84ba2e6ef6cba1132':
Stop waking up to decay dynamic dictionaries.
2015-02-26 04:36:00 +00:00
Dan Zivkovic
7d7f082075
Stop waking up to decay dynamic dictionaries.
...
Bug 19516048.
Change-Id: Ibc27a792b4fa80fa8c6af4721c47a617526e9584
2015-02-25 20:13:59 -08:00
Dan Zivkovic
458cc72c15
am e4619f02: Merge "Don\'t assume that correctable words are invalid"
...
* commit 'e4619f029e84fd845b0771871218274b99c30ffa':
Don't assume that correctable words are invalid
2015-02-26 03:48:37 +00:00
Dan Zivkovic
e4619f029e
Merge "Don't assume that correctable words are invalid"
2015-02-26 03:44:20 +00:00
Mohammadinamul Sheik
d11e4cd964
am 48ba1ea1: Merge "Make DictionaryFactory.killDictionary public"
...
* commit '48ba1ea19f7e18a24813a9301ed620612c2e53d7':
Make DictionaryFactory.killDictionary public
2015-02-26 03:37:56 +00:00
Mohammadinamul Sheik
48ba1ea19f
Merge "Make DictionaryFactory.killDictionary public"
2015-02-26 03:33:08 +00:00
Dan Zivkovic
5551302d27
Don't assume that correctable words are invalid
...
Currently, the Delight3DictionaryFacilitator sets a boolean flag when the top
suggestion score exceeds the auto-correction threshold. This flag is used to
trigger auto-correction of the typed word. Also, the existing logic assumes
that if allowsToBeAutoCorrected then the word is invalid, which is no longer
true after we stopped using whitelists.
Bug 19518376.
Change-Id: Ifa7f6a09c07d25ac68c6cf3aec91f358bd88689f
2015-02-25 17:59:58 -08:00
Mohammadinamul Sheik
20fb37afee
Make DictionaryFactory.killDictionary public
...
Change-Id: I9a0733392651714b3ba232cdb805565a5238eb93
2015-02-25 17:53:35 -08:00
Jatin Matani
b684d2d2e4
Share decoders among latinime components.
...
Change-Id: I6c8d3cf10e05e606308cea42d1e935a415ada9f8
2015-02-25 17:48:30 -08:00
Mario Tanev
86ae0ffe9d
am 487e038f: Use Keyboard in several interfaces.
...
* commit '487e038ff329b6099ff5343fb2d7bdc60a6fd699':
Use Keyboard in several interfaces.
2015-02-26 01:34:54 +00:00
Mario Tanev
487e038ff3
Use Keyboard in several interfaces.
...
Simplify interfaces by passing Keyboard instead of
KeyboardLayout and ProximityInfo directly. Also require
the Keyboard passed be non-null and change the SpellChecker
to bail out if there is no keyboard for the locale.
Change-Id: I960f15ff60171f55d3e0a96fd6469b7dc3a045e2
2015-02-25 17:20:00 -08:00
Dan Zivkovic
6e8c45a4da
am ed378c78: Auto-correct without whitelist in Delight3.
...
* commit 'ed378c78a15757c7386d84c6cd7470d56ed00c76':
Auto-correct without whitelist in Delight3.
2015-02-25 21:25:12 +00:00
Dan Zivkovic
ed378c78a1
Auto-correct without whitelist in Delight3.
...
Bug 19390471.
Change-Id: Ie09b916ca80591c98f48ae1d74d4fd5b0c5d6b33
2015-02-25 11:47:43 -08:00
Martin Paraskevov
2d91e5419f
am 2b8d763c: Pass ComposedData to the decoder instead of WordComposer.
...
* commit '2b8d763c65b2482fcdc7efe301907ac18133fa42':
Pass ComposedData to the decoder instead of WordComposer.
2015-02-25 02:27:21 +00:00
Martin Paraskevov
2b8d763c65
Pass ComposedData to the decoder instead of WordComposer.
...
Change-Id: I8bd544d03d9087a02294b08a9986cad229dae795
2015-02-24 17:59:47 -08:00
Mario Tanev
af096dff14
am a3ac6f24: Merge "Don\'t call resetDictionaries if DictionaryFacilitatorLruCache.get() hasn\'t been called yet. This breaks the AOSP SpellChecker. This seems to be a bug introduced recently, when the DictionaryFacilitatorLruCache was turned into a "cache" of 1 elemen
...
* commit 'a3ac6f24cc6a22651e09a1bf7fc018d4af945333':
Don't call resetDictionaries if DictionaryFacilitatorLruCache.get() hasn't been called yet. This breaks the AOSP SpellChecker. This seems to be a bug introduced recently, when the DictionaryFacilitatorLruCache was turned into a "cache" of 1 element.
2015-02-25 00:25:09 +00:00
Mario Tanev
a3ac6f24cc
Merge "Don't call resetDictionaries if DictionaryFacilitatorLruCache.get() hasn't been called yet. This breaks the AOSP SpellChecker. This seems to be a bug introduced recently, when the DictionaryFacilitatorLruCache was turned into a "cache" of 1 element."
2015-02-25 00:20:32 +00:00
Mohammadinamul Sheik
85c78f7124
am 24c28243: Do not crash when dictioanryInfo is NULL
...
* commit '24c282437dd7dd4b135e3410b5459ca83d304524':
Do not crash when dictioanryInfo is NULL
2015-02-24 23:57:21 +00:00
Mario Tanev
1a6d01b61e
Don't call resetDictionaries if DictionaryFacilitatorLruCache.get()
...
hasn't been called yet. This breaks the AOSP SpellChecker. This seems
to be a bug introduced recently, when the
DictionaryFacilitatorLruCache was turned into a "cache" of 1 element.
Change-Id: I55f6c18b274c9a33fd62cb25bcd02f64788d5ff0
2015-02-24 15:56:43 -08:00
Mohammadinamul Sheik
24c282437d
Do not crash when dictioanryInfo is NULL
...
Bug: 19417599
Change-Id: I82174401c595b57b42fc74bc478b551869729ba6
2015-02-24 15:45:10 -08:00
Jatin Matani
3c0997c961
am f7058c2a: Merge "Pass long timestamps to DictionaryFacilitator"
...
* commit 'f7058c2a89d3e081b2a279ef4853409924d42346':
Pass long timestamps to DictionaryFacilitator
2015-02-24 21:01:53 +00:00
Jatin Matani
f7058c2a89
Merge "Pass long timestamps to DictionaryFacilitator"
2015-02-24 20:57:34 +00:00
Tom Ouyang
30a9af899f
am edb2d238: Check for null TextRange in InputLogic.unlearnWordBeingDeleted
...
* commit 'edb2d2380214fa3a6d5416cc916f58360214d123':
Check for null TextRange in InputLogic.unlearnWordBeingDeleted
2015-02-24 20:07:20 +00:00
Tom Ouyang
edb2d23802
Check for null TextRange in InputLogic.unlearnWordBeingDeleted
...
Change-Id: Ia0df0ab740c76185f94966f59a74a6ebdd1cffe8
2015-02-24 11:30:42 -08:00
Mohammadinamul Sheik
57b2d854b3
am 1d5ec613: Use DECODER_DICT_SUFFIX on fallback to the default main dict resource.
...
* commit '1d5ec6136cf2d2c84453120407957ddb64c7b2b7':
Use DECODER_DICT_SUFFIX on fallback to the default main dict resource.
2015-02-24 01:33:33 +00:00
Mohammadinamul Sheik
1d5ec6136c
Use DECODER_DICT_SUFFIX on fallback to the default main dict resource.
...
Change-Id: Icec45c364732c0aa9ac713846cad23439b9e42b5
2015-02-23 17:25:08 -08:00
Jatin Matani
94b8523566
Pass long timestamps to DictionaryFacilitator
...
Change-Id: I95500f210ed409c0ff254b08b68fe3b5b59ba4f4
2015-02-23 16:50:02 -08:00
Mohammadinamul Sheik
95b179e699
am bae3c4ba: Merge "Make checksum and header checks decoder dependent."
...
* commit 'bae3c4bac563d2379b462334b55ee78cc24ba0a0':
Make checksum and header checks decoder dependent.
2015-02-23 21:53:10 +00:00
Mohammadinamul Sheik
bae3c4bac5
Merge "Make checksum and header checks decoder dependent."
2015-02-23 21:47:28 +00:00
Chieu Nguyen
fd35422dfa
am 53b4bfdb: Merge "Add StatsUtils method for handling subtype change."
...
* commit '53b4bfdba01477860993bff29eefc337e3fd1d99':
Add StatsUtils method for handling subtype change.
2015-02-23 19:18:13 +00:00
Chieu Nguyen
53b4bfdba0
Merge "Add StatsUtils method for handling subtype change."
2015-02-23 19:11:15 +00:00
Dan Zivkovic
3466a3bd7e
am 08f3cdb3: Hide app icon when keyboard is a system app.
...
* commit '08f3cdb3c87e56ac62f5ac3c573beade592b4b06':
Hide app icon when keyboard is a system app.
2015-02-23 18:29:55 +00:00
Dan Zivkovic
08f3cdb3c8
Hide app icon when keyboard is a system app.
...
The objective is to show an app icon when the user installs the keyboard from
the Play Store, but not show the icon when it comes from the system image.
The latter rule applies to AOSP keyboards and to the Google Keyboard on a
Nexus device.
This change partially reverts ag/613096.
Bug 19001197.
Change-Id: Icb202deffe9f1ab2bde9b3c9d221347da6793a19
2015-02-23 10:21:20 -08:00
Mohammadinamul Sheik
eeeec21bac
Make checksum and header checks decoder dependent.
...
Change-Id: I0ec4aa69d9b5f013ae926cc368e25225d9d3073b
2015-02-20 18:30:23 -08:00
Jatin Matani
c372b3bce4
am 1c11f3fe: Merge "Remove unused APIs in DIctionaryFacilitator"
...
* commit '1c11f3fe0ef5e92af3f8c1c9f9e157ea400c6c35':
Remove unused APIs in DIctionaryFacilitator
2015-02-21 01:22:34 +00:00
Jatin Matani
1c11f3fe0e
Merge "Remove unused APIs in DIctionaryFacilitator"
2015-02-21 01:17:25 +00:00
Jatin Matani
83e9a29c33
Remove unused APIs in DIctionaryFacilitator
...
Change-Id: Iae20a0a3b7c1aa0c2f6d29cef780fb50dc9010cb
2015-02-20 11:19:27 -08:00
Dan Zivkovic
f1ce7e1c53
am fe3c4ef9: Merge "Spell checker uses cache of size 1."
...
* commit 'fe3c4ef9401d7cdcf07498d97820980fa90528fb':
Spell checker uses cache of size 1.
2015-02-20 19:11:16 +00:00
Dan Zivkovic
fe3c4ef940
Merge "Spell checker uses cache of size 1."
2015-02-20 19:06:48 +00:00
Dan Zivkovic
29aa3df3da
Spell checker uses cache of size 1.
...
This is a step in the direction of removing the LRU cache completely.
Change-Id: I8886f7ef74e6b1b35135e68f169cb461682964e9
2015-02-20 11:05:44 -08:00
Jatin Matani
b42013ae4f
am 01b02373: Add tests for Contact* classes
...
* commit '01b023730ee3d86d60016c21915608376c724442':
Add tests for Contact* classes
2015-02-20 18:01:07 +00:00
Jatin Matani
01b023730e
Add tests for Contact* classes
...
Also add empty implementation for dictionary
facilitator iteration APIs
Change-Id: Ia847e3faa75075c819fcfda89193d1024d2d5aca
2015-02-20 09:14:27 -08:00
Dan Zivkovic
6ed6306e1f
am 40b75456: Rename in preparation of caching an instance.
...
* commit '40b754565ce86247e2ae95e9de6b54b53a35fca8':
Rename in preparation of caching an instance.
2015-02-20 01:16:26 +00:00
Dan Zivkovic
40b754565c
Rename in preparation of caching an instance.
...
Change-Id: I112c957e20d4573daaa71aa218b575037585385c
2015-02-19 15:41:58 -08:00
Dan Zivkovic
4b0697938b
am 3bfc9d46: Merge "Schedule with 0 delay is the same as execute."
...
* commit '3bfc9d46923a2f769ac2072ac817b01b720fabb2':
Schedule with 0 delay is the same as execute.
2015-02-19 22:51:46 +00:00
Dan Zivkovic
3bfc9d4692
Merge "Schedule with 0 delay is the same as execute."
2015-02-19 22:42:55 +00:00
Dan Zivkovic
c38d83eb1a
am 7041313f: Merge "If contacts observer is running, return early."
...
* commit '7041313f717db3bc89db46c9c59703bd99366095':
If contacts observer is running, return early.
2015-02-19 22:20:25 +00:00
Dan Zivkovic
6a000183c5
Schedule with 0 delay is the same as execute.
...
Change-Id: Ifadae8aee668edbe2b507735d3ed6e68d52ef329
2015-02-19 14:19:23 -08:00