Commit graph

6884 commits

Author SHA1 Message Date
Satoshi Kataoka
b35aa487fd Merge "Make aggressive threshold really aggressive" 2013-04-24 09:14:30 +00:00
Satoshi Kataoka
70f2762e28 Make aggressive threshold really aggressive
Bug: 8701480
Change-Id: If8242cfe61f3e56712fd6e25e36858cff7f0d177
2013-04-24 17:49:56 +09:00
Tadashi G. Takaoka
0e96003e0f Merge "Refactor SetupStepGroup" 2013-04-24 05:53:33 +00:00
Tadashi G. Takaoka
e918bf07a0 Refactor SetupStepGroup
Bug: 8159728
Change-Id: I1ab846d0910aacbd2f979289d72bafea8a8e0378
2013-04-24 14:15:59 +09:00
Tadashi G. Takaoka
3ee39be1bd Merge "Add setup wizard indicator size resource" 2013-04-24 04:01:04 +00:00
Tadashi G. Takaoka
81b4661f96 Add setup wizard indicator size resource
This is a follow up of Ie8e058bc3c.

Bug: 8159728
Change-Id: I171fc99374789e69c15506c37970e6fcafbcb1e2
2013-04-24 12:56:39 +09:00
Jean Chalard
197a2d32e1 Merge "[PB1] Cleanup" 2013-04-24 02:17:23 +00:00
Jean Chalard
41f505dc3e [PB1] Cleanup
This preference is not a DialogPreference any more, as it doesn't
ever display a Dialog.

Bug: 7600384
Change-Id: Ia5965617c83d3cb964010f9b40d833065dccef60
2013-04-23 20:41:41 +09:00
Tadashi G. Takaoka
9a289c08f2 Merge "Use resources for dimensions of setup wizard" 2013-04-23 08:22:28 +00:00
Tadashi G. Takaoka
586578b730 Merge "Disable shadow of gesture trail" 2013-04-23 08:21:53 +00:00
Tadashi G. Takaoka
2deb898582 Disable shadow of gesture trail
Cherry-picked from JB-MR2 I908c22d362.

Bug: 8689880
Change-Id: Ie759c5d63056509e3ca61d9fb6823ab04ddf41ed
2013-04-23 17:20:21 +09:00
Tadashi G. Takaoka
0bff16155a Use resources for dimensions of setup wizard
This is a ground work to fit the setup wizard to smaller phones and
larger tablets.

Bug: 8159728
Change-Id: Ie8e058bc3cba30cac3b31eb5a3ce975f2ee311d9
2013-04-23 17:18:34 +09:00
Tadashi G. Takaoka
4b7e0c5ac2 Merge "Remove wording "wizard" from setup application" 2013-04-23 07:57:18 +00:00
Tadashi G. Takaoka
864aeb1f50 Remove wording "wizard" from setup application
Bug: 8676811
Bug: 8662102
Change-Id: Ie234d8871651344b6815ae68c8b1f0663a9f6c79
2013-04-23 16:44:42 +09:00
Tadashi G. Takaoka
480284e28a Merge "Add edit personal dictionary settings menu" 2013-04-23 06:01:45 +00:00
Jean Chalard
c3f4783649 Add an additional ID to the client info.
Bug: 8651863
Change-Id: I748f35726d72ede926d5b06ed87ff029317f1ac3
2013-04-23 14:37:15 +09:00
Baligh Uddin
f595a0626d Import translations. DO NOT MERGE
Change-Id: Ib14aef97ea78806e1560fbd3d3e1f40f01bf8c0a
Auto-generated-cl: translation import
2013-04-22 14:13:10 -07:00
Satoshi Kataoka
9b4e3db1af Legal notice
Bug: 8533258
Change-Id: I00e4916f86f29dd476c51a65e8fa5a6c136fd179
2013-04-22 21:55:53 +09:00
Tadashi G. Takaoka
4f2535398a Add edit personal dictionary settings menu
Bug: 8600958
Change-Id: I303adfbe25a56cc9b5ee9f3b5169a5bca0ad6c4a
2013-04-22 19:59:12 +09:00
Tadashi G. Takaoka
1a9bf159a4 Merge "Don't triger onPress and startLongPressTimer when gesture is canceled" 2013-04-22 10:53:39 +00:00
Tadashi G. Takaoka
508ab24875 Merge "Implement IMM.switchToNextInputMethod() for ICS" 2013-04-22 10:37:11 +00:00
Tadashi G. Takaoka
13d5da8b88 Don't triger onPress and startLongPressTimer when gesture is canceled
Bug: 8650846
Change-Id: Ice5ef07d6833422906b0b756206e097f75d1f2db
2013-04-22 19:36:08 +09:00
Tadashi G. Takaoka
85629debaa Implement IMM.switchToNextInputMethod() for ICS
Bug: 8633367
Change-Id: Ifc0f97b1fdf5e5cc3601c24a503058c4822478dc
2013-04-22 19:30:56 +09:00
Jean Chalard
6d25be9ac5 Merge "Don't kill suggestions with native score < 1" 2013-04-22 08:13:13 +00:00
Jean Chalard
f0e579a171 Don't kill suggestions with native score < 1
Change-Id: I954856b7fec0b91e19a467f2a87978d49caa639d
2013-04-22 14:21:43 +09:00
Tadashi G. Takaoka
0f07935e51 Centering setup wizard welcome video
Bug: 8159728
Change-Id: Ia016c41dc39b87740ff57efe0e2fadd61f0da129
2013-04-22 12:23:32 +09:00
Ken Wakasa
2a9b5447fa am a56c7020: am d4ab58a0: Add translatable="false" for appropriate entries
* commit 'a56c702088055823bd755d2aafe13965b12785ed':
  Add translatable="false" for appropriate entries
