Commit graph

1939 commits

Author SHA1 Message Date
Tadashi G. Takaoka
f9aa99c1c9 Disable touch position correction of MoreKeysKeyboard
Change-Id: Ieec33894a348602fd71d6fe473142b43eb2551b6
2012-10-09 19:20:28 +09:00
Tadashi G. Takaoka
7a17c1fcb5 Tuning gesture detection parameters
Bug: 7032858
Change-Id: Ie4f952aa33b99ce16027500a596d723ee9bafae9
2012-10-09 19:06:10 +09:00
Baligh Uddin
90c52f3121 Merge "Import translations. DO NOT MERGE" 2012-10-08 09:19:13 -07:00
Baligh Uddin
2e3f261df8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 09:17:44 -07:00
Tadashi G. Takaoka
3efe5f386f am bb249cb9: am b1583b9e: am 052b162d: Merge "Add separate key hysteresis distance for sliding modifier input" into jb-mr1-dev
* commit 'bb249cb992941ea0f3b6b962232ead147011865a':
  Add separate key hysteresis distance for sliding modifier input
2012-10-07 09:09:59 -07:00
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
Kurt Partridge
752c53760c Merge changes I568c90d4,I4667f8f6 into jb-mr1-dev
* changes:
  ResearchLogging capture full n-gram data
  ResearchLogger to track simple statistics
2012-08-20 08:47:45 -07:00
Jean Chalard
5d9e573fbf Remove the whitelist resources
Bug: 6906525
Change-Id: I1524b9e4c56d28a701d444aa2afbfdcecf0da571
2012-08-20 14:25:14 +09:00
Kurt Partridge
baf1f0bd61 ResearchLogging upload via service
DO NOT MERGE

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 I40db74fb780e01364609339764e150f0291d3f9b

Bug: 6188932
Change-Id: Ie980d38a713d15c01083d41bd73f0602ec75dd16
2012-08-17 21:44:08 -07:00
Kurt Partridge
221e756fd7 ResearchLogging capture full n-gram data
DO NOT MERGE

- 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 Ie2bc79fd7fe6b951b24771e94b8d4ca21989af65

Bug: 6188932
Change-Id: I568c90d4af07e7c759c1e7fc64b716bd8c7b4ae5
2012-08-17 21:44:07 -07:00
Baligh Uddin
a07590a81c Import translations. DO NOT MERGE
Change-Id: I5d02e55780596d25356a602027f3c41913057810
Auto-generated-cl: translation import
2012-08-16 15:17:17 -07:00
Baligh Uddin
0aeb4c206c Import translations. DO NOT MERGE
Change-Id: I36bb28cfdf548a38bfdd3127ddafa6c7d938376e
Auto-generated-cl: translation import
2012-08-13 14:05:29 -07:00
Baligh Uddin
9b6b279807 Import translations. DO NOT MERGE
Change-Id: I22eacc83a5aaa0f4e50e02e84ebf2b176dd08fe6
Auto-generated-cl: translation import
2012-08-10 11:50:11 -07:00
Baligh Uddin
7bf5415bfe Import translations. DO NOT MERGE
Change-Id: I48e2fcef3c0384fb745f6329b8877a8c1a1cd815
Auto-generated-cl: translation import
2012-08-07 15:05:45 -07:00
Tadashi G. Takaoka
27e48447a4 Lingering gesture floating preview text a bit
Bug: 6936095
Change-Id: I873343e9aa6afdf6bdb223795f03232509b012a7
2012-08-07 13:54:42 +09:00
Baligh Uddin
2a0975be66 Import translations. DO NOT MERGE
Change-Id: I8cb76298b75155a9d2d4726127759ad9542a93fc
Auto-generated-cl: translation import
2012-08-06 13:35:01 -07:00
Ying Wang
3d5a0b90f8 Import translations. DO NOT MERGE
Change-Id: I9510061c7ae1f4020cd5c5d24ed75348556ee085
Auto-generated-cl: translation import
2012-08-03 14:25:41 -07:00
Jean Chalard
beccb6e573 Update French and Italian separators.
French and Italian separators used to be decided this way
because of how the old dictionaries were made.
However, the new dictionaries actually do include the
composite words, and in both French and Italian, apostrophes
and dashes shouldn't be treated as separators any more.

