Commit Graph

7708 Commits (4ef27c035892888df82d9c9f32ac12ed48c8308f)

Author SHA1 Message Date
Ken Wakasa 6fff167a8d am 38f6ff42: am 0e300c83: Avoid a disk write on UI thread
Merge commit '38f6ff4289933aaa54461f72ba14d33ad1d6c5d7'

* commit '38f6ff4289933aaa54461f72ba14d33ad1d6c5d7':
  Avoid a disk write on UI thread
2010-09-08 20:40:30 -07:00
Ken Wakasa 0e300c83a1 Avoid a disk write on UI thread
bug: 2983837
Change-Id: I4eca20fb4defcf149788032a98fe5894b57e1e19
2010-09-09 11:57:55 +09:00
Ken Wakasa fa12d86cb5 am dacc927a: am c1ff2846: Update strings for the settings access - based on the latest GB IME spec (ver 03). Please refer to bug: 2979069 for the latest mock.
Merge commit 'dacc927a57b0c7adfbdf244441b9b2495c959980'

* commit 'dacc927a57b0c7adfbdf244441b9b2495c959980':
  Update strings for the settings access - based on the latest GB IME spec (ver 03).
2010-09-07 05:35:02 -07:00
Ken Wakasa c1ff28462e Update strings for the settings access - based on the latest GB IME spec (ver 03).
Please refer to bug: 2979069 for the latest mock.

Got rid of obsolete string too.

Change-Id: Ic02d1651b288f24f9c3a9da5d0dcf09055256ab0
2010-09-07 21:28:44 +09:00
Tadashi G. Takaoka ca43ce0588 am e5abf25d: am 83e63ace: Dismiss mini keyboard when finger is released outside mini keyboard
Merge commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea'

* commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea':
  Dismiss mini keyboard when finger is released outside mini keyboard
2010-09-07 01:49:04 -07:00
Tadashi G. Takaoka 83e63ace2a Dismiss mini keyboard when finger is released outside mini keyboard
Bug: 2978975

Change-Id: Ie634e8ae827fe093c5c673b75d85835050b03794
2010-09-07 17:44:31 +09:00
Tadashi G. Takaoka 0415ddde59 am bc1a0354: am 26aff8c6: Merge "Fixed extra periods when chording with shift and space" into gingerbread
Merge commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24'

* commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24':
  Fixed extra periods when chording with shift and space
2010-09-07 01:34:06 -07:00
Tadashi G. Takaoka 26aff8c62f Merge "Fixed extra periods when chording with shift and space" into gingerbread 2010-09-07 01:31:04 -07:00
Tadashi G. Takaoka 6252f468bc Fixed extra periods when chording with shift and space
Actually it was caused by canceling repeat key (space and delete) when
multiple pointer are touching.

Bug: 2975041
Change-Id: If82183b9225efdace7b5418860b9664f1705b7ec
2010-09-07 17:29:09 +09:00
satok e1cb2e4977 resolved conflicts for merge of 36d2d0e7 to master
Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
2010-09-07 15:37:32 +09:00
satok 66b42a1c2d Add shared preference for re-correction
Change-Id: Ie5b2e0d2f9739dd33524c2688e172e77aac1f243
2010-09-07 15:23:10 +09:00
Tadashi G. Takaoka 623818a8db am 7bbea0dd: am 8d7ffcb2: Disable pop-up preview on mini keyboard
Merge commit '7bbea0dd8fe04b378a9a7a161c2995998f4a8dcf'

* commit '7bbea0dd8fe04b378a9a7a161c2995998f4a8dcf':
  Disable pop-up preview on mini keyboard
2010-09-06 06:49:01 -07:00
Tadashi G. Takaoka 920c507cd3 am efe7abe0: am 12659d4c: Fix ALT key light behavior
Merge commit 'efe7abe03dce1779ce76e175d0fe9422d2f8eaad'

* commit 'efe7abe03dce1779ce76e175d0fe9422d2f8eaad':
  Fix ALT key light behavior
2010-09-06 06:47:03 -07:00
Tadashi G. Takaoka 8d7ffcb2ac Disable pop-up preview on mini keyboard
This change also disable the special behavior of long press a key that
has only one digit alternate.  If the visual design of both the pop-up
preview and the mini keyboard will look like same, I think that
showing mini keyboard is enough for the key that has one digit
alternate.

Bug: 2973546
Change-Id: I04f138c120aa58526fe054626dac856171fb7a58
2010-09-06 22:42:17 +09:00
Tadashi G. Takaoka 12659d4c0c Fix ALT key light behavior
This change also cleanups some imports, unnecessary cast and null check.

Bug: 2977256
Change-Id: I81b9e539ff8a13ae0cc1eb5c4fb2246732cca3e9
2010-09-06 22:25:49 +09:00
Tadashi G. Takaoka cba7b0b6ab am d5bcbf81: am c8b9afe0: Support multi-touch only when device has distinct multi-touch panel
Merge commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31'

* commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31':
  Support multi-touch only when device has distinct multi-touch panel
2010-09-06 02:19:13 -07:00
Tadashi G. Takaoka c8b9afe037 Support multi-touch only when device has distinct multi-touch panel
Bug: 2973373
Change-Id: I9871c09ec8c1c2aa945d97392e61ee1ec585baef
2010-09-06 17:57:13 +09:00
satok ac021708ae am 34830114: am 0a498cf8: Merge "Extend space LED for autocompletion" into gingerbread
Merge commit '34830114e66882bf30505f1e538764c9abd3025b'

* commit '34830114e66882bf30505f1e538764c9abd3025b':
  Extend space LED for autocompletion
2010-09-03 04:27:20 -07:00
satok 0a498cf8d8 Merge "Extend space LED for autocompletion" into gingerbread 2010-09-03 04:24:01 -07:00
satok 1bf265d185 Extend space LED for autocompletion
Change-Id: If59ea7c871ffc2af6fe2bfde72303f2612e43c3b
2010-09-03 20:20:10 +09:00
Tadashi G. Takaoka ab5653dce0 am 232b0394: am e8f45ab5: One alternate is treated as key action, not open mini keyboard
Merge commit '232b039496ef95c543bac5128e6378b38760de21'