2013-04-19 10:11:40 -07:00
Ken Wakasa
a56c702088 am d4ab58a0: Add translatable="false" for appropriate entries
* commit 'd4ab58a0f7bdf5aee51947607e1b17998912285c':
  Add translatable="false" for appropriate entries
2013-04-19 10:09:50 -07:00
Kurt Partridge
41b34cf2ae Merge "Allow LogUnits to hold >1 word" 2013-04-19 16:04:13 +00:00
Kurt Partridge
e92b5e145f Allow LogUnits to hold >1 word
LogUnits have been annotated with the autocorrected words, but
until now this was assumed to be a single word without spaces.
But spaceless typing can result in spaces in the LogUnit label.  With this
change, the LogUnit inspects the autocorrected text to determine how many
words were inserted, and counts them accurately.

This change corrects a privacy problem, which was that if the word sampling
algorithm chose a LogUnit that actually contained multiple words, then more
than two successive words would be included in the log.

Change-Id: I7c01c3dd3ac33d7e96c00836256bae9c14b124ed
2013-04-19 08:55:39 -07:00
Jean Chalard
825da76c72 Redisplay a hidden button after it entered the screen again.
Bug: 7600384
Change-Id: I6cd18fd7584b6e98260cb432956f08ba9886580b
2013-04-19 22:50:48 +09:00
Jean Chalard
f8014eea34 Hide the correct button when pressing a new button.
Bug: 7600384
Change-Id: Ic5dbbbbcf19d778dde1316ebb417f1a8ede2d25d
2013-04-19 22:50:45 +09:00
Tadashi G. Takaoka
b8ff89c809 Remove translatable="false" from setup wizard strings
Change-Id: Ie2f53910ce91f8c288e83c4ea15dc51aafd4c6a2
2013-04-19 21:07:17 +09:00
Tadashi G. Takaoka
42afa82d54 Support landscape orientation for setup wizard
Bug: 8159728
Change-Id: Ic0f73a7ebfea6e5e98aa320eb1ebc2a677271665
2013-04-19 20:53:40 +09:00
Tadashi G. Takaoka
68e4de1e78 Add welcome screen to setup wizard
This is a preliminary implementation because the welcome screen video
is just a placeholder.