Change-Id: If11c42625c819e223502a76749dbe797163d3c18
2012-08-04 00:04:13 +09:00
Ying Wang
2ca0f26237 Import translations. DO NOT MERGE
Change-Id: Ifdbe0c41f5e01c4afc155ea68c05d50d483e5749
Auto-generated-cl: translation import
2012-08-01 14:58:52 -07:00
Tadashi G. Takaoka
f6235167b7 Add language switch key to 10" tablet
Bug: 6637175
Change-Id: Ife9c9a6d35bd3cb4de406b388c504846b35059e7
2012-07-31 16:40:30 +09:00
Tadashi G. Takaoka
b98b957424 Fix east slavic keyboard layouts
This change affects Ukrainian, Belarusian, Kyrgyz, and Russian
keyboard. The followings are the layout changes for each language
respectively.

[Ukrainian]
 * Replace useless CYRILLIC LETTER E with CYRILLIC LETTER UKRAINIAN IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER YI
   on 10-inch tablet.
 * Add CYRILLIC LETTER GHE WITH UPTURN as more keys of CYRILLIC LETTER
   GHE.

[Belarusian]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER IE
   on 10-inch tablet.

[Kyrgyz]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

[Russian]
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

This change also replace misspelled "more_keys_for_cyrillic_ye" text
name with "more_keys_for_cyrillic_ie".

Bug: 6881007
Change-Id: I9e88c4e27f66225e1676f2b286a7e55b9f2cbf5b
2012-07-31 13:19:11 +09:00
Ying Wang
ff2bec1ce6 Import translations. DO NOT MERGE
Change-Id: I4495669f10f41c2c7c3877c65b061df6a2c9f196
Auto-generated-cl: translation import
2012-07-30 14:54:31 -07:00
Tadashi G. Takaoka
ca57f5ba40 Move gesture preview parameters to KeyboardView attributes
Change-Id: Iff9d6b485e202656fc869f3ff4d94575ad2c186f
2012-07-30 20:10:48 +09:00
Tadashi G. Takaoka
b9770cb7f7 Merge "Add device form factor to KeyboardId" into jb-mr1-dev 2012-07-30 00:50:25 -07:00
Tadashi G. Takaoka
47e2bf3298 Add advanced options to turn on/off the gesture trail and text preview
Bug: 6883053
Change-Id: I601718afb37289108b45ef68626c7c315edca35d
2012-07-30 15:54:27 +09:00
Tadashi G. Takaoka
4731b67629 Add device form factor to KeyboardId
This is a groundword for optimizing keyboard parsing.

Bug: 6860259
Change-Id: Ie65aa502b18c920e25cf2998b79120b3cc835952
2012-07-30 15:33:17 +09:00
Tadashi G. Takaoka
97c8d288a8 Add Zulu keyboard
Bug: 6867914
Change-Id: I13316ac2a554a8601f920e875d540e5375e12860
2012-07-26 19:03:35 +09:00
Tadashi G. Takaoka
55c01170c4 Add Afrikaans keyboard layout
Bug: 6867914
Change-Id: Ice35b20a0a51dda21c8271256064523bb5844952
2012-07-26 15:57:35 +09:00
Ying Wang
d28858ebde Merge "Import translations. DO NOT MERGE" 2012-07-25 15:04:41 -07:00
Ying Wang
d95121294a Import translations. DO NOT MERGE
Change-Id: I90620bd20eb0ed8f927709404822d815dc096223
Auto-generated-cl: translation import
2012-07-25 14:58:15 -07:00
Charles Chen
e1643ed694 Merge "Add accessibility descriptions for additional non-character keys." 2012-07-25 11:29:56 -07:00
alanv
ba037c62ac Add accessibility descriptions for additional non-character keys.
Bug: 6621009
Change-Id: I82fb2dc6af0fda795397e8be8c09a4f53b1656ab
2012-07-25 11:03:41 -07:00
Shawn Pearce
0a370ac80f Merge "Add Swahili keyboard layout" 2012-07-25 10:58:44 -07:00
Tom Ouyang
2f81757c3a Add dynamic floating preview for incremental gesture recognition.
Change-Id: I7ba7ac24aa96a0ff19267997c5b58853079bc6dc
2012-07-25 19:40:55 +09:00
Tadashi G. Takaoka
a28f6c9a18 Add Swahili keyboard layout
Bug: 6867914
Change-Id: I2b9b0a06ff49a2afe16ec7a0ace0503d1658d413
2012-07-25 17:48:37 +09:00
Tadashi G. Takaoka
42208100d8 Use obsolete language code of Indonesian
The java.lang.Locale will transform the official language code "id" to
the obsolete "in".  (new Locale("id")).getLanguageCode() returns
"in". To keep String representation and Locale compatible, we should
use the obsolete "in" as string representation.

