Commit Graph

1834 Commits (ae25e2c4088bd70ed22b47c5215195067919f4e6)

Author SHA1 Message Date
Tadashi G. Takaoka f731eb1760 Add separate key hysteresis distance for sliding modifier input
Bug: 7294402
Change-Id: I78c8be9e1a7b2d49d86bfe1e3a46d1785bfe5d48
2012-10-07 01:19:01 +09:00
Baligh Uddin 2d2ed168fa Import translations. DO NOT MERGE
Change-Id: Idaa866090d4afcf78178fff481ee601a2fcbe064
Auto-generated-cl: translation import
2012-10-05 17:01:15 -07:00
Baligh Uddin d528f4c9a7 Import translations. DO NOT MERGE
Change-Id: If42a2ec942dd630d4d17e37536a197ba29431580
Auto-generated-cl: translation import
2012-10-05 16:57:52 -07:00
Tadashi G. Takaoka 9778ac3fdd am d7345ed0: am d34422f1: am 3623b976: Fix detecting fast typing algorithm and parameter
* commit 'd7345ed0b532eaa2082adea6fb5e89f5fe0acb86':
  Fix detecting fast typing algorithm and parameter
2012-10-05 03:22:09 -07:00
Tadashi G. Takaoka 3623b9767b Fix detecting fast typing algorithm and parameter
Bug: 7032858
Change-Id: I5ed701e2394d16e43258a3c22d59991cb18adce8
2012-10-05 18:23:39 +09:00
Tadashi G. Takaoka ddf8b9e1ea am 24ebf7da: am b02fc3fc: am 4580b7e4: Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev
* commit '24ebf7da9853f2975bf1ae3e11c0cf1962236667':
  Move gesture detection and recognition paramters to resources
2012-10-04 22:54:16 -07:00
Tadashi G. Takaoka 4580b7e457 Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev 2012-10-04 22:42:18 -07:00
Tadashi G. Takaoka 80bcb99632 Move gesture detection and recognition paramters to resources
Bug: 7032858
Change-Id: I66570a5e21cdeede1eba420c597f440ab61aa941
2012-10-05 14:39:44 +09:00
Baligh Uddin 741d6eaf17 Import translations. DO NOT MERGE
Change-Id: I64e38d5f0be5a47923642af0bc0146765e094b77
Auto-generated-cl: translation import
2012-10-04 15:34:17 -07:00
Baligh Uddin 09fbd2ca50 Import translations. DO NOT MERGE
Change-Id: Idc0d44ee84d88674227a95bb5556a99a01eb3d30
Auto-generated-cl: translation import
2012-10-04 15:30:10 -07:00
Baligh Uddin cc298b652b Import translations. DO NOT MERGE
Change-Id: Ie375494233b9038d4ae2187d2bfe58b9a77036d2
Auto-generated-cl: translation import
2012-10-03 21:59:33 -07:00
Baligh Uddin a65a06913f Import translations. DO NOT MERGE
Change-Id: I7bbc24fdd81a547e25e66e07fd982fe949a19bcc
Auto-generated-cl: translation import
2012-10-03 21:56:12 -07:00
Baligh Uddin 555cc570d9 Merge "Import translations. DO NOT MERGE" 2012-10-03 10:18:22 -07:00
Baligh Uddin 01d9b1f17a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-03 10:17:21 -07:00
Jean Chalard 2bd719692c am 6821be7e: am b3dff914: am 5d11ec46: Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev
* commit '6821be7e06ec9bb4e9d9dfe62b75f52b369e1b74':
  Update the AOSP dictionaries for the 0-freq review
2012-10-03 06:04:10 -07:00
Jean Chalard a44942810d Update the AOSP dictionaries for the 0-freq review
Bug: 7227265
Change-Id: I384f7d76cef67b96b106ddac96e4baf1fa32afd4
2012-10-03 21:15:27 +09:00
Baligh Uddin 9c64c5342c Import translations. DO NOT MERGE
Change-Id: Ib35cdfadea03c46e9a71404e79b4a509526f4896
Auto-generated-cl: translation import
2012-10-02 17:14:45 -07:00
Baligh Uddin 7a24a242fd Import translations. DO NOT MERGE
Change-Id: I98e36c91c1678a0452b42c7afda6c3bc08b3b3e6
Auto-generated-cl: translation import
2012-10-02 17:11:15 -07:00
Tadashi G. Takaoka fe3fb2502d am 58e1be74: am de102ede: am 15281adb: Show gesture floating preview text by default
* commit '58e1be74a989637b0b71ebf990ed1b3c9a21e7af':
  Show gesture floating preview text by default