* commit '232b039496ef95c543bac5128e6378b38760de21':
  One alternate is treated as key action, not open mini keyboard
2010-09-03 04:13:20 -07:00
Tadashi G. Takaoka e8f45ab56f One alternate is treated as key action, not open mini keyboard
This change also fixes bug#2973683.

Bug: 2973546
Bug: 2973683
Change-Id: I67573e5b7cad4af261591a4a608d0596dd7901f2
2010-09-03 20:09:21 +09:00
Tadashi G. Takaoka bf669e4379 am c93ac9db: am ffa88f0e: Merge "Move inflating mini keyboard code into separate method" into gingerbread
Merge commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22'

* commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22':
  Move inflating mini keyboard code into separate method
2010-09-03 02:59:42 -07:00
Tadashi G. Takaoka ffa88f0ef5 Merge "Move inflating mini keyboard code into separate method" into gingerbread 2010-09-03 02:54:44 -07:00
satok 6a36764a8d am e5ae8c62: am 1b09ac4f: Merge "Add a showing input method picker option by longpressing setting key" into gingerbread
Merge commit 'e5ae8c62c83ad29d623562a74355bc619c216742'

* commit 'e5ae8c62c83ad29d623562a74355bc619c216742':
  Add a showing input method picker option by longpressing setting key
2010-09-03 01:55:37 -07:00
satok 1b09ac4f93 Merge "Add a showing input method picker option by longpressing setting key" into gingerbread 2010-09-03 01:51:38 -07:00
satok 9a6a4d3d5f Add a showing input method picker option by longpressing setting key
Bug: 2959271

Change-Id: I4b7e9a2de3cbe17b168ed8d0541a9b1cd9a9e107
2010-09-03 17:48:44 +09:00
Tadashi G. Takaoka 0b4734396f Move inflating mini keyboard code into separate method
Change-Id: Iba8e43ba6125e559d4c7d9cadb6bcb13b8eefc83
2010-09-03 17:35:54 +09:00
Tadashi G. Takaoka 80e518d36b am 1274cd16: am 5583cb0a: Merge "Followup TBR in I87060049" into gingerbread
Merge commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544'

* commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544':
  Followup TBR in I87060049
2010-09-03 00:41:48 -07:00
Tadashi G. Takaoka 5583cb0afc Merge "Followup TBR in I87060049" into gingerbread 2010-09-03 00:37:59 -07:00
Tadashi G. Takaoka 0529a04b6a Followup TBR in I87060049
This change is followup TBR in I87060049cad6f9d6432b6c4a246c15587ae0d837

Change-Id: I02ee33da269162f5e95ce5b985dbf5094ba14c0d
2010-09-03 15:55:18 +09:00
satok ec8c4f0d37 am 66546535: am c5841994: Merge "Change symbol on space bar when autocompletion is activated" into gingerbread
Merge commit '6654653562d0ec5d46a74f8c49eab2488e273cf2'

* commit '6654653562d0ec5d46a74f8c49eab2488e273cf2':
  Change symbol on space bar when autocompletion is activated
2010-09-02 23:30:24 -07:00
satok c5841994af Merge "Change symbol on space bar when autocompletion is activated" into gingerbread 2010-09-02 23:26:06 -07:00
satok 41feaaadb7 Change symbol on space bar when autocompletion is activated
bug: 2959279

Change-Id: Icc70b7cce0c245ae2451d324debd346f226b8769
2010-09-03 15:17:26 +09:00
Tadashi G. Takaoka 7d4833a8bf am 22776af8: am c5d33b16: Fix NPE in LatinKeyboardBaseView
Merge commit '22776af828c69db22d90b42d196f487095905c70'

* commit '22776af828c69db22d90b42d196f487095905c70':
  Fix NPE in LatinKeyboardBaseView
2010-09-02 22:23:09 -07:00
Tadashi G. Takaoka c5d33b1652 Fix NPE in LatinKeyboardBaseView
This change also refactors some mini-keyboard related methods in
LatinKeyboardBaseView and PointerTracker class.

Bug: 2973236
Change-Id: I3190fe89ea3ac3c6d351ed4b6d77de98a0aa65db
2010-09-03 13:03:08 +09:00
Tadashi G. Takaoka efabc4eb52 am 2fb112f1: am 7083b748: Propagate preview enable attribute to mini-keyboard
Merge commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7'

* commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7':
  Propagate preview enable attribute to mini-keyboard
2010-09-02 13:35:17 -07:00
Tadashi G. Takaoka 7083b7486e Propagate preview enable attribute to mini-keyboard
Bug: 2959169
Change-Id: Iea1bec44baf3344d9f91280bd2b8f28476cbcf51
2010-09-03 05:28:43 +09:00
Tadashi G. Takaoka 539fb1bc67 am 20052f34: am fe72f135: Remove close button from mini keyboard
Merge commit '20052f34f987ab946d54cc405fa42cd0510fb94f'

* commit '20052f34f987ab946d54cc405fa42cd0510fb94f':
  Remove close button from mini keyboard
2010-09-02 13:15:20 -07:00
Tadashi G. Takaoka e46f44714d am cea6a25b: am 07221a4a: Support sliding pop-up mini-keyboard input
Merge commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4'

* commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4':
  Support sliding pop-up mini-keyboard input
2010-09-02 13:01:25 -07:00
Tadashi G. Takaoka fe72f135b8 Remove close button from mini keyboard
Bug: 2959169
Change-Id: I9c78f9417aaa448b8b23596bc3e748fe99085393
2010-09-03 04:56:12 +09:00
Tadashi G. Takaoka a18e956f7a am 23eb4711: am 6bfb234f: Refactor KeyDetector to share more methods
Merge commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe'

* commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe':
  Refactor KeyDetector to share more methods
2010-09-02 12:54:02 -07:00
Tadashi G. Takaoka 07221a4ad1 Support sliding pop-up mini-keyboard input
TODO:
- Remove close button on mini-keyboard
- Dismiss mini-keyboard when finger leave the screen while no key is selected

This change also renames some instance variables to have more meaningful name.