This is exactly the same situation of Hebrew ("he" and "iw").

Bug: 6867914
Change-Id: I1a6ea6336d55cbf8a214f025aecf65308fb76140
2012-07-25 14:39:11 +09:00
Ying Wang
e095158c79 Import translations. DO NOT MERGE
Change-Id: I32d003e39ddd28b0ab8c52a6f6f3551b273e3a97
Auto-generated-cl: translation import
2012-07-24 13:13:24 -07:00
Tadashi G. Takaoka
1f43ded637 Merge "Add Seriban Latin keyboard layout as comments" 2012-07-24 04:09:37 -07:00
Tadashi G. Takaoka
9ecf634686 Add Seriban Latin keyboard layout as comments
Bug: 6867914
Bug: 6867842
Change-Id: I3434434628e72fdb127d158de6c17fdfa77ee9c8
2012-07-24 20:07:59 +09:00
Tadashi G. Takaoka
981ee0edae Merge "Add Catalan keyboard layout" 2012-07-24 03:54:53 -07:00
Tadashi G. Takaoka
e15a330f4f Add Catalan keyboard layout
Bug: 6867914
Change-Id: I9ab4aecc0a9605510da4ce01e571d6c10c738e0e
2012-07-24 19:51:48 +09:00
Tadashi G. Takaoka
fe45f29e4d Merge "Add Tagalog keyboard layout" 2012-07-24 03:22:40 -07:00
Tadashi G. Takaoka
12beb4d334 Merge "Add Malay keyboard layout" 2012-07-24 03:14:50 -07:00
Tadashi G. Takaoka
5876e779e4 Add Malay keyboard layout
Bug: 6867914
Change-Id: I51367d3822b68df506335695912e68bc24199604
2012-07-24 19:03:56 +09:00
Tadashi G. Takaoka
a01d9aea64 Add Tagalog keyboard layout
Bug: 6867914
Change-Id: I78ca6216cc74f8d34291950c05c810c800a3ddba
2012-07-24 18:54:43 +09:00
Tadashi G. Takaoka
fae3131ea7 Add Indonesian keyboard layout
Bug: 6867914
Change-Id: Id605cc20f3e38c4277c3705622f3078f307d971a
2012-07-24 17:33:32 +09:00
Ying Wang
467f829bc8 Import translations. DO NOT MERGE
Change-Id: I5ea8afadae2ea6b08ef195f6f39e69117dd304ac
Auto-generated-cl: translation import
2012-07-23 13:57:53 -07:00
Tadashi G. Takaoka
4702671ea4 Rename SuggestionsView to SuggestionStripView 2012-07-23 15:37:43 +09:00
Tadashi G. Takaoka
c8e45ddb03 Rename LatinKeyboardView to MainKeyboardView
Change-Id: I8f3123b8d727c7beb72e226f80c17794f89c8b60
2012-07-23 12:11:43 +09:00
Kurt Partridge
4331012a9e ResearchLog splash screen
Bug: 6188932
Change-Id: I1b247ecc26a2dd4f3f1c1b1cd3d928af717ebdd5
2012-07-22 18:36:43 -07:00
Kurt Partridge
3c233bf1a5 ResearchLogger feedback form
- also cleaned up RLog menu