2012-10-01 23:41:38 -07:00
Tadashi G. Takaoka 15281adbc1 Show gesture floating preview text by default
Bug: 7244214
Change-Id: Ib4ab810ef50798828dd10c39a8077466165772e4
2012-10-01 21:23:00 -07:00
Baligh Uddin a8caa7f4d0 Import translations. DO NOT MERGE
Change-Id: I7516d2d74ab4f4c46dc39ec32cdeb44c97bba462
Auto-generated-cl: translation import
2012-10-01 16:17:19 -07:00
Baligh Uddin d80fd3058c Import translations. DO NOT MERGE
Change-Id: I8f8c7f722d6fe55146428305f0a12b5e1b1d8dce
Auto-generated-cl: translation import
2012-10-01 16:12:25 -07:00
Baligh Uddin 033010382c Merge "Import translations. DO NOT MERGE" 2012-10-01 10:33:00 -07:00
Tadashi G. Takaoka 7e3779e37a Add '+' sign to more keys of '-' key
Note that the tablet number/phone layout has its own '+' key.

Bug: 7255318
Change-Id: I5cc0431cf772a859eb456e9c36b07bfd0cc1278d
2012-10-01 14:55:55 +09:00
Baligh Uddin 8aef47d9b1 Import translations. DO NOT MERGE
Change-Id: I44aae7ccdfe1b4494ba70b80276c92e78fef9a6f
Auto-generated-cl: translation import
2012-09-28 13:19:23 -07:00
Baligh Uddin 1c2853f8f6 Import translations. DO NOT MERGE
Change-Id: I4ae7e56a20803cc9c3d5ba2d85db1ea63c943303
Auto-generated-cl: translation import
2012-09-28 13:15:05 -07:00
Tadashi G. Takaoka ad6b493c16 Merge "Remove dead code for disabling gesture input after fast typing" into jb-mr1-dev 2012-09-28 00:47:05 -07:00
Tadashi G. Takaoka bf538ab2c0 Remove dead code for disabling gesture input after fast typing
Bug: 7218902
Change-Id: Iccc1d4cf0dd3ac84b30c68e11eee9a6ad89f14c4
2012-09-28 16:15:51 +09:00
Baligh Uddin cf85160dee Import translations. DO NOT MERGE
Change-Id: I3748ecaecef1f07e1537831eb0f7c5503a460b56
Auto-generated-cl: translation import
2012-09-28 00:14:00 -07:00
Baligh Uddin a36c595353 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-27 10:03:23 -07:00
Tadashi G. Takaoka 1775201671 Calculate default touch position correction data for keys on 4th row
This change also disables touch position correction for Phone/Dvorak
keyboard.