Bug: 8159728
Change-Id: I6a2459a266babec2f078fc393b18c77b0b7992a8
2013-04-19 20:49:49 +09:00
Tadashi G. Takaoka
fcefabf9ab Groundwork to implement landscape and welcome screen
Bug: 8159728
Change-Id: I05ff6578980ec2e210ebb482ea51b1600e74a4f4
2013-04-19 20:10:59 +09:00
Tadashi G. Takaoka
16ec2e1155 Merge "Add finish action to setup wizard" 2013-04-19 10:58:55 +00:00
Tadashi G. Takaoka
192743a6ae Add finish action to setup wizard
Bug: 8159728
Change-Id: I1578fc31875a1edbfea213fb5e1a1b464d02e941
2013-04-19 19:44:54 +09:00
Ken Wakasa
d4ab58a0f7 Add translatable="false" for appropriate entries
bug: 8662567
Change-Id: I1ac9b4b8834f3b0ea537ad3142fa533dea10f23e
2013-04-19 19:37:59 +09:00
Jean Chalard
ff078041e7 am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev
* commit 'f1dde6a1bf659d182db5a2645515cc1efe74459c':
  Fix an NPE in recorrection
2013-04-19 00:10:22 -07:00
Jean Chalard
f1dde6a1bf am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev
* commit '758c74fe82683aef08d93a935433c027a7bc21a7':
  Fix an NPE in recorrection
2013-04-19 00:07:37 -07:00
Jean Chalard
e5cbdfe1b8 am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev
* commit '3629605b7c14b5eea498ef9588f4fef788ef454c':
  Fix an NPE in recapitalize
2013-04-19 00:06:58 -07:00
Jean Chalard
3629605b7c am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev
* commit '77226ed006ba32228cd5db19031e04d13d87b27e':
  Fix an NPE in recapitalize
2013-04-19 00:04:13 -07:00
Jean Chalard
758c74fe82 Merge "Fix an NPE in recorrection" into jb-mr2-dev 2013-04-19 07:03:19 +00:00
Jean Chalard
77226ed006 Merge "Fix an NPE in recapitalize" into jb-mr2-dev 2013-04-19 07:01:10 +00:00
Jean Chalard
ae7d1530b4 Fix an NPE in recorrection
Also, theoretically, we don't want to retrieve older suggestions if
there are no results for a recorrection - that would look random.
This bug addresses this too.

Bug: 8657919
Change-Id: I44f36d34a708a968ab71fa0592da57f4c97d4b7f
2013-04-19 15:53:33 +09:00
Jean Chalard
3bdf341ea0 Fix an NPE in recapitalize
Bug: 8657736
Change-Id: I459d1c200826c1c394f8207475ecf60a4f356793
2013-04-19 15:44:20 +09:00
Tadashi G. Takaoka
f10046bddc Remove ScrollView from setup wizard
Change-Id: I85f089301d1be8ed789a20049d21e2c371cad1c5
2013-04-19 12:45:47 +09:00
Tadashi G. Takaoka
30f102e297 Move some attributes of setup wizard layouts to style files
Change-Id: I7b5999253c959531212ee27ac1ddfe39de280e2c
2013-04-19 12:43:40 +09:00
Tadashi G. Takaoka
1f6e06cf92 Merge "Make setup wizard step number highlighted when activated" 2013-04-19 03:21:04 +00:00
Tadashi G. Takaoka
88ee052c10 Merge "Update strings of setup wizard" 2013-04-19 03:16:46 +00:00
Tadashi G. Takaoka
411fd9bd02 Update strings of setup wizard
Bug: 8159728
Change-Id: I34ef461410f4ebd4a3869c3614318581d48fdef5
2013-04-19 11:16:06 +09:00
Tadashi G. Takaoka
b84c0468e4 Make setup wizard step number highlighted when activated
Bug: 8159728
Change-Id: I62ccbebaae0a0c4a93ad7c155fc3020a7f357f3c
2013-04-19 11:14:21 +09:00
Baligh Uddin
04211b9112 am dcc59297: am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit 'dcc59297ac97c2ae7791ab09c535927c93c607fb':
  Import translations. DO NOT MERGE
2013-04-18 09:46:34 -07:00
Baligh Uddin
dcc59297ac am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '1844bec2024859f1c8dbc331893a74d5af9152d8':
  Import translations. DO NOT MERGE
2013-04-18 09:42:23 -07:00
Baligh Uddin
1844bec202 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-18 16:39:35 +00:00
Ken Wakasa
f02e269312 am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev
* commit '55b306c9e0ea29a10dfd79d5478344fcc98ca184':
  Fix an infinite loop