Bug: 2959169
Change-Id: I9fd79116a647d7be82415c6e9e7cdaf6edcb2bf6
2010-09-03 04:51:37 +09:00
Tadashi G. Takaoka 6bfb234f29 Refactor KeyDetector to share more methods
Bug: 2959169
Change-Id: I87060049cad6f9d6432b6c4a246c15587ae0d837
2010-09-03 00:46:19 +09:00
Tadashi G. Takaoka ac64a5c3ed am b52edca1: am 83b3cf56: Merge "Corresponding to TBR of Id2b0b974" into gingerbread
Merge commit 'b52edca15df778372e52986bc4f379d1b625a14a'

* commit 'b52edca15df778372e52986bc4f379d1b625a14a':
  Corresponding to TBR of Id2b0b974
2010-09-02 07:26:55 -07:00
Tadashi G. Takaoka 83b3cf56cd Merge "Corresponding to TBR of Id2b0b974" into gingerbread 2010-09-02 07:22:50 -07:00
Tadashi G. Takaoka 2fb7e2ff4d am c98e7cb2: am 0fe4c9e1: Corresponding to TBR of Ie6cf6768
Merge commit 'c98e7cb28b4e05883531266c31ea4c09fca74edc'

* commit 'c98e7cb28b4e05883531266c31ea4c09fca74edc':
  Corresponding to TBR of Ie6cf6768
2010-09-02 06:44:13 -07:00
Tadashi G. Takaoka 72d98fab21 Corresponding to TBR of Id2b0b974
This is follow up change of Id2b0b974fffdf6f09ee1828e957b973d2ce1c315
Bug: 2959169

Change-Id: Ie47db5fce7937a4d70c432ab76510d0dc3f68401
2010-09-02 22:36:22 +09:00
Tadashi G. Takaoka 0fe4c9e1a7 Corresponding to TBR of Ie6cf6768
This is follow up change of Ie6cf67681180467bd8ba35d0205ce6727b7684a2

Bug: 2959169
Change-Id: I9e4cb0c9178856ddd6049f0b751b54f3ad26a266
2010-09-02 22:34:15 +09:00
Tadashi G. Takaoka e9eda7ea94 am 7f67c211: am 400046d6: Encapsulate vertical and horizontal correction values into KeyDetector.
Merge commit '7f67c211e7ec4bdf148c9dd468cc8e73ffeb66e3'

* commit '7f67c211e7ec4bdf148c9dd468cc8e73ffeb66e3':
  Encapsulate vertical and horizontal correction values into KeyDetector.
2010-09-02 06:02:53 -07:00
Tadashi G. Takaoka 400046d62e Encapsulate vertical and horizontal correction values into KeyDetector.
Bug: 2959169
Change-Id: Id2b0b974fffdf6f09ee1828e957b973d2ce1c315
2010-09-02 21:54:26 +09:00
Tadashi G. Takaoka 9b5867e3e6 am a4397ce3: am 6b4d521f: Merge "Add PointerTracker argument to long press related methods" into gingerbread
Merge commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4'

* commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4':
  Add PointerTracker argument to long press related methods
2010-09-02 04:35:57 -07:00
Tadashi G. Takaoka 3d4123fabb Add PointerTracker argument to long press related methods
This change also adds debugging log to PointerTracker class

Bug: 2959169
Change-Id: Ie6cf67681180467bd8ba35d0205ce6727b7684a2
2010-09-02 20:28:31 +09:00
Tadashi G. Takaoka 373656f09b am d0457eae: am 3491c877: Merge "Queuing PointerTracker to support n-key roll-over and shift modifier." into gingerbread
Merge commit 'd0457eae17d10535023a02579d16ede7bfcc6bec'

* commit 'd0457eae17d10535023a02579d16ede7bfcc6bec':
  Queuing PointerTracker to support n-key roll-over and shift modifier.
2010-09-02 01:21:36 -07:00
Tadashi G. Takaoka 3491c877dd Merge "Queuing PointerTracker to support n-key roll-over and shift modifier." into gingerbread 2010-09-02 01:17:56 -07:00
Tadashi G. Takaoka 40a05f62ed Queuing PointerTracker to support n-key roll-over and shift modifier.
Bug: 2910379
Change-Id: I5cfae33e72a406585137842a2260310813cee07f
2010-09-02 16:03:46 +09:00
satok 11b448528b am c5363012: am a327485e: Change the preference name for a theme and remove a preference settings
Merge commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc'

* commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc':
  Change the preference name for a theme and remove a preference settings
2010-09-01 22:07:20 -07:00
satok a327485e59 Change the preference name for a theme and remove a preference settings
Change-Id: I5ad980559477775eb44df022e54ce5ef32398601
2010-09-02 13:54:30 +09:00
satok ee01bf1408 am 308acfa7: am ac4f8e46: Merge "Change background color for functional keys in LatinIME" into gingerbread
Merge commit '308acfa714a3a0aae073871e76e753b5a98096d1'

* commit '308acfa714a3a0aae073871e76e753b5a98096d1':
  Change background color for functional keys in LatinIME
2010-09-01 20:06:05 -07:00
satok ac4f8e4629 Merge "Change background color for functional keys in LatinIME" into gingerbread 2010-09-01 19:52:46 -07:00
satok dd8dd9fc1b Change background color for functional keys in LatinIME
Change-Id: I45f13c1fd139ce43478e5d0b2cdb62e56e9f77a8
2010-09-02 11:47:33 +09:00
Tadashi G. Takaoka 896aa23f06 am d8417f1c: am f7d71c33: Merge "Refactor PointerTracker to add isValidKeyIndex() predicate." into gingerbread
Merge commit 'd8417f1cfe0c5eaf7746ecd4f8e140c15624fedd'

* commit 'd8417f1cfe0c5eaf7746ecd4f8e140c15624fedd':
  Refactor PointerTracker to add isValidKeyIndex() predicate.
2010-09-01 17:34:29 -07:00
Tadashi G. Takaoka f7d71c338f Merge "Refactor PointerTracker to add isValidKeyIndex() predicate." into gingerbread 2010-09-01 17:29:46 -07:00
Amith Yamasani ec1f2486b0 am c354167c: am b00a1d0c: Correction improvements - use the new InputConnection APIs for underlining and fetching the selected text.
Merge commit 'c354167c84b06b572067efaddfbd3667ffdadb98'