multi-project commit with If0fd4fef89d390073e6939d5188ed5696866cb33

Bug: 6188932
Change-Id: I4f66f13bd366b4e8bde742ccd0704f812c6d33f9
2012-07-22 18:36:24 -07:00
Kurt Partridge
7e220d3c3a Merge "ResearchLog uploading" 2012-07-21 00:26:48 -07:00
Kurt Partridge
9c539d5a5c ResearchLog uploading
- uploads files in the background to server

multi-project commit with Ie0d937773e04b2fbefc8d76c231aaa52ebc392c9

Bug: 6188932

Change-Id: I90bb0e237eeb567e4cbb51085f2229f17f1fe71c
2012-07-20 15:24:48 -07:00
Ying Wang
2d097dd567 Import translations. DO NOT MERGE
Change-Id: Ie15a817f13d3ce0a87eeff8334824fd3a337c1bc
Auto-generated-cl: translation import
2012-07-20 13:28:37 -07:00
Tadashi G. Takaoka
62b8dddb6d Add gesture input enable settings
Bug: 6845325
Change-Id: I3165465b0b280e32a9288da16abb75baa67288dc
2012-07-20 19:26:36 +09:00
Kurt Partridge
48ded4e3b1 Merge "ResearchLogger: make logging more reliable (esp on startup)" 2012-07-19 21:31:41 -07:00
Ying Wang
721fd573f0 Import translations. DO NOT MERGE
Change-Id: I0122e62e7f9cf50d3987dc80018f2e9e78ed3f87
Auto-generated-cl: translation import
2012-07-19 14:56:45 -07:00
Kurt Partridge
0df487678e ResearchLogger: make logging more reliable (esp on startup)
Bug: 6188932
Change-Id: I692e427ba2e6da7bb15f48208304c4a034392a22
2012-07-19 09:00:21 -07:00
Tadashi G. Takaoka
918e420d1b Gesture input should be turned off depending on the configuration
The gesture input will be disabled when
 * It is AOSP build.
 * Accessibility mode is on.
 * The input field is password mode.

Bug: 6844755
Bug: 6844763
Bug: 6845011
Change-Id: I74972cc765d15c08059e0c9014f863ffb2a57c6c
2012-07-19 16:33:09 +09:00
Ying Wang
71b772ec58 Import translations. DO NOT MERGE
Change-Id: I4ba29a164c70eb3db5afbb502a81d32088813ba4
Auto-generated-cl: translation import
2012-07-18 17:05:01 -07:00
Ying Wang
e3c0301b31 Import translations. DO NOT MERGE
Change-Id: If1f6cea5414e0033139babda4a8afc459fd656cc
Auto-generated-cl: translation import
2012-07-17 13:29:26 -07:00
Ken Wakasa
8788dffe6f Increase the config_key_hysteresis_distance value for tablet form factor devices
bug: 6745169
Change-Id: I4f0c018748b12d42d5ef587d93df3c5521623b36
2012-07-17 18:36:37 +09:00
Tadashi G. Takaoka
af2c115253 Opening punctuations have a priority in Spanish keyboard
Bug: 6737535
Change-Id: I87442eb978ac68be3d3df99eed8a92877a6f4ab0
2012-07-17 16:14:36 +09:00
Ying Wang
c21aca9006 Import translations. DO NOT MERGE
Change-Id: I2fcbc5265b155035b804cedc019646a239a4d0ad
Auto-generated-cl: translation import
2012-07-16 13:34:58 -07:00
Ying Wang
63b12362d6 Import translations. DO NOT MERGE
Change-Id: Ibb5bd0c2753e52dc3526ce859b0c108e189a605d
Auto-generated-cl: translation import
2012-07-13 13:52:11 -07:00
Ying Wang
fa2287f86c Import translations. DO NOT MERGE
Change-Id: Ie03bf1e866e2b93cade6f02ce3ce14fa4864097d
Auto-generated-cl: translation import
2012-07-12 13:53:24 -07:00
Ying Wang
8f7f04fead Import translations. DO NOT MERGE
Change-Id: I056d8d8d630a2b3576462f7900bc39a7f19f5aa0
Auto-generated-cl: translation import
2012-07-11 15:33:02 -07:00
Kurt Partridge
0d54692ce4 Merge "intentional logging" 2012-07-10 21:20:47 -07:00
Kurt Partridge
223d671ffc intentional logging
- separate ResearchLog from ResearchLogger
- fix abort menu to explicitly indicate re-enabling of logging
- auto flush entries every 5s
- conform to new suggestedWords class