Bug: 7243101
Change-Id: Idfcc7ad1feabbe6a81635dceba5be087401fa18b
2012-09-27 17:55:58 +09:00
Baligh Uddin 855c0097cd Import translations. DO NOT MERGE
Change-Id: Ia971fee8c85d6726840317326d07fd2d9f93b33f
Auto-generated-cl: translation import
2012-09-26 19:30:19 -07:00
Tadashi G. Takaoka 002a502c84 Merge "Update keyboard settings wording" into jb-mr1-dev 2012-09-25 22:56:49 -07:00
Tadashi G. Takaoka 9458e71c0c Update keyboard settings wording
Bug: 7129441
Change-Id: I1130b322126ad7c400845c1257a785ccbc7dff81
2012-09-26 11:09:15 +09:00
Baligh Uddin 270c0dec94 Import translations. DO NOT MERGE
Change-Id: I6047254f069176a832fd7919d8c6257008698740
Auto-generated-cl: translation import
2012-09-25 16:53:14 -07:00
Baligh Uddin 0d4d109621 Import translations. DO NOT MERGE
Change-Id: I1e46157047699a32560c484d0d3a4da0403b666f
Auto-generated-cl: translation import
2012-09-24 16:00:36 -07:00
Tadashi G. Takaoka 1e974deaa6 Merge "Disable gesture input while fast typing" into jb-mr1-dev 2012-09-23 21:19:55 -07:00
Tadashi G. Takaoka 9f09c6fbc8 Disable gesture input while fast typing
Bug: 7032858
Change-Id: I0f9f92c712dbe45f4ba0b3cf331fbe11426c1db4
2012-09-24 13:14:47 +09:00
Jean Chalard 24da43c93a Merge "Use all Lexiteria sources and update existing directories." into jb-mr1-dev 2012-09-23 20:18:56 -07:00
Tadashi G. Takaoka 8acb881a50 Add subtypeId to nl_BE
Bug: 6809603
Change-Id: I8010564cfdfeef5a0c4f7542b9451202ed966a53
2012-09-24 10:47:28 +09:00
Ken Wakasa 08d7f2f95a resolved conflicts for merge of b1fbd696 to jb-mr1-dev bug:6809603
Change-Id: I23dcf45892d94db88f424a4ee0ae440a2c743d9b
2012-09-22 01:50:33 +09:00
Baligh Uddin c613f1e7ab Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-21 09:11:49 -07:00
Jean Chalard d0cf96493c Use all Lexiteria sources and update existing directories.
New dictionaries :
- Danish
- Greek
- Finnish
- Lithuanian
- Latvian
- Dutch
- Polish
- Russian
- Slovene
- Serbian
- Swedish
- Turkish

Also, compress those files to reduce the footprint in the
repository.
Also, update and improve English and French dictionaries, and
add the ligatures shortcut into the French dictionary.
Finally, move the Russian binary dictionary here now that it
can at last be open sourced.

Bug: 5587752
Bug: 6775251
Bug: 6995793
Bug: 7149666
Change-Id: Iec9831d4dce425a2b5b0657571e4448436610525
2012-09-21 22:07:23 +09:00
Satoshi Kataoka 8ae8c76149 Cleanup settings
bug: 7200189

Change-Id: Ibfd9254670cde5f4b2b693cc9334ee2845bede59
2012-09-21 15:10:27 +09:00
Baligh Uddin 546133deda Import translations. DO NOT MERGE
Change-Id: Ifdd37dae4c4cbe095ed00288a7e3f95303318bdc
Auto-generated-cl: translation import
2012-09-20 18:17:39 -07:00
Tadashi G. Takaoka a0ac9cc447 Merge "Use normal font for Hindi keyboard" into jb-mr1-dev 2012-09-19 20:44:35 -07:00
Tadashi G. Takaoka bfcd2b3fc0 Merge "Change to "Show language switch key" option" into jb-mr1-dev 2012-09-19 19:56:59 -07:00
Tadashi G. Takaoka cce6f9ee1d Use normal font for Hindi keyboard
Bug: 6753168
Change-Id: I731a56bce70e1881e176392acfe977de28696063
2012-09-20 11:56:20 +09:00
Tadashi G. Takaoka 1a4aa7e307 Change to "Show language switch key" option
This change deprecates "Suppress language switch key".

Bug: 7037410
Change-Id: I1bc90877b4d2ee9364728959fd680dcb5b22ecbf
2012-09-20 11:33:40 +09:00
Tadashi G. Takaoka f1ee564897 Smaller gesture preview trail
Bug: 7195987
Change-Id: Ibcd4b7a00b4e89070c4dfad88bb39ac1f7e4bd9a
2012-09-20 10:47:54 +09:00
Brian Muramatsu 331a5e7d66 mako: adjust default keybpress vibration
Bug 7049944

mako's vibrator has been recalibrated so reduce this to 5.

Change-Id: Ia53df175f5389e5fd1dc198e4877c4a4e7301559
2012-09-19 14:40:30 -07:00
Tadashi G. Takaoka 4f8e451d0c Show gesture floating preview text is off by default
Bug: 7043127
Change-Id: Icabf080f43a5934fef3824919bb03229522d5e5a
2012-09-19 18:59:10 +09:00
Sam Segers 8336d33a6c nl-rBE keyboard layout
Add keyboardstyle for the Dutch part of Belium and make it AZERTY (the french keyboard).
This is the default layout in Belguim but in the Netherlands (nl) they use QUERTY.
Strings and spelling checker are the same.