2013-04-18 09:32:04 -07:00
Ken Wakasa
55b306c9e0 am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev
* commit '64eda4f4fa30fc60daeb5a8af462e688d4573700':
  Fix an infinite loop
2013-04-18 09:28:10 -07:00
Jean Chalard
3a18ae70cc am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView
* commit 'a5d2da82a6a4486a4ef74e51ddd1c875f4c2d935':
  Initialize dictionaries at onStartInputView
2013-04-18 09:27:35 -07:00
Jean Chalard
a5d2da82a6 am d91268ad: Initialize dictionaries at onStartInputView
* commit 'd91268ad9fb69b4733044b4e466e1d33f6c4725f':
  Initialize dictionaries at onStartInputView
2013-04-18 09:24:45 -07:00
Ken Wakasa
64eda4f4fa Merge "Fix an infinite loop" into jb-mr2-dev 2013-04-18 16:24:01 +00:00
Jean Chalard
77e26e1c29 Fix an infinite loop
What do you mean "Can't happen"?
It happens all the time - the empty string is the default ID, and it
needs to be updated like everyone else.

Bug: 8651858
Change-Id: I5a2f2ebb5b2ef08b27f26be8fb2c3d2f231ebcfc
2013-04-18 23:14:13 +09:00
Jean Chalard
9cf468646f Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1366021966 <=> 1366272052
Body :
Added: yt 0

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1366021978 <=> 1366272093
Body :
Added: yt 0

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1366021987 <=> 1366272977
Body :
Added: yt 0

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1366003217 <=> 1366272255
Body :
Freq changed: cash 80 -> 20

>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1366003693 <=> 1366277083
Body :
Deleted: толщ 76

>>> java/res/raw/main_en.dict
Header :
  date : 1366021987 <=> 1366272977
Body :
Added: yt 0

>>> java/res/raw/main_fr.dict
Header :
  date : 1366003217 <=> 1366272255
Body :
Freq changed: cash 80 -> 20

>>> java/res/raw/main_ru.dict
Header :
  date : 1366003693 <=> 1366277083
Body :
Deleted: толщ 76

Bug: 8635822
Change-Id: I44dc73bd010b125c994387894847a008276d69f7
2013-04-18 18:41:19 +09:00
Tadashi G. Takaoka
0b2d184a42 Merge "Update setup wizard icons" 2013-04-18 06:56:24 +00:00
Jean Chalard
d91268ad9f Initialize dictionaries at onStartInputView
Bug: 8344402
Change-Id: I41b8440f0d72a66fde3f6feb0db8239c9bb10ea3
2013-04-18 14:48:42 +09:00
Kurt Partridge
56f35a10cd Merge "Fix bug in counting words between samples" 2013-04-18 04:23:29 +00:00
Tadashi G. Takaoka
d794f5ae2a Update setup wizard icons
Bug: 8159728
Change-Id: Ia5a14a35292b43dc1eaa2d4edd65134040355149
2013-04-18 13:15:53 +09:00
Baligh Uddin
c2e36a8fc2 am 97aa9c40: am a5506b53: am bfedad23: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '97aa9c4059c41395b6ad550a3e8dfb4a7b66a83b':
2013-04-17 19:50:51 -07:00
Tadashi G. Takaoka
93c31e176f am 530fd15e: Fix bug to update last interpolated index of GestureStroke
* commit '530fd15eff8bd8df1c4c87cfeab379b5328748c1':
  Fix bug to update last interpolated index of GestureStroke
2013-04-17 19:47:39 -07:00
Jean Chalard
38d52c0aca am a694c9ba: am ff766f8c: Merge "Don\'t insert automatic spaces when text looks like a URL"
* commit 'a694c9ba08895dbfadd703acb731a383edad8c9f':
  Don't insert automatic spaces when text looks like a URL
2013-04-17 19:47:35 -07:00
Tadashi G. Takaoka
38046a0a4e am 7abeccfa: am 1711f986: Merge "Add shadow to gesture preview trail"
* commit '7abeccfa2753806086c083b3ba7b5b96c40b387a':
  Add shadow to gesture preview trail
2013-04-17 19:47:34 -07:00
Jean Chalard
7f8e55ec80 am c6c17b93: am 962c9f05: Merge "Small cleanup"
* commit 'c6c17b933270d994caa127ba9ca96ecf35898a88':
  Small cleanup
