Commit graph

5593 commits

Author SHA1 Message Date
Tadashi G. Takaoka
0ea2c80d8d Merge "Consolidate two helper methods (refactor step 3)" 2012-10-31 03:58:47 -07:00
Tadashi G. Takaoka
661bc810e5 Merge "Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)" 2012-10-31 03:46:05 -07:00
Tadashi G. Takaoka
831198a4e4 Consolidate two helper methods (refactor step 3)
Change-Id: I8b8522d1e5342fc73346ba2748e75f0c1d5bf03c
2012-10-31 19:45:29 +09:00
Tadashi G. Takaoka
2a3b15b267 Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)
Change-Id: I42aad04658e14e8fd703e3828676719a333ec8f9
2012-10-31 19:44:45 +09:00
Tadashi G. Takaoka
8ae9fbef77 Merge "Separate nested if-blocks into helper methods (refactor step 2)" 2012-10-31 03:43:27 -07:00
Tadashi G. Takaoka
3c6d3a4df8 Separate nested if-blocks into helper methods (refactor step 2)
Change-Id: Ic0ed243f8c1fbf62793565ee37175270b47f0801
2012-10-31 19:34:43 +09:00
Tadashi G. Takaoka
dd43dd61eb Merge "Separate nested if-blocks into helper methods (refactor step 1)" 2012-10-31 03:18:08 -07:00
Tadashi G. Takaoka
8b449c6dda Separate nested if-blocks into helper methods (refactor step 1)
Change-Id: I87ef8b174295fb12a91fec35acd3b0cc152ad8f0
2012-10-31 18:40:28 +09:00
Jean Chalard
0b900f5e64 Merge "Add a plumbing option to dicttool info." 2012-10-31 00:54:17 -07:00
Jean Chalard
51a0ef8c59 Add a plumbing option to dicttool info.
Also align the `porcelain' option to the diff command
that was used mistakenly.

Bug: 7388665
Change-Id: Ic0e1b98c62ce37b2e909384a0370af4458563703
2012-10-31 16:35:22 +09:00
Tadashi G. Takaoka
33aa6e3cf0 Escape "#" sign in XML file
Change-Id: Icd38abc4a0454ca949613d8c4bb528758cd990d8
2012-10-31 14:26:03 +09:00
Tadashi G. Takaoka
c7318bbc0b Fix possible NPE
Bug: 7398904
Change-Id: I6b7aba7a9bf52ca494cb4390b19525c98790bd49
2012-10-29 18:40:37 +09:00
Tadashi G. Takaoka
cfbfb1c50a Remove reference of android.util.Log in Constants class
This is a follow up of Iee01d4d2.

Change-Id: I0bcd349d317d9f7d40ef0574e72c640f9f990c5d
2012-10-29 17:25:13 +09:00
Tadashi G. Takaoka
7947eaf475 Merge "Move code point constants from Keyboard to Constants class" 2012-10-29 00:10:52 -07:00
Tadashi G. Takaoka
240871ecaf Move code point constants from Keyboard to Constants class
Change-Id: Iee01d4d2b916d0b584531104ac865ae6e6370a3d
2012-10-29 16:04:20 +09:00
Jean Chalard
f41389a74b Remove warnings
Thanks Eclipse

Change-Id: I88e3979ed22be5d8be5a5accdde417c6b1a8bf2d
2012-10-29 14:24:16 +09:00
Jean Chalard
a23e333079 Implement the word-level diff (A9)
Bug: 7388857
Change-Id: I4c4560d4f4b579936a44cdf409a4c27300b65610
2012-10-29 12:31:22 +09:00
Ken Wakasa
d505319a25 am 5199b8bf: am f6df37ce: Merge "LatinIME: Add accents to german keyboard"
* commit '5199b8bf1a212b93c9f37d4bb18121ba7f174bd0':
  LatinIME: Add accents to german keyboard
2012-10-25 23:13:48 -07:00
Ken Wakasa
5199b8bf1a am f6df37ce: Merge "LatinIME: Add accents to german keyboard"
* commit 'f6df37ce2dce9ada1af097e0c2fbdd84c0334c61':
  LatinIME: Add accents to german keyboard
2012-10-25 23:11:21 -07:00
Satoshi Kataoka
6067b9e1bd am ef5f88f3: am 5e118c4c: am 60dea36d: Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
* commit 'ef5f88f33e432284c958fafe18f891a10f77e1f9':
  Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
2012-10-25 19:31:27 -07:00
Satoshi Kataoka
60dea36daf Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
Bug: 7393485
Bug: 7272829
Change-Id: I873e8d99486c734e76484526631a90fc55e91c86
2012-10-25 20:00:46 +09:00
Jean Chalard
47cac57e45 Finish up the "info" command in dicttool. (A6)
Bug: 7388857
Change-Id: I704f12a6be76ce1644ec5e8dd3b667f112e9c04a
2012-10-25 19:15:24 +09:00
Jean Chalard
b3c98901c5 Add auto detection and decoding of dictionary files. (A2)
Bug: 7388852
Change-Id: I25e755fc15f5b383acc046f668e9681efa4f0c2f
2012-10-25 16:40:15 +09:00
Jean Chalard
b5a15bc076 am 7c22c62d: am 1f9eea44: am 306e0a80: Update AOSP dictionaries.
* commit '7c22c62d8f50aebe2f96bf5dcf99077d64db6f8f':
  Update AOSP dictionaries.
2012-10-24 02:17:37 -07:00
Jean Chalard
306e0a800f Update AOSP dictionaries.
Changes :
- Add "emoji"
- Change the whitelist target of "foo" from "for" to "too"
- Fix non-word frequencies to 0
- Fix the freq of common en_US vs en_GB words
- Add "connection" to the en_GB dictionary

Bug: 7368441
Bug: 7370033
Bug: 7371955
Change-Id: Ib22a97e97b486b05012d5496619557f406c441b9
2012-10-24 16:12:28 +09:00
Jean Chalard
ddb0bcc051 Fix a bug where a bigram would be ignored
Bug: 7403386
Change-Id: I89f495d07f7059a9f1ccd97d487c2f2657a8ebd2
2012-10-24 13:24:59 +09:00
Jean Chalard
5e5be5a2d2 Merge "Return the correct bigram frequency" 2012-10-23 01:19:28 -07:00
Jean Chalard
c59c741987 Return the correct bigram frequency
The "correct" bigram frequency is now returned by the reading
code. However, as the binary format represents the frequency
in a lossy manner, the frequency is not guaranteed to be the
exact same as the one in the source text format - only a close
enough value. It is however the exact same value seen by the
native code.

Bug: 7395653
Change-Id: I49199ef18901c671189912b3550623e9643baedd
2012-10-23 17:17:37 +09:00
Jean Chalard
1e0cc86b6f Fix the build.
It seems this change snuck out from a previous version.

Change-Id: I9c33d51273732b1d55bfd60f0957184c86fa88ab
2012-10-23 15:34:42 +09:00
Jean Chalard
c7020f54f9 Merge "Add reader and writer for the combined dict format." 2012-10-22 23:11:20 -07:00
Jean Chalard
9bb4eebf48 Add reader and writer for the combined dict format.
This introduces a new textual format for the dictionary that combines
words, bigrams and shortcuts to avoid complexity. It is also extensible
to n-grams to fool-prof for the future, and easier to read than XML.

Bug: 7388540
Change-Id: I942bbad51bd0c905a5a54c278667563fd6dd66ec
2012-10-23 15:06:25 +09:00
Jean Chalard
751f3dc0e1 am 6fe6f38d: am d39e6435: am f960eb18: Don\'t put spaces after characters that don\'t take one
* commit '6fe6f38d8af09b24e40a6e01eae919820cd04c16':
  Don't put spaces after characters that don't take one
2012-10-22 21:46:43 -07:00
Jean Chalard
f960eb186d Don't put spaces after characters that don't take one
Bug: 7393639
Change-Id: I1245a7b5077e554642838d6856ce269ca7f91988
2012-10-23 12:28:28 +09:00
Tadashi G. Takaoka
7f77aed507 Merge "Replace useless CharSequence to String" 2012-10-22 14:27:35 -07:00
Kim Le
82a6f66783 LatinIME: Add accents to german keyboard
This fixes http://code.google.com/p/android/issues/detail?id=26247

Add
// U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
// U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
// U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
// U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS

Change-Id: I81d79f153cdfe7015bd0a343c681322ab8316db7
2012-10-22 22:19:08 +02:00
Tadashi G. Takaoka
15f6d4ae34 Add @UsedForTesting and @ExternallyReferenced annotations
Bug: 7268357
Change-Id: I0b7e0c19f04af9ae30874d0a4c26ad81bc80be8c
2012-10-22 11:18:43 -07:00
Tadashi G. Takaoka
bc464e2952 Replace useless CharSequence to String
Change-Id: Idc478f901185ee1b4912acc82d0cbc54fee4e991
2012-10-22 11:03:28 -07:00
Tadashi G. Takaoka
8a3b07945a Add Spanish Latin America keyboard
Change-Id: I83615a061be3267a7b9199ed2c5c818401ed0b64
2012-10-19 15:26:20 -07:00
Tadashi G. Takaoka
5faf419519 Suggestion strip will honor haptic feedback settings of keyboard
Bug: 7313372
Change-Id: I427da8de68be3d2a78e810556340b96ab4edcc2d
2012-10-17 21:40:02 -07:00
Tadashi G. Takaoka
8e360c68f1 Move AudioAndHapticFeedbackManager from LatinIME to KeyboardSwitcher
Bug: 7313372
Change-Id: I9bd3275f57ed3f5c2c4a95768443af505513ee97
2012-10-17 19:39:16 -07:00
Jean Chalard
b0f6b70d44 am bb0bc326: am 5b095509: am 65225d82: Merge "Update AOSP dictionaries." into jb-mr1-dev
* commit 'bb0bc3260eccf6952e71655e4d933e7ca84e9a53':
  Update AOSP dictionaries.
2012-10-17 19:08:41 -07:00
Jean Chalard
65225d8211 Merge "Update AOSP dictionaries." into jb-mr1-dev 2012-10-17 19:03:01 -07:00
Tadashi G. Takaoka
723d32ad6e Shortcut key is enabled on the no language keyoard
Bug: 6617754
Change-Id: Id8336f152456367320de3151823691eebc2e02f6
2012-10-17 16:27:43 -07:00
Jean Chalard
3d83a1648b Update AOSP dictionaries.
Differences :
oh 90 -> 105
ooh 54 -> 54
hoy,kinkier,kinkiest,kinkiness,kinkily,kinky -> 0
trst -> remove

New whitelist entries (actually old that had not been applied)
"berm" -> "been"
"foe" -> "for"
"hid" -> "his"
"thong" -> "thing"

French :
Add "six" and remove some non-words

Bug: 7329149
Bug: 7356297
Change-Id: I55092f0538db8627148b0a314e50eff926c47275
2012-10-18 00:39:16 +09:00
Baligh Uddin
52992085f5 Merge "Import translations. DO NOT MERGE" 2012-10-16 22:28:24 -07:00
Baligh Uddin
dbba676c00 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-16 22:27:36 -07:00
Jean Chalard
c5dc32ac59 am b37e87e7: am 63b3fc0d: am 15142588: Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
* commit 'b37e87e7d50725f20a6b2f8484fc25cc7db3134f':
  Have "no whitespace before cursor" upon gesture trigger phantom space
2012-10-16 18:12:50 -07:00
Jean Chalard
1514258824 Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev 2012-10-16 18:06:11 -07:00
Jean Chalard
e91d495c53 Have "no whitespace before cursor" upon gesture trigger phantom space
Bug: 7359291
Bug: 7357758
Bug: 7197651
Change-Id: Ia805a87e922739ae0a06978a3bf00d91c94b6c51
2012-10-17 09:36:07 +09:00
Tadashi G. Takaoka
788c885aa5 am 344a7fef: am 658e935b: am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev
* commit '344a7fef5bd101e2d1c4278cc35de2862f28a456':
  Fix more suggestions text width calculation
2012-10-16 17:32:00 -07:00
Tadashi G. Takaoka
477088c612 am 6b169dc9: am 718a0744: am 0cbc19b0: Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
* commit '6b169dc91d7533d36bc1f5864bcaf05450af3beb':
  Restrict bogus move event detector to a horizontal movement
2012-10-16 17:31:56 -07:00
Jean Chalard
fa3d984d1b am 60211f0d: am 2631fe4c: am 6686e63f: Honor automatic shift turned off for gestures
* commit '60211f0d250ca931788d32d5a69c880f75ef7d49':
  Honor automatic shift turned off for gestures
2012-10-16 17:28:18 -07:00
Tadashi G. Takaoka
c0bc336955 Merge "Fix more suggestions text width calculation" into jb-mr1-dev 2012-10-16 17:24:35 -07:00
Tadashi G. Takaoka
0cbc19b0b1 Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev 2012-10-16 17:24:23 -07:00
Baligh Uddin
ed48f8e4bc Import translations. DO NOT MERGE
Change-Id: I69bfbfe56c58ccc2d1c0422c9d8e93d68c6202b5
Auto-generated-cl: translation import
2012-10-16 15:59:26 -07:00
Baligh Uddin
97903bf95e Import translations. DO NOT MERGE
Change-Id: I16dccd4bf5897d4b62a4642fbb3d24bd379deb4e
Auto-generated-cl: translation import
2012-10-16 15:55:23 -07:00
Tadashi G. Takaoka
d631778e1c Restrict bogus move event detector to a horizontal movement
The bogus move detection threshold is in proportional to a diagonal
length of a key. It was in proportional to a key width.

Bug: 7346614
Change-Id: I796add8aea16dd05e9844d6c4fba8072eece39c6
2012-10-16 14:53:54 -07:00
Tadashi G. Takaoka
bdc8b9e42b Fix more suggestions text width calculation
Bug: 7345983
Change-Id: Ic1554db98e7aaf032eb90a98c0c37c7c789461b5
2012-10-16 14:24:30 -07:00
Jean Chalard
6686e63f21 Honor automatic shift turned off for gestures
Bug: 7354129
Change-Id: Ia02336e8cea2f04b629edbe74b7815cce0d7fad6
2012-10-17 05:41:06 +09:00
Jason Chen
5cbb130618 am abd8170e: am f2eeb4ae: am c1bcb8ee: Let\'s enhance
* commit 'abd8170efd40804504eb9022a9e685bb01ffdc59':
  Let's enhance
2012-10-14 23:13:19 -07:00
Jason Chen
c1bcb8ee10 Let's enhance
Add mipmap-* launcher icon assets. Remove drawable-* based assests.
Change over reference to mipmap icon.

Bug: 6718166
Change-Id: I01f84a03fd1be0ced9cce9cff322a5fe02820075
2012-10-12 14:19:40 -07:00
Tadashi G. Takaoka
dd7db83423 am a13087e1: am 9c318bc5: am ac2a154a: Merge "Detect bogus down-move-up event and add workaround" into jb-mr1-dev
* commit 'a13087e1abf48f8599795b9abb4f49a596a6f32c':
  Detect bogus down-move-up event and add workaround
2012-10-12 11:14:00 -07:00
Tadashi G. Takaoka
ac2a154ae8 Merge "Detect bogus down-move-up event and add workaround" into jb-mr1-dev 2012-10-12 06:59:42 -07:00
Tadashi G. Takaoka
b0952888eb Detect bogus down-move-up event and add workaround
Bug: 7032858
Change-Id: I2e76bf49f1e07b436d05c19881e2f2c4fed21621
2012-10-12 20:45:08 +09:00
Jean Chalard
01e0913ad2 Make a better choice for the temporary file
Change-Id: I745bb285b6b52875c8d2b3a94deb962352f9754e
2012-10-12 19:58:07 +09:00
Ken Wakasa
b0aa9606ae am 726e98b7: am c1a1937c: am 2220aeed: Merge "Put temporary files under a separate directory." into jb-mr1-dev
* commit '726e98b7378987b2cfe46ea5395692640b108e83':
  Put temporary files under a separate directory.
2012-10-11 08:41:42 -07:00
Ken Wakasa
2220aeedfe Merge "Put temporary files under a separate directory." into jb-mr1-dev 2012-10-11 08:36:22 -07:00
Fredrik Roubert
ce1e491233 Add Swedish to the list of languages for which a Euro key is wanted.
Change-Id: I2ba4d0a7e82733c3d9526658195f22178e520926
2012-10-11 15:16:03 +02:00
Jean Chalard
66c90cd2ae Put temporary files under a separate directory.
Bug: 7328003
Change-Id: Ibe5278ea209d149f87fd08785c77b17e3859948e
2012-10-11 17:53:06 +09:00
Tadashi G. Takaoka
ad181915f7 Fix excessive canceling of long-press timer while gesturing
Change-Id: I2a68c777e66a6b83d16885780a92a21e91bd3f9e
2012-10-11 17:51:45 +09:00
Tadashi G. Takaoka
c1f2c3a646 am c66a2d1d: am 61155c70: am 9d423536: Merge "Don\'t cancel long press timer too early" into jb-mr1-dev
* commit 'c66a2d1da69de796a2a7acb5dd6903cb5668585c':
  Don't cancel long press timer too early
2012-10-11 00:52:05 -07:00
Tadashi G. Takaoka
9d42353611 Merge "Don't cancel long press timer too early" into jb-mr1-dev 2012-10-11 00:46:06 -07:00
Tadashi G. Takaoka
c9ba26994b Don't cancel long press timer too early
Bug: 7328861
Change-Id: I1b77ec4a30ae15b2edda42a1ff58ebc528288553
2012-10-11 15:58:56 +09:00
Baligh Uddin
e129d6921e Import translations. DO NOT MERGE
Change-Id: Ibb93814ac881cfd48a4a298e2964c9a4188405f0
Auto-generated-cl: translation import
2012-10-10 16:05:53 -07:00
Baligh Uddin
7c8f4a04fa Import translations. DO NOT MERGE
Change-Id: I0a766dd5b65f375276e30c588bb202f6718a8892
Auto-generated-cl: translation import
2012-10-10 16:02:04 -07:00
Ken Wakasa
06636bf96a am 0081681e: am c44314b4: am dc38a343: Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev
* commit '0081681e346ce5c958e5eef264caa3f257b094c5':
  Use a freq of 1 instead of 0 for non-word shortcuts.
2012-10-09 07:48:46 -07:00
Tadashi G. Takaoka
4020289147 am 6b0fa314: am f5c10d00: am 7a17c1fc: Tuning gesture detection parameters
* commit '6b0fa314d780ea77bd2c65b9bdd87297d50a0f6b':
  Tuning gesture detection parameters
2012-10-09 07:48:45 -07:00
Ken Wakasa
dc38a3438b Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev 2012-10-09 07:43:16 -07:00
Tadashi G. Takaoka
11cec73499 Merge "Disable touch position correction of MoreKeysKeyboard" 2012-10-09 03:39:43 -07:00
Tadashi G. Takaoka
f9aa99c1c9 Disable touch position correction of MoreKeysKeyboard
Change-Id: Ieec33894a348602fd71d6fe473142b43eb2551b6
2012-10-09 19:20:28 +09:00
Jean Chalard
99b84b42f9 Use a freq of 1 instead of 0 for non-word shortcuts.
Also fix a spelling mistake in a comment

Bug: 7301525
Change-Id: I4437403dce620fed03871485ee04f13c51ce34fc
2012-10-09 19:16:07 +09:00
Tadashi G. Takaoka
7a17c1fcb5 Tuning gesture detection parameters
Bug: 7032858
Change-Id: Ie4f952aa33b99ce16027500a596d723ee9bafae9
2012-10-09 19:06:10 +09:00
Tadashi G. Takaoka
7cbb7f92ee Merge "Allow to start gesture from a non-letter key except from a modifier key" 2012-10-09 02:20:28 -07:00
Tadashi G. Takaoka
4df6549c1a Allow to start gesture from a non-letter key except from a modifier key
Bug: 7303982
Change-Id: Id54965c1d7b2b760ac2a76a0fc509b46948e75e6
2012-10-09 18:03:40 +09:00
Ken Wakasa
b02ee3d67a Make use of the NELEMS and KEYCODE_SPACE macro. Also, remove an unused parameter.
Change-Id: I3c7e6c59990c92b0d5e2fb80493e8673cdd37b09
2012-10-09 11:17:50 +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
Ken Wakasa
fc62882591 Fix a small typo
Change-Id: I813d97b9453f8aa7aae99bd165336b1e5a81dc6a
2012-10-07 12:05:23 +09:00
Tadashi G. Takaoka
052b162df6 Merge "Add separate key hysteresis distance for sliding modifier input" into jb-mr1-dev 2012-10-06 10:43:04 -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
Tadashi G. Takaoka
792980d4aa Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
Bug: 7299050
Change-Id: Ife6721a5fcbc4872bd36ffd8a8b81b04d73aebec
2012-10-06 19:01:36 +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
Ken Wakasa
035b260058 Merge "fix writeCharGroup." 2012-10-04 23:05:51 -07:00
Yuichiro Hanada
d2579c4832 fix writeCharGroup.
Change-Id: Ib841afaba0a20c3b300eb7d3e9133243f9f3ae58
2012-10-05 14:54:17 +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