* commit 'c354167c84b06b572067efaddfbd3667ffdadb98':
  Correction improvements - use the new InputConnection APIs for underlining and
2010-09-01 17:01:25 -07:00
Amith Yamasani b00a1d0c0a Correction improvements - use the new InputConnection APIs for underlining and
fetching the selected text.

Bug: 2950652

Some refinements to correction behavior, such as retaining the tap-to-save
when in correction mode.

Use reflection to access the new InputConnection APIs with fallbacks, in case
we run on older OS versions.

Some refactoring to separate lookup for voice alternatives and typed alternatives.

Change-Id: I7c4178bf7e6b47ee274c49fa7a694f8c2d50cea7
2010-09-01 14:16:50 -07:00
Tadashi G. Takaoka 568743e182 am 2c7583f6: am c6cb2ec1: Add new public attribute mPointerId to PointerTracker
Merge commit '2c7583f6c3c24202492b9404955b1aee2dc5ce94'

* commit '2c7583f6c3c24202492b9404955b1aee2dc5ce94':
  Add new public attribute mPointerId to PointerTracker
2010-09-01 13:04:27 -07:00
Tadashi G. Takaoka c6df09182c Refactor PointerTracker to add isValidKeyIndex() predicate.
Bug: 2910379
Change-Id: If2b28764dc777bb62949a95bc61c4a16ff152220
2010-09-02 02:49:52 +09:00
Tadashi G. Takaoka c6cb2ec1f3 Add new public attribute mPointerId to PointerTracker
It is easier to track each pointer if a PointerTracker object keeps
its pointer id.

Bug: 2910379
Change-Id: If3e3b0cf3d834d22302598f4d85d54c9a4ce92ba
2010-09-02 02:21:17 +09:00
Tadashi G. Takaoka a4c5745852 am 57a41d09: am 2085d43d: Make abstract KeyDetector class
Merge commit '57a41d09b6427a0d2c1e4884678a933753350a9c'

* commit '57a41d09b6427a0d2c1e4884678a933753350a9c':
  Make abstract KeyDetector class
2010-09-01 10:01:35 -07:00
Tadashi G. Takaoka 2085d43daf Make abstract KeyDetector class
The KeyDetector abstracts key detection algorithm. The
ProximityKeyDetector is one of its concrete implementations.  Another
one that might be called XAxisKeyDetector will follow to realize the
pop-up mini-keyboard behavior described in bug#2959169.

Bug: 2959169
Change-Id: Idd3fc53282e6b721ec7a4ce500af8aba21ce07a3
2010-09-02 01:53:26 +09:00
Tadashi G. Takaoka 1d3678ef2f am f3231f45: am 681b102a: Track all pointers events
Merge commit 'f3231f45310ae28b78662ae39b1961d80b3b01f8'

* commit 'f3231f45310ae28b78662ae39b1961d80b3b01f8':
  Track all pointers events
2010-09-01 08:31:14 -07:00
Ken Wakasa d7dba7c33d am fb82afd4: am 40ac45eb: Get rid of arrows in candidate view
Merge commit 'fb82afd48b6882cbdbb6477dca9526cd22d69400'

* commit 'fb82afd48b6882cbdbb6477dca9526cd22d69400':
  Get rid of arrows in candidate view
2010-09-01 08:30:56 -07:00
satok 6f99ca9eaa am 103381eb: am d4f60bc8: Merge "Fix new theme assets and resources" into gingerbread
Merge commit '103381ebf1a833ec478dd1bac41e67cf7d538f67'

* commit '103381ebf1a833ec478dd1bac41e67cf7d538f67':
  Fix new theme assets and resources
2010-09-01 08:30:54 -07:00
satok 132927f20e am 4d09b2e7: am 31adfa78: Add a new theme for Gingerbread
Merge commit '4d09b2e78e68ef0f1b713b10e280e56d91592717'

* commit '4d09b2e78e68ef0f1b713b10e280e56d91592717':
  Add a new theme for Gingerbread
2010-09-01 08:30:31 -07:00
Tadashi G. Takaoka 35682aff05 am c3b55809: am c7c6203f: Merge "Introduce multiple PointerTracker" into gingerbread
Merge commit 'c3b55809a5e650200a67c8f8164ba48db995c24c'

* commit 'c3b55809a5e650200a67c8f8164ba48db995c24c':
  Introduce multiple PointerTracker
2010-09-01 08:30:18 -07:00
Tadashi G. Takaoka 681b102a49 Track all pointers events
Bug: 2910379
Change-Id: I179ae4359afb57c351d5fcc5f5453c30d3ef0c01
2010-09-01 22:37:37 +09:00
Ken Wakasa 40ac45ebdc Get rid of arrows in candidate view
bug: 2959293
Change-Id: Ia5dcb29397f608846f865fabb3c696866b3687aa
2010-09-01 17:59:12 +09:00
satok 8d3ca2fc44 Fix new theme assets and resources
- Add a layout for popup for new theme
- Change the color of language bar
- Fix a drawable for settings feedback

Change-Id: I7c0c9e238c8223554a62f7b0c8092d074cf9743f
2010-09-01 17:38:50 +09:00
satok 31adfa78e2 Add a new theme for Gingerbread
bug: 2959293

Change-Id: I8aef19a7485ffd5639a177aee21103b3a1e04cf2
2010-09-01 16:18:01 +09:00
Tadashi G. Takaoka a521b31d96 Introduce multiple PointerTracker
Bug: 2910379
Change-Id: Iefafa2d30ad16f898a00664e4bf3e3e88dcd2cb2
2010-09-01 15:59:54 +09:00
Tadashi G. Takaoka 64f4915f46 am ad60fe2e: am 409731fb: Merge "Make KeyDebounce class a top-level class and rename it to PointerTracker" into gingerbread
Merge commit 'ad60fe2e80878e1b1caa2c9207d8f601e203560f'

* commit 'ad60fe2e80878e1b1caa2c9207d8f601e203560f':
  Make KeyDebounce class a top-level class and rename it to PointerTracker