2013-04-17 19:47:31 -07:00
Jean Chalard
ca796e2d45 am aa6924e9: am 78d65873: Merge "Don\'t recapitalize on shift while on symbol layout"
* commit 'aa6924e9b2094ae64c8cecf6b5b5c14c0f6fb54a':
  Don't recapitalize on shift while on symbol layout
2013-04-17 19:47:30 -07:00
Jean Chalard
074fee655b am cca43825: am 8094bf45: Match the keyboard state to the recapitalize state.
* commit 'cca43825157d869b22c7d501d793dd5ed3d61562':
  Match the keyboard state to the recapitalize state.
2013-04-17 19:47:28 -07:00
Jean Chalard
fe48f31e56 am ced547f7: am e259b9f5: Merge "Clean up RecapitalizeStatus"
* commit 'ced547f74156a3482698037bdfaa82ac78b01a91':
  Clean up RecapitalizeStatus
2013-04-17 19:47:27 -07:00
Jean Chalard
57ac9afcc8 am 8e5c6d70: am fd15686a: Merge "Fix an NPE"
* commit '8e5c6d709052ba13a4c1ebc08def8d563e7b149c':
  Fix an NPE
2013-04-17 19:47:26 -07:00
Jean Chalard
5557bf5ba7 am 10800d4b: am a024ac6b: Merge "Fix an NPE"
* commit '10800d4bce94b5735b94b056c60f9e61a7d57471':
  Fix an NPE
2013-04-17 19:47:25 -07:00
Jean Chalard
892f1b46d5 am 63e442cf: am 5fca38c5: Merge "Small performance improvement / minor bugfix"
* commit '63e442cf6b50f4a60c07a24f45a1db978d9f63f9':
  Small performance improvement / minor bugfix
2013-04-17 19:47:20 -07:00
Ken Wakasa
441fbbaf1d am 9a0e877c: am e3aa7f10: Adjust CHAR_LIMITs
* commit '9a0e877cfbdeabee64949b28db274093d0d5a9de':
  Adjust CHAR_LIMITs
2013-04-17 19:47:18 -07:00
Jean Chalard
203af810b1 am 8e643e32: am b76ce125: Merge "Remove a useless function"
* commit '8e643e32e6f07a218323d9a67091c3beed2f88a2':
  Remove a useless function
2013-04-17 19:47:17 -07:00
Jean Chalard
0376d9a0d6 am 647f629a: am a5a2f3e3: Remove gesture suggestions with an INT_MIN score
* commit '647f629a5a22f9d09c17b5667cc83e9c138edc0f':
  Remove gesture suggestions with an INT_MIN score
2013-04-17 19:47:16 -07:00
Jean Chalard
5e5bd3b6e6 am dea5e6a3: am 03395833: Merge "Have Latin IME re-capitalize a selected string"
* commit 'dea5e6a3011a68aa2c101480b0521498eea7da87':
  Have Latin IME re-capitalize a selected string
2013-04-17 19:47:15 -07:00
Jean Chalard
d69892fc82 am 12bf5a05: am e99daea0: Update dictionaries
* commit '12bf5a0546e64e4265e1271b6c78b51e67a990f5':
  Update dictionaries
2013-04-17 19:47:14 -07:00
Jean Chalard
2532265d6a am 34676d92: am a022c538: Merge "If there are no suggestion span, recompute suggestions."
* commit '34676d92cc08c5575995a36cef1df9c50c1facca':
  If there are no suggestion span, recompute suggestions.
2013-04-17 19:47:12 -07:00
Jean Chalard
ae73133188 am be0e013b: am 059e084e: Merge "Reject a previously user-refused suggestion."
* commit 'be0e013be879aec19197a9e1b0a1d2631a8d4c79':
  Reject a previously user-refused suggestion.
2013-04-17 19:47:10 -07:00
Tadashi G. Takaoka
577dc18906 am 1a42236a: am 4b6756db: Merge "Remove unnecessary harmful finish() from SettingsActivity"
* commit '1a42236a8b22e0d3ca6f26704f052b8f83c991c5':
  Remove unnecessary harmful finish() from SettingsActivity