Change-Id: Icb2b2712e6580c0e642d5f0f70f8950449d3bfd4
Signed-off-by: Sam Segers <sam.sgrs@gmail.com>
2012-09-19 06:19:11 +02:00
Jean Chalard 8d35b203ca Make the arrobase sign a space stripper.
Gestures offer much more opportunity to enter e-mail user names,
so this should now be the dominant use case for arrobase use. In
this use case, the arrobase sign should be a space stripper.

Bug: 7164981
Change-Id: I736ac56dab81cd2c97275ec80dbb0ec0bc159006
2012-09-14 17:31:46 +09:00
Tadashi G. Takaoka 71fcf0f5ec Assign subtypes' hashCode value as its subtypeId
Bug: 6752230
Change-Id: I311b840c890f4c6ff89c2808237d7e9b8baef21d
2012-09-13 16:56:59 +09:00
Tadashi G. Takaoka 82902e7671 Add boolean resource isDefault=true for all supported locales
Bug: 7115368
Change-Id: I390d52d10d6c7d1639f73255ace9985886ea2157
2012-09-13 15:56:35 +09:00
Tadashi G. Takaoka c54614d9f3 Cosmetic change to remove trailing space
Change-Id: If8c00c763f815d5eb97e18b19060c63d321ccd61
2012-09-13 15:21:54 +09:00
Tadashi G. Takaoka c1780c16a7 Revise gesture preview trail design
Bug: 7042741
Change-Id: I99e3b3a6fc52afaee3cc5daf371131c3afebb3ae
2012-09-06 20:09:12 +09:00
Tadashi G. Takaoka 15496ec4d7 Merge "Revise gesture floating preview design" into jb-mr1-dev 2012-09-05 20:35:40 -07:00
Tadashi G. Takaoka 71e2e8152f Revise gesture floating preview design
Bug: 7043127
Change-Id: Ibf9a6d57279263d9b60753e0eb734b658eeda9f2
2012-09-06 12:29:57 +09:00
Ken Wakasa aa7cc7beed Merge "Cosmetic cleanup" into jb-mr1-dev 2012-09-05 19:07:45 -07:00
Ken Wakasa d3a9b70307 Cosmetic cleanup
Change-Id: I5e95440019f58c606ac2e947c6e0cbd4d51f6522
2012-09-06 01:13:12 +09:00
Tadashi G. Takaoka e8c6d5a480 Utilize StateListDrawable for key preview background
Change-Id: I268550a185701caecefc27ebaec40fb2c940d883
2012-09-05 20:38:00 +09:00
Tadashi G. Takaoka 848331222e Use string-array resource to define predefined-subtypes
Bug: 6809603
Change-Id: Icafe4652ec17844838b28c04977deb88bcb9aa8f
2012-09-04 17:18:39 +09:00
Tadashi G. Takaoka 3f00c6151f Reduce amount of empty space in which keypresses are detected
Bug: 6942329
Change-Id: Ie92ccf43f307b8ceb9a311c30390d0cb2abf2cd7
2012-09-04 16:11:21 +09:00
Tadashi G. Takaoka eceea877bd Consolidate Esperanto layout into Spanish layout
This change also removes AsciiCapable extra value from Esperanto
subtype.

Change-Id: I0fa18ef7c52e4ba24b182e8ecb9788572660b704
2012-09-03 17:38:56 +09:00
Tadashi G. Takaoka ab5f9532db Use 5-row layout for Thai phone keybopard
Bug: 6911182
Change-Id: I78f59564e8c31b9b66ed9a136584d0c57cc43120
2012-09-03 14:15:48 +09:00
Tadashi G. Takaoka 8624a0a186 Use normal font for Thai
This change also adds workaround to display Thai composing letters
correctly.

Bug: 6753168
Change-Id: Ibd42ebb40df08b5de32b3500f10003c4a5de4897
2012-09-03 14:05:10 +09:00
Jean-Baptiste Queru 27c093fc5e am 70fb1d1a: am f0adce8a: Merge "Esperanto keyboard"
* commit '70fb1d1a690f3f16e4bbb19ffea349af1402cb1f':
  Esperanto keyboard