multi-project change with I9fe1f8fe59d5891daa4ca84af157f36fb1bb17dc

Bug: 6188932

Change-Id: I7e99390f934481c6ed9cea2b259944583edda5bb
2012-07-10 18:44:18 -07:00
Ying Wang
60baf00b3a Import translations. DO NOT MERGE
Change-Id: I0376c38451de66ff8c40b488ed3a8599326755ad
Auto-generated-cl: translation import
2012-07-10 14:20:17 -07:00
Ken Wakasa
1e8fb312bf Fix app name case
Change-Id: Id568adac98135cffceb111000e80f77928c045ea
2012-07-10 14:10:30 +09:00
Ying Wang
59205dd270 Import translations. DO NOT MERGE
Change-Id: I48fd690e9368a6637c7fa93c15b6ecadcbe47ce8
Auto-generated-cl: translation import
2012-07-09 13:56:48 -07:00
Satoshi Kataoka
69aef47e23 Separate string resource of IME name
Change-Id: Ib4afefac0e87c814c9e54cb65e78ee584c3f954c
2012-07-09 17:48:39 +09:00
Tadashi G. Takaoka
b28934adac Fix tab key's navigation behavior
Bug: 6435484
Change-Id: Iffe459c117ad438e96ec6f5c7e64fb80b32d227e
2012-07-05 16:57:14 +09:00
Ying Wang
b0593636b1 Import translations. DO NOT MERGE
Change-Id: I9c9bbd6dda1e978e29e985296cb624035d45497d
Auto-generated-cl: translation import
2012-07-03 14:21:10 -07:00
Eric Fischer
d0ba95678e Import translations. DO NOT MERGE
Change-Id: I13c7109bb886ef2860cbb4fc24650dd2b8badbcb
Auto-generated-cl: translation import
2012-07-02 14:37:28 -07:00
Jean Chalard
3ca3afe971 Merge "Update dictionaries." 2012-07-01 20:55:47 -07:00
Ying Wang
26c45718a5 Import translations. DO NOT MERGE
Change-Id: I1c7b1b7877fdbf6963b7a034a8ec197004f97b0e
Auto-generated-cl: translation import
2012-06-29 14:05:31 -07:00
Jean Chalard
6f7b1ff468 Update dictionaries.
- English : some words caught through regression tests
- English : some words externally reported
- French : some words externally reported
- French : finished review of all accented words

Bug: 6726969
Bug: 6730031
Change-Id: I37d0dc310db2c79e03ac7ad452391e92d9b13357
2012-06-29 19:30:01 +09:00
Tadashi G. Takaoka
69527d4d60 am 5e5cf045: am 7f7947c9: Keep subtypes in method.xml the same as pre-JellyBean
* commit '5e5cf045ca6debafcc29ae1c47afda4a3a152326':
  Keep subtypes in method.xml the same as pre-JellyBean
2012-06-27 21:58:53 -07:00
Tadashi G. Takaoka
7f7947c97b Keep subtypes in method.xml the same as pre-JellyBean
This change prevents Android Keyboard subtypes being mistakenly
disabled when upgrading from pre-JellyBean to JellyBean.