2010-08-31 20:43:33 -07:00
Ken Wakasa 5d95dfc2cb am 7bb640c1: am 543dbdfd: Always present suggestion strip whenever in appropriate mode.
Merge commit '7bb640c1e06718936412af2c2198e09a57ce5124'

* commit '7bb640c1e06718936412af2c2198e09a57ce5124':
  Always present suggestion strip whenever in appropriate mode.
2010-08-31 20:43:31 -07:00
Tadashi G. Takaoka 409731fb46 Merge "Make KeyDebounce class a top-level class and rename it to PointerTracker" into gingerbread 2010-08-31 20:26:58 -07:00
Tadashi G. Takaoka 6a1514a0de Make KeyDebounce class a top-level class and rename it to PointerTracker
Bug: 2910379
Change-Id: I9503b2211b272a4a2903d0732985e5ab8ee39440
2010-09-01 12:26:32 +09:00
Ken Wakasa 543dbdfdbd Always present suggestion strip whenever in appropriate mode.
Some cleanups too.

bug: 2959293
Change-Id: Idf07fc25c5700b69b93ab4b09ce34941f0d9c157
2010-09-01 11:25:08 +09:00
Ken Wakasa 890c1d5fa3 am 5bb2e9a5: am b24cc640: Fix ArrayIndexOutOfBoundsException.
Merge commit '5bb2e9a55de237e1955ac1fd19eea3771e671afe'

* commit '5bb2e9a55de237e1955ac1fd19eea3771e671afe':
  Fix ArrayIndexOutOfBoundsException.
2010-08-31 17:22:49 -07:00
Ken Wakasa b24cc640c1 Fix ArrayIndexOutOfBoundsException.
bug: 2964045
Change-Id: I97d95181e1a6838ace9c135aa92e7f20034e821f
2010-09-01 09:11:38 +09:00
Tadashi G. Takaoka e202e5e298 am cc742449: am b57b4785: Refactor KeyDebounce class
Merge commit 'cc7424498f63712077e8e4009932b22fabdc1e38'

* commit 'cc7424498f63712077e8e4009932b22fabdc1e38':
  Refactor KeyDebounce class
2010-08-31 10:10:48 -07:00
Tadashi G. Takaoka 224453eea2 am f4230c49: am dc406a2d: Merge "Refactor key preview methods" into gingerbread
Merge commit 'f4230c498d2424e52170599da7cd231df5a9311e'

* commit 'f4230c498d2424e52170599da7cd231df5a9311e':
  Refactor key preview methods
2010-08-31 10:10:46 -07:00
satok 981ddd228d am 28f6351d: am 673aed42: Add settings button
Merge commit '28f6351df341bd27c330b79f315e7419f2f35100'

* commit '28f6351df341bd27c330b79f315e7419f2f35100':
  Add settings button
2010-08-31 10:10:15 -07:00
Tadashi G. Takaoka b57b478569 Refactor KeyDebounce class
This change moves the following methods into KeyDebounce class.
- MotionEvent handling methods (onDownEvent etc.).
- Keyboard action event generator method (detectAndSendKey).
- Multi-tap key support methods (resetMultiTap etc.).
- Key preview text generator method (getPreviewText).

The change that makes KeyDebounce a top-level class will follow.

Bug: 2910379
Change-Id: I1526c0461e247d97f0c4b3bd580330f137c787be
2010-09-01 00:18:49 +09:00
Maryam Garrett 32511ef6cb Merge "Logging for the VoiceSearch alternates" 2010-08-31 07:48:07 -07:00
Tadashi G. Takaoka dc406a2db6 Merge "Refactor key preview methods" into gingerbread 2010-08-31 02:39:41 -07:00
Tadashi G. Takaoka 2ca84dacff Refactor key preview methods
Extract key press and release handling out of previewKey() to
KeyDebouncer class. And pass Key object as argument of previewKey()
instead of key index.

Bug: 2910379
Change-Id: Ifec39cfc4845bd92da2f62eba2b26ac6a5cbb341
2010-08-31 18:39:20 +09:00
satok 673aed42c3 Add settings button
- delete unused keyboard layout

Change-Id: Iab39446653460797f1ca876a7d9a23190c3a8df6
2010-08-31 14:03:50 +09:00
Tadashi G. Takaoka 85c1c43540 am c4154ba8: am eeb77d4f: Merge "Remove mAbortKey flag completely" into gingerbread
Merge commit 'c4154ba8dec50eaf7f9d118067d3eb7d89701192'

* commit 'c4154ba8dec50eaf7f9d118067d3eb7d89701192':
  Remove mAbortKey flag completely
2010-08-30 18:29:01 -07:00
Tadashi G. Takaoka eeb77d4f6a Merge "Remove mAbortKey flag completely" into gingerbread 2010-08-30 18:19:03 -07:00
Maryam Garrett 7b9ed1aa76 Logging for the VoiceSearch alternates
Log which voice-based alternates were selected, and what
word in the recognition results were replaced.

Change-Id: I1527dc794902a18a226ca45e186ecf84841094c8

Conflicts:

	java/src/com/android/inputmethod/latin/LatinIME.java
2010-08-30 14:34:10 -04:00
Tadashi G. Takaoka ba9b24edff Remove mAbortKey flag completely
These three conditions assign true to the mAbortKey flag.
1. setKeyboard() sets the new keyboard layout.
2. long press shows the pop-up mini keyboard.
3. ACTION_CANCEL event is occurred.

In the case 1, in LatinIME so far, only "symbol key" and "language
switch" cause keyboard layout change.  In both cases, the event is
occurred in onUpEvent(), so we do not need to worry about aborting
event.

In the case 2, long press is used only to pop-up mini-keyboard and at that
time mMiniKeyboardOnScreen could be used as a flag.

In the case 3, though I'm not sure when this case occurs, in
onCancelEvent() all the things that should be canceled are canceled
in onCancelEvent().

Bug: 2910379
Change-Id: I12377c5f3e808f1c017ce980e12b1513895047bc
2010-08-31 00:43:40 +09:00
Tadashi G. Takaoka a66ccc3e8d am 1cd7d96f: am ed5ce6c1: Merge "Remove extension keyboard" into gingerbread
Merge commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1'

* commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1':
  Remove extension keyboard
2010-08-30 08:34:08 -07:00
Tadashi G. Takaoka d2a431efa7 Remove extension keyboard
Bug: 2959287
Change-Id: I344ac58b4119e96daf5928c784275ee0b7095958
2010-08-30 21:20:55 +09:00
satok 8650230abc am e975c196: am 5d55cf6d: Remove Log functions from Gingerbread
Merge commit 'e975c196c5638ac7f5a61e45100a6eba49900412'

* commit 'e975c196c5638ac7f5a61e45100a6eba49900412':
  Remove Log functions from Gingerbread
2010-08-30 02:01:20 -07:00
satok 5d55cf6dfc Remove Log functions from Gingerbread
Change-Id: I0ab19726a6bfaf14b42c05903f38dfb74cbd0d37
2010-08-30 16:32:50 +09:00
satok cb6221257a DO NOT MERGE. Remove a preference for bigram suggestion
Change-Id: I1a9142d988352abf88da5eefe1d02596c7fc2beb
2010-08-30 14:56:49 +09:00
Tadashi G. Takaoka 06123e5691 Don't re-allocate KeyDebouncer when keyboard is switched.
This change also re-orders instance variables and eliminates
unnecessary ones.

Bug: 2910379
Change-Id: I6b2217f75738fada32a33f59f0f7adba5e99dd6e
2010-08-28 01:23:01 +09:00
Tadashi G. Takaoka 00dda50efd Revert "Show key preview instantaneously"
This reverts commit 09f530e248.

Change-Id: I3106cd22cc1eac750f05bce26df6af3026dfaf86
2010-08-27 21:04:31 +09:00
Tadashi G. Takaoka 09f530e248 Show key preview instantaneously
This change will display the key board preview instantaneously when
the key is pressed.  Dismissing the key preview will be delayed
slightly after the key is released, as we do now.

Because in multi touch mode, we should instantaneously change keyboard
layout when modifier key, such as shit and symbol, is pressed.

Change-Id: I49348d563ca0f40f5a0a236bdcd0bb07eedd599b
2010-08-27 19:38:52 +09:00
Tadashi G. Takaoka 7986d78328 Merge "Disable long-press on shift and symbol keys" into gingerbread 2010-08-26 23:54:29 -07:00
Tadashi G. Takaoka cec1495071 Disable long-press on shift and symbol keys
Long-press on shift and symbol keys will conflict with press-and-hold
these keys and press normal key (a.k.a. multi touch support).

Bug: 2910379

Change-Id: I27007b55a30a3699bf63fd8f64d58c4b23d97d9f
2010-08-27 15:47:35 +09:00
satok f17a50f5a5 Merge "Not to reset the ring buffer in LatinImeLogger" into gingerbread 2010-08-26 22:42:07 -07:00
satok 975fc3cfd8 Not to reset the ring buffer in LatinImeLogger
Change-Id: I3286b2562e07d77a9dfd745ad6ec44aae4396e21
2010-08-27 14:26:58 +09:00
Tadashi G. Takaoka 830fd4af56 Merge "Refactor onModifiedTouchEvent into several methods." into gingerbread 2010-08-26 19:56:32 -07:00
Tadashi G. Takaoka bdd9c3dc4f Remove unused import statement
Change-Id: I61890a702060650369c6edf70c3de823a0fc1bf1
2010-08-27 11:11:05 +09:00
Tadashi G. Takaoka 5b6fbf9a4f Refactor onModifiedTouchEvent into several methods.
This change eliminates the need of extra MotionEvent allocation.  Also
this will lead to the easy way to handle multi touch events.

Bug: 2910379
Change-Id: Ibcfcba554b732c13105f91877b41b553ee6928ba
2010-08-27 09:59:59 +09:00
Tadashi G. Takaoka e83d7385ab Refactor getKeyIndexAndNearbyCodes into independent class
Bug: 2910379
Change-Id: Ib26a898ea108ee4292f9f91b6d7d10c1fc380fd1
2010-08-26 23:33:08 +09:00
Tadashi G. Takaoka dfbc5080a1 Refactor SwipeTracker class
This change moves SwipeTracker out from LatinKeyboardBaseView.  Also
this introduces EventBuffer class for swipe tracking buffer.

Bug: 2910379

Change-Id: I48ff714226a248ca063cbaf9755cf45e458f7402
2010-08-26 23:28:52 +09:00
satok 542f057ef6 Add a log for getting coordinates of keys
Change-Id: I57cc6fb6a9eeb65ce8c0c3c3262fd525726643e2
2010-08-26 18:08:12 +09:00
Tadashi G. Takaoka 0c54809891 Refactor gesture detector logic
GestureDetector listener's onFling method will not call detectAndSendKey
anymore.

Make gesture detector be ignoring multitouch.  Refactoring
GestureDetector out of LatinKeyboardBaseView class change will follow.

Bug: 2910379
Change-Id: I0b2a9c4cf7d432f89f9085f3c2bdf3a3757a8903
2010-08-26 15:54:50 +09:00
Tadashi G. Takaoka 0d098c514e Fix bugs in key repeat logic
Bug: 2950714
Change-Id: I3110369c085f89ee1e8f7392a9a04a6b9e377ed4
2010-08-26 12:03:17 +09:00
Tadashi G. Takaoka 05d1904ed7 Refactor SwipeTracker to top level class
Bug: 2910379
Change-Id: If0ef09d8b0e7ca1c62b4c5a31bcaa620664868f2
2010-08-25 17:21:43 +09:00
Tadashi G. Takaoka f4271e51e7 Refactor key repeating related code
This change encapsulates mInKeyRepeat (former mRepeatKeyIndex) into
UIHandler class.  Also this eliminates mCurrentKey and mLastTapTime
dependency from repeatKey method.

Bug: 2910379
Change-Id: I9351a558be2ebc04de4ebb0d323af4be33bd470c
2010-08-25 12:33:46 +09:00
Tadashi G. Takaoka 8ee1321264 Refactor long press related code
This change eliminates mCurrentKey dependency from openPopupIfRequired
method.  Also slightly cleanup onModifiedTouchEvent.