2012-08-31 07:08:55 -07:00
Tadashi G. Takaoka aa54607246 Merge "Support per-Key and per-Keyboard key visual attributes" into jb-mr1-dev 2012-08-31 04:24:48 -07:00
Tadashi G. Takaoka dc34da218a Support per-Key and per-Keyboard key visual attributes
This change refactors KeyDrawParams and KeyPreviewDrawParams to
separate KeyVisualAttributes.

Change-Id: I4de549eef303e1debe4b8f84668e042445fc18da
2012-08-31 20:23:21 +09:00
Tadashi G. Takaoka 67d0a597bc Merge "Use resource to specify 5-rows keyboard parameters" into jb-mr1-dev 2012-08-31 04:06:35 -07:00
Tadashi G. Takaoka 518838b778 Use resource to specify 5-rows keyboard parameters
Change-Id: I67b290c4600dee43a81ba975ffc93a32a6d060b4
2012-08-31 19:14:33 +09:00
Tadashi G. Takaoka 9d05f36b77 Use normal font for Arabic and Farsi
Bug: 6753168
Change-Id: Iaef85847cf9f6c432c6ca25e7e6ec522c084d073
2012-08-31 18:56:50 +09:00
Kurt Partridge 9bbc7ec052 Merge changes Ifb983c35,I0b947421 into jb-mr1-dev
* changes:
  ResearchLogger clean up splash screen
  ResearchLogger no longer offers option to disable logging
2012-08-30 22:56:53 -07:00
Kurt Partridge 25405eafb0 ResearchLogger clean up splash screen
- simpler text
- AlertDialog implementation
- declining users are redirected to regular IME

Bug: 6188932
Change-Id: Ifb983c3511125f8919f4a8b25aeee7de66dbb0cb
2012-08-30 22:52:00 -07:00
Tadashi G. Takaoka 71b52a84e2 Move key label padding attributes back to KeyboardView
This is a partially reverting change of I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394