Bug: 6750906
Change-Id: I05de6c512e7aa17356e415476e5248986c7d4253
2012-06-28 13:44:09 +09:00
Ying Wang
ca5449bf4f Import translations. DO NOT MERGE
Change-Id: I3d022f22729b758a73352f0e7361e3aead0ef062
2012-06-27 17:16:15 -07:00
Jean Chalard
bf0cae3695 Merge "Reword the 'word prediction' option" 2012-06-26 02:45:49 -07:00
Jean Chalard
8d076be2d1 Reword the 'word prediction' option
Bug: 6694141
Change-Id: Ic8fd902554cdf81998f3806a58484d9733848d99
2012-06-26 18:23:06 +09:00
Tadashi G. Takaoka
3c5db23c7a Merge "Tune CHAR LIMIT" 2012-06-25 20:02:43 -07:00
Tadashi G. Takaoka
11327c7b20 Tune CHAR LIMIT
Bug: 6513247
Change-Id: I55e36620bd8b2e7b47a51ccde1b0bf3e277cd56b
2012-06-26 11:00:19 +09:00
Jean Chalard
30dd558802 Merge "Pull the "next word prediction" option up a level." 2012-06-25 18:54:28 -07:00
Eric Fischer
43d9b7818b Import translations. DO NOT MERGE
Change-Id: I8b66b0f81300af586db2db3f653ce3e2882a7efe
2012-06-25 13:47:45 -07:00
Eric Fischer
04f0b2113d Import translations. DO NOT MERGE
Change-Id: Ie741f7f0dccd2aef3ba43ac02776eaac9cb4f9af
2012-06-25 13:44:10 -07:00
Jean Chalard
e9e51cab78 Pull the "next word prediction" option up a level.
Bug: 6694141
Change-Id: Ib01575b0994e69ef232a234c575242ec49ed0679
2012-06-25 12:15:21 +09:00
Eric Fischer
142d6bb377 Import translations. DO NOT MERGE
Change-Id: Ida61fe3b2464868d3bb6d4b42032273edbf39689
2012-06-21 16:07:47 -07:00
Eric Fischer
f44adb1845 Import translations. DO NOT MERGE
Change-Id: If472b6e3c80691ad057990f7c6e2710fc8758e2a
2012-06-21 16:04:00 -07:00
Jean Chalard
83f4a9866a Cleanup, part 10 : remove from the code obsolete options (C10)
Change-Id: Id0806ad3dc7ccb632713eebaca76f0bab26ece5d
2012-06-21 10:07:05 +09:00
Ying Wang
44b459c910 Import translations. DO NOT MERGE
Change-Id: Ic9cd1c250611e5b25604d55d4115391068052f36
2012-06-20 14:59:06 -07:00
Tadashi G. Takaoka
563b48a976 am 8ce23247: am cc2f8c27: Merge "Shorten the key typing timeout parameter to 350ms" into jb-dev
* commit '8ce23247aefdab60dc6b555a82a563018c766ea8':
  Shorten the key typing timeout parameter to 350ms
2012-06-18 18:23:51 -07:00
Tadashi G. Takaoka
cc2f8c27d9 Merge "Shorten the key typing timeout parameter to 350ms" into jb-dev 2012-06-18 18:18:33 -07:00
Tadashi G. Takaoka
c50686bff5 Shorten the key typing timeout parameter to 350ms
Bug: 6688921
Change-Id: Ia6d6d98577769a3ce6a39873559993229156f2b8
2012-06-18 17:38:33 -07:00
Jean Chalard
ba6bc24e62 am 50152821: am a1425660: Merge "Make sure whitelist targets are in the main dictionary" into jb-dev
* commit '501528218da3b3043eab83201928518bf7cdc2ce':
  Make sure whitelist targets are in the main dictionary
2012-06-18 17:08:14 -07:00
Jean Chalard
a1425660c5 Merge "Make sure whitelist targets are in the main dictionary" into jb-dev 2012-06-18 17:04:35 -07:00
Ying Wang
a957b7c5e1 Merge "Import translations. DO NOT MERGE" 2012-06-18 16:38:26 -07:00
Ying Wang
27b9194d3e Import translations. DO NOT MERGE
Change-Id: I1f989dc6fc44d4e5a7632630fc2717d6a51b9eb8
2012-06-18 15:44:53 -07:00