Bug: 2910379
Change-Id: I90c9b39c46c0bb32ecc6588abfc49eb60315f54c
2010-08-25 12:08:20 +09:00
Tadashi G. Takaoka edadd2661b Merge "Refactor onModifiedTouchEvent of LatinKeyboardBaseView" into gingerbread 2010-08-24 18:27:47 -07:00
Tadashi G. Takaoka 8b0cb128be Refactor onModifiedTouchEvent of LatinKeyboardBaseView
This change simplifies onModifierTouchEvent to focus on handling
motion event related to a key event.

Other refactoring will follow in order to support multi touch.

Bug: 2910379

Change-Id: I036be64168d951a535600a7910b36bc109f88490
2010-08-25 10:17:14 +09:00
satok 525141a402 Clean up LatinIME java
- remove unused code
- add @Override
- change the inappropriate cast

Change-Id: Ib25b4939e5b4273794ab0f6349776b5b62d89894
2010-08-24 12:40:00 +09:00
Ken Wakasa 78c4611719 Fix LatinIME crashing due to crash in Contacts DB
bug: 2895391
Change-Id: I3a0628942b74556f8b600b63ebc5d808fb2f0abd
2010-08-20 20:12:39 +09:00
Ken Wakasa 17dc363a63 Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
Change-Id: I03d3d9b25147632d25c1502f796acad4cdaeb239
2010-08-20 18:28:22 +09:00
satok 979f869096 DO NOT MERGE. Backport LatinIME from master to Gingerbread
TODO: Cleanup will follow.

Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963
2010-08-20 14:37:03 +09:00
Ken Wakasa 6511376ff6 am 65582531: Fix a bug in backspace handling for the "Tap again to save"
Merge commit '6558253160e2039c87f424bd814f402ecd31de3b' into gingerbread

* commit '6558253160e2039c87f424bd814f402ecd31de3b':
  Fix a bug in backspace handling for the "Tap again to save"
2010-08-05 16:37:47 -07:00
Ken Wakasa 6558253160 Fix a bug in backspace handling for the "Tap again to save"
bug: 2889273
Change-Id: I0f317e203f368f5f47738154a6dee0f556d56148
2010-08-06 01:14:09 +09:00
Amith Yamasani b1068051c7 am f0296426: Don\'t auto-select the system language in IME language selection screen.
Merge commit 'f02964264f196447b03a88591a2964b67c318718' into froyo-plus-aosp

* commit 'f02964264f196447b03a88591a2964b67c318718':
  Don't auto-select the system language in IME language selection screen.
2010-05-04 12:05:33 -07:00
Amith Yamasani f02964264f Don't auto-select the system language in IME language selection screen.
Fixes http://b/2650378

On entering the selection screen, don't add the system language in addition
to other selected languages.

Change-Id: Id7a3b45df39a8493d17be668029eee139bf00ff3
2010-05-03 14:13:34 -07:00
Amith Yamasani 335a0c5511 am 938c1782: Fix for hanging extension keyboard. Bug: 2593488
Merge commit '938c178215d38c6f085b32b0994598f9e8bc5ab5' into froyo-plus-aosp

* commit '938c178215d38c6f085b32b0994598f9e8bc5ab5':
  Fix for hanging extension keyboard. Bug: 2593488
2010-04-15 16:48:13 -07:00
Amith Yamasani 938c178215 Fix for hanging extension keyboard. Bug: 2593488
Sometimes the only motion event that is above the keyboard is the UP
event. In that case we can't expect one more event to come that will
dismiss the extension. So don't show the extension if the only Y < 0
event is an UP event.

Change-Id: I04a8b742dea03cd700006dc5df740ac7d9620c0b
2010-04-15 14:44:22 -07:00
Valentin Kravtsov b98c17a7a9 am f9d0f3a8: Fix for: For Voice IME busy circle displayed below waveform
Merge commit 'f9d0f3a81ad4220672f90a8799a79e63e53c46d3' into froyo-plus-aosp

* commit 'f9d0f3a81ad4220672f90a8799a79e63e53c46d3':
  Fix for: For Voice IME busy circle displayed below waveform
2010-04-14 12:01:40 -07:00
Valentin Kravtsov f9d0f3a81a Fix for: For Voice IME busy circle displayed below waveform
bugfix for: http://b/issue?id=2568048

[Sapphire] ]For Voice IME busy circle displayed below waveform.
STEPS TO REPRODUCE:
1. launch Calendar . -> Select menu -> New Event.
2.  Switch soft keyboard to Number view.
3.  Tap on mic symbol of  to speak
4. Speak any word to enter in Text field .
5. Verify busy icon ( circular icon ) displayed in "working " screen.

EXPECTED RESULTS:
 Busy circle should be displayed in center of waveform

OBSERVED RESULTS:
 Busy circle displayed below waveform

ADDITIONAL INFORMATION:
 Spoken word is enetering in text field correctly.

Change-Id: I043ce6a985f526cade0e9f63525619a92d918485
2010-04-12 21:02:27 +01:00
Amith Yamasani 97f4b4ad34 am c2b8c16b: Possible fix for monkey bug: 2529350
Merge commit 'c2b8c16bdf392c81785031483d21740c5e883046' into froyo-plus-aosp

* commit 'c2b8c16bdf392c81785031483d21740c5e883046':
  Possible fix for monkey bug: 2529350
2010-04-06 12:39:02 -07:00
Amith Yamasani 4f695092a2 am 3e0c82ec: Fix for 2568664 : Slide gesture on spacebar is not reliable anymore
Merge commit '3e0c82ec80a69c4adbd60546c3c56c83c43ec7eb' into froyo-plus-aosp

* commit '3e0c82ec80a69c4adbd60546c3c56c83c43ec7eb':
  Fix for 2568664 : Slide gesture on spacebar is not reliable anymore
2010-04-06 12:38:59 -07:00
Amith Yamasani c2b8c16bdf Possible fix for monkey bug: 2529350
Don't try to show the extension if the main keyboard is not showing.