Change-Id: Id213541cdddcc0761bf6418c8429a5f96c0281ef
2012-08-31 10:35:54 +09:00
Tadashi G. Takaoka 749cc18751 Move some key top visual attributes from KeyboardView to Key
Change-Id: I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394
2012-08-30 16:14:32 +09:00
Jacob Nordfalk 3ed057a058 Esperanto keyboard
Universal esperanto keyboard. Has letters for all latin scripts, as users
will often need to type something in both Esperanto and other languages
(for example their country's).

Signed-off-by: Jacob Nordfalk <jacob.nordfalk@gmail.com>
Change-Id: Ia8a739fa31a60e118d42ae9e8c62ddfd66e2ca35
2012-08-30 08:48:19 +02:00
Tadashi G. Takaoka 61bc66b324 Revert "Revert "Fix key letter size of 5-rows Thai keyboard""
This reverts commit 7a5ca9982f.
Depends: Ia4fa5046b3106e2710b9d5df1a6cc5f2cf995ec7

Change-Id: I0b9d0125380efe898943dc26ae884378145c44a3
2012-08-30 11:30:13 +09:00
Jason Chen 85cb45c80f Merge "Add defaults for manta" into jb-mr1-dev 2012-08-29 15:40:41 -07:00
Jason Chen 3b54385d61 Add defaults for manta
Change-Id: I8784a126b02e3e6618ac845a32a894ceb58ea39e
2012-08-29 09:10:26 -07:00
Ken Wakasa 7a5ca9982f Revert "Fix key letter size of 5-rows Thai keyboard"
This reverts commit ac621d1527

Change-Id: I17b1d17c773c2fe89c0cdef2c423c8ccd1d2c9c8
2012-08-29 04:32:24 -07:00
Tadashi G. Takaoka ac621d1527 Fix key letter size of 5-rows Thai keyboard
The key text size can be specified in each keyboard layout in addition
to by KeyboardView theme.

Bug: 6473915
Change-Id: Icd2d436fa1d8fc7bd1deb9e4b799d4f624376fb2
2012-08-29 19:04:49 +09:00
Tadashi G. Takaoka d20652c878 Use non-bold text for Arabic and Thai keyboard
The key text style can be specified in each keyboard layout in
addition to by KeyboardView theme.

Bug: 6753168
Change-Id: I4b5abda9322600eb8c6421f20ceef136ef103c05
2012-08-29 17:33:44 +09:00
Charles Chen 78527e4dbb Merge "Adjust accessibility edge slop." into jb-mr1-dev 2012-08-28 10:28:55 -07:00
Tadashi G. Takaoka 9fa0736d6a Consolidate KeyboardView.keyLetterSize and keyLetterRatio
This change also consolidates keyboardView.keyLabelSize and
keyLabelRatio.

Change-Id: I4a45bcb6e7fc104ae4a9ae3ecdae9842d813840e
2012-08-28 16:04:59 +09:00
Tadashi G. Takaoka ef2bfad590 Use TypedArray.getFraction to read percentile values in resource
Change-Id: Ifc8b024d190efba4cd536fd639621e841eb9970e
2012-08-28 15:18:40 +09:00
alanv e76a9b36ca Adjust accessibility edge slop.
Bug: 6969558
Change-Id: Ie33f444e085e5c01326bdf9396eabee5c04ee81e
2012-08-27 18:05:21 -07:00
Tadashi G. Takaoka 1c2f332239 Optimize gesture preview trail drawing a bit
This change also change the fading out duration of the gesture
preview trail to 800msec from 1,000msec

Change-Id: Icfd5b1ecad66db4f978249486f5fe362a3ae9640
2012-08-27 14:43:39 +09:00
Brian Muramatsu 43da9ce041 Add mako keypress vibration and volume settings
This prevents -1 and -1000 from appearing as the defaults in
Advanced Settings.

Change-Id: I42938782077a0a3dfb5ec2125c0266b6712bcf63
2012-08-24 18:08:05 -07:00
Tadashi G. Takaoka 333a300586 Add multiple gesture preview trails animation
Change-Id: I533e6de9b138317472565be82c8ba5e422472888
2012-08-24 17:04:20 +09:00
Kurt Partridge b5ace11a2e ResearchLogging upload via service
Upload using an intent service rather than just a thread.  More robust in case the keyboard
is closed and the upload hasn't finished yet.

multi-project commit with Id515c2b1b0d6f85be50f92a661a2d32ebaeaa143

Bug: 6188932
Change-Id: I64a9fab92ff89ee09df877db4e5f7f0ec0ffb3b6
2012-08-22 11:27:46 -07:00
Kurt Partridge bf653996ea ResearchLogging capture full n-gram data
- Captures complete motion data for all words in an n-gram.
- Also filters n-grams properly; if any word in the n-gram is not
  in the dictionary, it is not included.
- Simplify ResearchLog to not require explicit state
- Added LogBuffer class MainLogBuffer class to allow n-gram-level decisions
  about privacy.
- Moved LogUnit out from ResearchLogger

multi-project change with Ic70ccb6c2e11eb02d887821434b44daa3eb7a3e2

Bug: 6188932
Change-Id: I731d6cff6539e997874f723b68bdb0d9b651b937
2012-08-21 22:37:33 -07:00
Baligh Uddin c8d7a68503 Import translations. DO NOT MERGE
Change-Id: Id2d245dd2623e5a23871d389aa600b367cbbfe77
Auto-generated-cl: translation import
2012-08-21 12:28:51 -07:00
Kurt Partridge adb591e75b Merge "Revert "ResearchLogging capture full n-gram data"" into jb-mr1-dev 2012-08-20 10:18:30 -07:00
Kurt Partridge f1c3e53b23 Merge "Revert "ResearchLogging upload via service"" into jb-mr1-dev 2012-08-20 10:18:10 -07:00
Kurt Partridge 3d35908749 Revert "ResearchLogging capture full n-gram data"
This reverts commit 221e756fd7

Change-Id: Iefc4e4e27ddc925d4a4634627b0467bd4ee2a66e
2012-08-20 10:17:40 -07:00
Kurt Partridge 96da633582 Revert "ResearchLogging upload via service"
This reverts commit baf1f0bd61

Change-Id: I7d959b9b626c8fb69a57788e243752952258fa80
2012-08-20 10:17:29 -07:00
Kurt Partridge 8beeef5d3f Merge changes Ie980d38a,Ia7ee65e7 into jb-mr1-dev
* changes:
  ResearchLogging upload via service
  ResearchLogging log when preferences change
2012-08-20 08:48:12 -07:00