2013-04-17 19:47:08 -07:00
Jean Chalard
18c362d700 am 5f6492c5: am 673ebb4e: Merge "Update dictionaries"
* commit '5f6492c584699fea5c5793f11b71df4b394c31c9':
  Update dictionaries
2013-04-17 19:47:07 -07:00
Tadashi G. Takaoka
9797dd2edc am 2fd4a00b: am 1ec4c07a: Merge "Ignore modifier key while sliding key input"
* commit '2fd4a00bea92a6b54cc21999c8f147e1baed1393':
  Ignore modifier key while sliding key input
2013-04-17 19:47:05 -07:00
Tadashi G. Takaoka
333bb7dbbd am eabb710b: am f224941c: Merge "Suppress calling onPressKey and onReleaseKey while detecting gesture"
* commit 'eabb710b60c50b58a105bf9cbb6c7987ccdae6ee':
  Suppress calling onPressKey and onReleaseKey while detecting gesture
2013-04-17 19:47:04 -07:00
Tadashi G. Takaoka
ed497d2423 am 089f1ce9: am bfb07ed7: Merge "Add preference dependency to gesture input related options"
* commit '089f1ce95467e279c1d0b9f53de603af6a685bc4':
  Add preference dependency to gesture input related options
2013-04-17 19:47:03 -07:00
Tadashi G. Takaoka
b8540f8ee5 am 18414333: am e2af9b7e: Merge "Reset vertical correction when more suggestions are in modal mode"
* commit '18414333d41ce877fb4a7aba76804cea2a8c89e3':
  Reset vertical correction when more suggestions are in modal mode
2013-04-17 19:47:00 -07:00
Jean Chalard
ba5e450e40 am 69ffa8b0: am 03d1dff3: Merge "Fix Binary dict tests"
* commit '69ffa8b0ff646591edcc1eb3a6dc28572cf8e033':
  Fix Binary dict tests
2013-04-17 19:46:57 -07:00
Kurt Partridge
de51abf1cf am bfe5c07f: am ededdc6a: Merge "Avoid NPE"
* commit 'bfe5c07fda3d24589b1ad16d41c0dafd6651d0ee':
  Avoid NPE
2013-04-17 19:41:24 -07:00
Jean Chalard
38011d295c am 41e59b62: am 2cd1136b: Merge "Remove the dialog to insert words to the dictionary."
* commit '41e59b6202555ab3f778e1a251147ce943b7e864':
  Remove the dialog to insert words to the dictionary.
2013-04-17 19:41:21 -07:00
Jean Chalard
7b81296f81 am cb633e37: am 91bcf5eb: Merge "Restart suggestions when the cursor moves."
* commit 'cb633e37794adf59dd6ce1df97e3d5db02da6784':
  Restart suggestions when the cursor moves.
2013-04-17 19:41:20 -07:00
Jean Chalard
fda69c4439 am 991b1ef8: am 02ce3dc2: Fix a bug with bad application completions
* commit '991b1ef83e8f92c29ddec6685d91c24f1875eeba':
  Fix a bug with bad application completions
2013-04-17 19:41:18 -07:00
Jean Chalard
5351510dea am 68b392cc: am d24f9397: Merge "Make shortcut-only user dict entry non-words."
* commit '68b392cc1208036df06ca2c94176b2bc3b5a690d':
  Make shortcut-only user dict entry non-words.
2013-04-17 19:41:17 -07:00
Jean Chalard
9129081070 am 907a95c2: am fb5869e9: Merge "Add a class to encapsulate getting the metadata URI"
* commit '907a95c2f1f24b73736118ada0900228ad356734':
  Add a class to encapsulate getting the metadata URI
2013-04-17 19:41:16 -07:00
Jean Chalard
5875362b70 am 9613be01: am d0623ad7: Merge "Move some values to a place where they are easier to override"
* commit '9613be01de32ca276104c8c69b44c764d9e66a45':
  Move some values to a place where they are easier to override
2013-04-17 19:41:12 -07:00
Kurt Partridge
a5613e634a am bdce031e: am 2927223e: Merge "Better isolate ResearchLogging data"
* commit 'bdce031e00876df72e10b5c4e9c0ae9ff03153d1':
  Better isolate ResearchLogging data
2013-04-17 19:41:10 -07:00