Change-Id: Ic3368f48f8973dedfb1ab8f4644b0766b52aed1b
2010-04-06 11:22:19 -07:00
Amith Yamasani 3e0c82ec80 Fix for 2568664 : Slide gesture on spacebar is not reliable anymore
This was due to the multi-touch error correction code that was recently
added. Make sure that one of the move points is in the upper 3 rows
to allow for fast swipe on spacebar.

Change-Id: I420bdb83a4cd8833c4158bc37a2d806b8c83b948
2010-04-06 11:14:03 -07:00
Jean-Baptiste Queru 443c360d0a Clarify licensing
-use AOSP copyright instead of Google
-add NOTICE and tag file

Bug: 2548782
Change-Id: If50b2e9e9cc4b4876b0d047fc9f34e2d537a6da4
2010-04-05 09:47:36 -07:00
Amith Yamasani dad0e792aa Fix for 2559069 IME ".com" should be erasable with one backspace
Change-Id: Ifef97a9b66e051fef7ca8b0a92bfe21f3d1e6cf6
2010-04-01 06:28:52 -07:00
Amith Yamasani 0fef498a07 Treat fast moves as multi-touch. Bug: 2561786
Detect sudden moves that have a large delta that would not be a typical drag
by the user when hunting for a key. Drop move events until the user releases
the touch and register both starting and ending keys instead of only the
ending key. This reduces the frequency of dropped keys on touch hardware that
isn't able to detect multi-touch reliably.

This also takes into account diagonal moves or right angled moves due to
pseudo-multi-touch.

It weakens the swipe gestures (to swipe, you'll need to swipe slowly and fully,
  otherwise it will trigger 2 keys)

Change-Id: Ieba3a0bef4c8910f0f17aa20baedb3581d1de12b
2010-03-31 15:18:17 -07:00
Amith Yamasani fbd1866424 Avoid race conditions between queries and closing of the auto_dict database.
Keep a reference to the openhelper around across locale and input language
changes. Also, share the openhelper between the queries and updates. Creating
a new one in a separate thread could cause it to be closed at the wrong time.

Monkey bugs, probably dupes.

Bug: 2560471
Bug: 2544169
Change-Id: I6eb39145de7191732ddde455728bf147a2d1ba31
2010-03-31 14:01:59 -07:00
Jean-Michel Trivi 06933183c8 Fix bug 2553592 API REVIEW: android.speech
Change 3 of 4
Notes from API Council review:
Rename RecognitionManager to SpeechRecognizer

Change-Id: Ieea0ade975b7c01f1fccb83a78a5b8f75e0c62de
2010-03-30 10:29:41 -07:00
Amith Yamasani d079b98ec4 Fix build breakage due to api change
Change-Id: I72661c51f277cb9aa3df0bd5a16756408b53ab7f
2010-03-29 18:04:13 -07:00
Amith Yamasani 0c05902e33 Don't auto-add when in suggest-only mode. Bug: 2521344
Also don't highlight quickfixes when in suggest-only mode
In general, reduce the situations where words are auto-added. It was
too eagerly adding even words that were in the dictionary.
2010-03-24 19:31:49 -07:00
Amith Yamasani 4ff60be170 Write the auto dictionary data to disk in a background thread to avoid blocking the UI thread.
Bug: 2536846

This also potentially fixes the occasional hangs on pressing space. Need to verify.
Bug: 2509010
2010-03-23 16:21:46 -07:00
Amith Yamasani bad436e93b Potential fix for extension keyboard not cleaning up bubbles sometimes.
This might also fix the keyboard closing suddenly when using the extension.
Re-enable bubble for landscape extension keyboard, since the framework can
now display it to the side.
2010-03-19 17:31:54 -07:00
Amith Yamasani 6780b898ec Fix a StringIndexOutOfBounds. Bug: 2524050 2010-03-17 21:39:02 -07:00
Amith Yamasani 1e5374e98b Remove popup for extension keyboard in landscape. bug: 2519903
Also add a summary text in the input language list for languages with
a dictionary so that users don't feel cheated when they pick a language
that doesn't happen to have a dictionary. Remove greek as it isn't an
extension of the QWERTY keyboard.
2010-03-17 17:02:28 -07:00
Amith Yamasani c3413faf92 Merge "Fix occasional correction errors in suggesting obvious corrections." 2010-03-16 12:24:13 -07:00
Maryam Garrett 4f1f2201bd Fixes the over-logging of TextModified
We were overlogging the TextMoified action because the old
implementation would log a cursor change as a text
modification. This CL logs 4 specific actions (choose
suggestion, delete text, insert text, insert punctuation)
as a text modification rather than any action in the textbox

I also add in logging of the length of the recognition result
so that we can get some more context around the scope of the
editing of the ime result.

Change-Id: I172df24ddc0a7b62bcc5ed806fd70ef7e1c42310
2010-03-15 12:18:08 -04:00
Amith Yamasani 231cacd080 Fix occasional correction errors in suggesting obvious corrections.
Bug: 2513996

The array of adjacent letters did not have the primary code in the first
position. Swap the codes around to make the primary the first one.

Change-Id: Id753254c88d440d3d76dbc048d123dfc78edf58d
2010-03-14 22:53:16 -07:00
Amith Yamasani 6c2f9f5ba7 Fix bug: 2512075 : Current input language resets to first in list on orientation change
Have separate variables for system locale and input locale.
2010-03-12 17:29:23 -08:00
Amith Yamasani 8102ae7941 2175312 : IME suggestions stay on screen after switching orientation in search dialog
Only show the candidate strip if the input view is showing. Otherwise ignore any
completions from the AutoCompleteTextView
2010-03-10 21:18:49 -08:00
Amith Yamasani 283a77f633 Load UserDictionary and AutoDictionary in a background thread.
This is to avoid ANRs during bootup, as some of the providers
may not have been initialized yet.

Refactored the ContactsDictionary and moved the async loading
code to ExpandableDictionary to share with the other dicts.

Bug: 2501133
Change-Id: I20393edb6fdf5df2f54ebac8dd04419a592177a2
2010-03-10 11:39:06 -08:00
Amith Yamasani 07b1603a3f Don't let the native code target be included twice when unbundling.
Move java code to a different directory so that the unbundled
version doesn't try to compile the native code again.

Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986
2010-03-09 15:01:09 -08:00