Commit graph

4106 commits

Author SHA1 Message Date
Jean Chalard
c82c0d0ef2 Merge "Fix variation dumping." 2012-11-19 23:56:47 -08:00
Jean Chalard
4d0fa31779 Fix variation dumping.
Variations are not flags - they should not be OR'd in this way.
Only one variation may be active at a time.

Change-Id: I9d3d4c8fc04af56c914c65f9c55f1e7b9517fc68
2012-11-20 16:55:16 +09:00
Jean Chalard
ec60d60078 Only add spaces automatically when appropriate.
Correctly check the variations to determine if we should
add automatic spaces (in manual picks and gestures) or not.

Bug: 7164981
Change-Id: I19e25af839b4062c217113cd804b1473912f22a5
2012-11-19 19:47:40 +09:00
Tadashi G. Takaoka
76d4ffeebf Add Spanish United States keyboard
The subtype locale name on the spacebar will be suppressed when only
one subtype is enabled and
 - Subtype locale is equal to the system locale.
or
 - Subtype language is equal to the system language but the subtype is
   implicitly enabled.

Thus the "es_ES" system locale chooses "es" subtype keyboard
implicitly but the keyboard doesn't have the subtype name on its
spacebar.

This change also removes Spanish Latin America keyboard.

Bug: 7531804
Change-Id: Ib929e8235d643c0ba039eb010e18ab721a734e15
2012-11-19 15:39:44 +09:00
Tadashi G. Takaoka
fd1267e396 Add Spanish United States keyboard (DO NOT MERGE)
Bug: 7531804
Change-Id: Idd66ee30e5228260540308a97c930185b48e775f
2012-11-19 11:27:07 +09:00
Ken Wakasa
41a2c10e72 resolved conflicts for merge of 4ad92578 to master
Change-Id: I29ad9f0ba357e39889e30c9ebfcf61f9d08ee4ef
2012-11-17 11:33:48 +09:00
Ken Wakasa
4ad92578dd am 7acd310d: am f9ff4fb5: Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
* commit '7acd310d02f060f3e3e29000db902dffb6b0df9c':
  Revert "Only add spaces automatically when appropriate."
2012-11-16 18:05:42 -08:00
Ken Wakasa
f9ff4fb5da Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev 2012-11-16 18:00:15 -08:00
Ken Wakasa
5986931fcb Revert "Only add spaces automatically when appropriate."
This reverts commit 6ce66d1c7d

Change-Id: I90004a5fea0bc7999ecf8742f883ff4dac264d8a
bug: 7565414
2012-11-16 17:49:22 -08:00
Marco Nelissen
ea23a28557 resolved conflicts for merge of 6f42cf1d to master
Change-Id: I054bb0cfba9de06473100010a76e2f3d9c2c1180
2012-11-16 11:23:33 -08:00
Jean Chalard
3a9f84a197 am 8c470f16: am 5dee6e69: am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev
* commit '8c470f16db291e257ac538bd0ac2a9354d34010c':
  Fix a bug with some text fields
2012-11-16 10:36:15 -08:00
Ken Wakasa
fe9ec6bc7d Remove unused variables
Change-Id: Ia5079368a1bc86ccdf0052445dc6945041c0abca
2012-11-16 19:28:56 +09:00
Jean Chalard
6f42cf1dee am 3dd4548e: am 191d49ae: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
* commit '3dd4548ec6105ca774e84ab3223bdbcea1e4902e':
  Only add spaces automatically when appropriate.
2012-11-15 19:14:00 -08:00
Jean Chalard
191d49ae8a Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev 2012-11-15 19:09:04 -08:00
Jean Chalard
6ce66d1c7d Only add spaces automatically when appropriate.
Bug: 7164981
Change-Id: Id672104a0fda99c52923913fb0e40c3a1ead4787
2012-11-15 17:57:16 +09:00
Jean Chalard
8c470f16db am 5dee6e69: am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev
* commit '5dee6e69f1de114df1f258fdc62559237989dc75':
  Fix a bug with some text fields
2012-11-14 20:40:33 -08:00
Jean Chalard
187e683aea Merge "Fix a bug with some text fields" into jb-mr1.1-dev 2012-11-14 20:37:19 -08:00
Tadashi G. Takaoka
0dfb89b41e am eea28db3: am d4886ff5: am 929bfdd0: Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev
* commit 'eea28db3333a734bf73e688b8335245929d5f322':
  Update shift state only when input field is restarted
2012-11-14 16:34:42 -08:00
Tadashi G. Takaoka
eea28db333 am d4886ff5: am 929bfdd0: Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev
* commit 'd4886ff5419003c3bf996939ba87e4b49bcdbfae':
  Update shift state only when input field is restarted
2012-11-14 16:33:20 -08:00
Tadashi G. Takaoka
dda024cf30 am 428d1b64: am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev
* commit '428d1b6469b5bc9041c35a7e1ee1476d5aacedd7':
  Fix language switch key behavior (DO NOT MERGE)
2012-11-14 16:33:19 -08:00
Tadashi G. Takaoka
929bfdd059 Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev 2012-11-14 16:29:43 -08:00
Tadashi G. Takaoka
d0725a6842 Update shift state only when input field is restarted
Bug: 7482766
Change-Id: Ifdfa110c44b95acfbcd3e0aa34f675c70b7d7285
2012-11-14 18:44:43 +09:00
Tadashi G. Takaoka
4a3d4620fc Merge "Fix language switch key behavior" 2012-11-14 01:42:12 -08:00
Tadashi G. Takaoka
d62be28515 Fix language switch key behavior (DO NOT MERGE)
Bug: 7075923
Change-Id: If139411db4aa65eed64337bf2a79387cfcd04496
2012-11-14 18:29:01 +09:00
Tadashi G. Takaoka
1931c1cab1 Fix language switch key behavior
Bug: 7075923
Change-Id: I306e1ff5d9f873541e84e1fafb64b9473947f623
2012-11-14 18:27:00 +09:00
Tadashi G. Takaoka
ee672144c9 Merge "Swap single and double quotation marks in Spanish tablet keyboard" 2012-11-13 23:00:53 -08:00
Tadashi G. Takaoka
0d3eb7d963 Swap single and double quotation marks in Spanish tablet keyboard
Bug: 6672279
Change-Id: I120613e36ba6a690e54447fa6c9c90e131f2a155
2012-11-14 15:54:19 +09:00
Satoshi Kataoka
1ee6e14507 Hide statustics logging option
Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0
2012-11-14 14:01:52 +09:00
Jean Chalard
00c0010ccf Fix a bug with some text fields
Not sure when this happens exactly, but it is possible that
InputConnection#getTextBeforeCursor returns null. This
happens for example upon rotating the screen with the
composing field empty in Gmail.
In this case, StringBuilder#append will convert the null
pointer into the string "null", which is sure better than a
crash, but can have a number of bad side-effects, like
auto-caps not working.

Bug: 7533034
Change-Id: Ia1cfab432c13a12ff1c2f013c59bac05a587f553
2012-11-14 12:22:40 +09:00
Jean Chalard
372f9da4f9 am 18ff5612: am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
* commit '18ff56125345746e288118d177fcabf3c079ead3':
  Make sure all FDs are correctly closed.
2012-11-13 18:47:02 -08:00
Jean Chalard
18ff561253 am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
* commit 'f592270a0f092c5ef52bbb0f24c8873f46e75503':
  Make sure all FDs are correctly closed.
2012-11-13 18:45:42 -08:00
Jean Chalard
7648b37d1e Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev 2012-11-13 18:42:35 -08:00
Jean Chalard
5c32b6da44 Make sure all FDs are correctly closed.
In this kind of series of calls, it's possible that an outer call to a
constructor fails, but the inner succeeded.
Example:
try {
    is = new A(new B());
} finally {
    if (null != is) is.close();
}
In this case, if new B() succeeds but new A() throws an
exception, is stays null and the intermediate object is never
closed. This is what was happening in this instance.

Bug: 7377336
Change-Id: I3fae9fec1135244982fcf5098c76d93f3e0f2add
2012-11-13 16:53:07 +09:00
Jean Chalard
80d7d32424 am d2116eb2: am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev
* commit 'd2116eb2ea7d08e81b7efe5e342772ffcd8a7efc':
  Don't restrict reset composing state to non-identical setText
2012-11-12 23:48:20 -08:00
Jean Chalard
1b909c2846 Resolve conflicts for merge of 3a9ba17f to master"
Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49
2012-11-13 16:34:23 +09:00
Jean Chalard
d2116eb2ea am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev
* commit '7d34763e23cb49c8c96dbf9b4c613e17098dd919':
  Don't restrict reset composing state to non-identical setText
2012-11-12 23:04:39 -08:00
Jean Chalard
3a9ba17fd2 am a13a8a58: am 0e84041b: Refactor all phantom-space-inserted spaces in one place
* commit 'a13a8a58e05ecd3f9eccdc47ceca972a814d247e':
  Refactor all phantom-space-inserted spaces in one place
2012-11-12 23:04:37 -08:00
Jean Chalard
fac619a34c Merge "Don't restrict reset composing state to non-identical setText" into jb-mr1.1-dev 2012-11-12 23:00:12 -08:00
Jean Chalard
0e84041bf7 Refactor all phantom-space-inserted spaces in one place
Bug: 7164981
Change-Id: If1635c212b2d5d9cf51f5fb074f3b20dd7ec7b2a
2012-11-13 12:53:55 +09:00
Jean Chalard
61cc2a3391 Don't restrict reset composing state to non-identical setText
Bug: 7497063
Change-Id: Ifbd5c37408131867458fd921bdef46ef90d81478
2012-11-12 18:34:18 +09:00
Tadashi G. Takaoka
eaaee28647 Merge "Enhance ImfUtils to InputMethodManagerWrapper class" 2012-11-11 22:43:07 -08:00
Tadashi G. Takaoka
6fbbab3b84 Enhance ImfUtils to InputMethodManagerWrapper class
Change-Id: I6ff86ee819a446dd3ed5f9c3400d23564027b020
2012-11-12 15:23:43 +09:00
Tadashi G. Takaoka
21177c1afe Remove gesture typing settings when disabled by configuration
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 07:58:27 -08:00
Jean Chalard
01d47b8096 Fix a logic flaw.
This test is seriously wrong : although we do have a method that
does exactly the right thing, this looks at a very specific, unrelated
variable state in hope it happens to be set only in the relevant
cases by the play of logic.
I don't think this changes anything concretely, as the assumption
was probably true in the practice ; still, this code is very hard to
read and prone to unexpected breakage.

Change-Id: I77ab576f90762429fcc752df31ed30e1c81871dc
2012-11-09 19:16:37 +09:00
Ken Wakasa
710d06cea9 Suppress dictionary pack support when IS_EXPERIMENTAL is true
Change-Id: If8813cb989c1fa8744a3bf36e8514ced3c8f46a3
2012-11-09 15:03:31 +09:00
Tadashi G. Takaoka
c43ff6f66c Remove gesture typing settings when disabled by configuration
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
2012-11-09 12:44:40 +09:00
Ken Wakasa
43f579e9f6 am 4eef5101: am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
* commit '4eef51016adc4e103fa65d944a0ab31527ddced8':
  Reset the IME if requested by the app.
2012-11-08 06:22:02 -08:00
Ken Wakasa
4eef51016a am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
* commit 'aa5d6fe05ce45e36b732a3abc849508cd8279257':
  Reset the IME if requested by the app.
2012-11-08 06:12:57 -08:00
Ken Wakasa
5d2556b932 Reset the IME if requested by the app.
Specifically, reset the KeyboardState to the main Alphabet layout in
LatinIME.onStartInputViewInternal() if a keyboard layout set doesn't get
reloaded in the method.

Please note TextView.setText() calls up resetInput(), then the IME should
reset with it.

bug: 7482086

Note that bug: 6851364 needs to be revisited.

Change-Id: I5d448c10963d3dd952dd13cb587085ec7b014e69
2012-11-07 01:09:26 +09:00
Tadashi G. Takaoka
a47a777476 Merge "Cleanup logging code" 2012-11-01 02:15:24 -07:00
Tadashi G. Takaoka
fca71cfddb Cleanup logging code
Change-Id: Ia604a4fcebfc5179bdbeaa982e052f7d3882ac6e
2012-11-01 17:03:35 +09:00
Tadashi G. Takaoka
93b5c2ce63 Make sure PointerTrackerQueue is non-null
Change-Id: I2106cf64bed1472fb39d24e7e5bdee7238a30bfe
2012-11-01 15:26:06 +09:00
Tadashi G. Takaoka
081fedc422 Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulator
Change-Id: Ia4fb5b3612ff78ed1b243c80a03294b829470f5c
2012-11-01 14:56:32 +09:00
Tadashi G. Takaoka
ffb0c093d1 Merge "Move isInvalidCordinates() method to Constants class" 2012-10-31 21:24:01 -07:00
Tadashi G. Takaoka
d80286642a Merge "Cosmetic source code formating change" 2012-10-31 21:23:49 -07:00
Tadashi G. Takaoka
0c8a08c141 Merge "Straighten an if-else-if blocks into if-return blocks" 2012-10-31 21:23:35 -07:00
Tadashi G. Takaoka
a232930d9c Straighten an if-else-if blocks into if-return blocks
Change-Id: If3eede1257658f27384e3efc72586fabbed19f7b
2012-11-01 13:14:19 +09:00
Tadashi G. Takaoka
24ab8055aa Move isInvalidCordinates() method to Constants class
Change-Id: Iad1464c299ad6055af1db1ff7978e5cd9a14750f
2012-11-01 13:12:58 +09:00
Tadashi G. Takaoka
20dd1bc090 Cosmetic source code formating change
Change-Id: I3a53b49afab70dfb13f12027070635da6001eb79
2012-11-01 13:10:44 +09:00
Tadashi G. Takaoka
13ae76d7a3 Cleaup non-distinct multitouch related stuff
Change-Id: I09072267217caad2513f83b61d7db1c6d74e18d1
2012-11-01 13:04:49 +09:00
Ken Wakasa
1e61493c50 Use 32-bit code points for suggestions output
This is a multi-project commit with Ic43dd666

bug: 6526418
Change-Id: I39c1acb4e91d04cd8a4ec5a943c8cf575da75ebc
2012-11-01 00:09:51 +09:00
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
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
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
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
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
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
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
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
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
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
c9ba26994b Don't cancel long press timer too early
Bug: 7328861
Change-Id: I1b77ec4a30ae15b2edda42a1ff58ebc528288553
2012-10-11 15:58:56 +09: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
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
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
80bcb99632 Move gesture detection and recognition paramters to resources
Bug: 7032858
Change-Id: I66570a5e21cdeede1eba420c597f440ab61aa941
2012-10-05 14:39:44 +09:00
Ken Wakasa
feac8a91f9 am 933e7c37: am 37c8f8b5: am 20f07e33: Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev
* commit '933e7c3770c00a9eea43c447d96daec1ada62041':
  Unlink an old file before moving the new file over it
2012-10-04 15:40:20 -07:00
Ken Wakasa
20f07e335d Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev 2012-10-04 15:33:41 -07:00
Jean Chalard
daff19bc29 am d173ed18: am bf6c8bd8: am 3f7fe829: Merge "Always consider a new line the start of a sentence" into jb-mr1-dev
* commit 'd173ed18e44ea5cdc48d5f620bb91efcd3ed5174':
  Always consider a new line the start of a sentence
2012-10-04 06:00:45 -07:00
Jean Chalard
2699b45dbc Always consider a new line the start of a sentence
Bug: 7282523
Change-Id: I10a73e99efdfe6acb9a16819694b98c6714fd451
2012-10-04 20:54:28 +09:00
Yuichiro Hanada
3c6d9fe148 Add insertWord.
bug: 6669677

Change-Id: Ide55a4931071de9cd42c1cddae63ddd531d2feba
2012-10-04 17:19:47 +09:00
Jean Chalard
c15726482e Unlink an old file before moving the new file over it
This is unlikely to be relevant to this bug, but just in case.

Bug: 7274972
Change-Id: I56b31b377af16cc2c15ceb90a19792bed3aab367
2012-10-04 15:49:08 +09:00
Yuichiro Hanada
c3a98ca306 Add writeNode.
Change-Id: I088bb6ea43ce0841d725e48b677d429e1155569d
2012-10-04 14:28:42 +09:00
Yuichiro Hanada
38712ff27d Add updateParentAddresses.
Change-Id: Iac210131b7c003ef363e1138bf22f777a37c6a89
2012-10-03 19:37:17 +09:00
Yuichiro Hanada
a853356b82 Add isDeletedGroup.
Change-Id: I83f09c068868e5e6e1b46f494a6ef957f0b466d8
2012-10-03 02:19:41 -07:00
Yuichiro Hanada
7223cc2ef1 Add MAX_BIGRAMS_IN_A_GROUP.
Change-Id: I128d5deb8e523045d7ad77d7a8fd3db944f71238
2012-10-03 18:10:06 +09:00
Satoshi Kataoka
69c787f3b7 am 96717371: am e8825ce3: am 1fd10ea2: Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev
* commit '967173711f17ba30d3608881f501985f07fef4fd':
  Throw illegal argument exception in BinaryDictionary::editDistance
2012-10-03 01:21:43 -07:00
Satoshi Kataoka
1fd10ea22c Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev 2012-10-03 01:15:52 -07:00
Satoshi Kataoka
66d955ad71 Throw illegal argument exception in BinaryDictionary::editDistance
Bug: 7276803
Change-Id: Icd9bdec0a04179a29d00336819d205627f77b71a
2012-10-03 17:15:47 +09:00
Tadashi G. Takaoka
c6ff7c42d9 Add SuggestedWords.isEmpty() method
Change-Id: I0fcb104a6a81aee4b99f5ee848eba7495630dc7d
2012-10-03 15:09:10 +09:00
Tadashi G. Takaoka
3e5a3c18be Add final modifier to the classes under suggestions sub-package
Change-Id: I19fc8eaac1aebef9cf4deb004e78484ff9a1e7ca
2012-10-03 14:57:29 +09:00
Tadashi G. Takaoka
5f5f7825e7 am 4d009dbc: am ace7d128: am d445b56c: Fix possible NPE caused while monkey test
* commit '4d009dbc514cd77eb22e4162e4ae7ea852e1b77e':
  Fix possible NPE caused while monkey test
2012-10-02 22:44:57 -07:00
Yuichiro Hanada
4ad4ff618f Add makeCharGroupFlags.
Change-Id: Id2c580f21b77f66a97c5fbdf4542fdafe6c43614
2012-10-03 14:33:59 +09:00
Tadashi G. Takaoka
d445b56ce1 Fix possible NPE caused while monkey test
Bug: 7269036
Change-Id: I9054b33ad3c8996cac3ee5f0e9c01ba8ceea4971
2012-10-03 14:33:52 +09:00
Tadashi G. Takaoka
c3aea8ea9f Merge "Avoid calling switchToLastInputMethod when other IMEs are in effect" 2012-10-02 01:36:37 -07:00
Tadashi G. Takaoka
aec5cc8476 Avoid calling switchToLastInputMethod when other IMEs are in effect
Bug: 7268389
Change-Id: I4d960cbf063002b4dc0ea813c966366b56c0346d
2012-10-02 17:29:15 +09: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
Jean Chalard
37688ae8c1 am 86db54df: am 137203d4: am 574b80aa: Remove debug prints.
* commit '86db54df74b821a15f7a3081c3737f8a63f91214':
  Remove debug prints.
2012-10-01 13:46:16 -07:00
Yuichiro Hanada
7f438aa12f Make writeCharGroup return a size of a new group.
bug: 6669677

Change-Id: I56f6a07b04b08443f2c052927404318c2018fc9d
2012-10-01 22:02:04 +09:00
Ken Wakasa
00e1d421c2 Merge "Add writeCharGroup." 2012-10-01 05:53:24 -07:00
Yuichiro Hanada
fb7e08ea8f Add writeCharGroup.
bug: 6669677

Change-Id: I36792ba9c511a5148c963096cc93ca8c2e0ee04e
2012-10-01 21:50:38 +09:00
Jean Chalard
574b80aace Remove debug prints.
Bug: 7226098
Change-Id: Ibacb740022a6af56c9d555d6797dd402a89f6ca4
2012-10-01 17:03:15 +09:00
Tadashi G. Takaoka
7339a62a13 Fix NPE observed only by monkey test
Bug: 7258660
Change-Id: I286c704b32efeada8505d953438f2595166f7e8f
2012-10-01 14:55:18 +09:00
Tadashi G. Takaoka
99501896f5 am 9925e487: am 6052a81e: Merge "Fix gesture detection algorithm" into jb-mr1-dev
* commit '9925e487b345e4a63d3dc25e3bf156e0fbfbb04d':
  Fix gesture detection algorithm
2012-09-28 06:54:04 -07:00
Tadashi G. Takaoka
6052a81e08 Merge "Fix gesture detection algorithm" into jb-mr1-dev 2012-09-28 06:49:24 -07:00
Tadashi G. Takaoka
58fe5a421f Fix gesture detection algorithm
This change also
  * Introduces adaptive gesture detecting threshold for time domain in addition to length domain.
  * Tunes the parameters for detecting gesture after fast typing.
  * Fixes a bug in dismissing gesture floating preview text.
  * Cleanup debug messages

Bug: 7218902
Change-Id: Iafccd872c6efe0c3b5ae65fa40b04c80d9f139c7
2012-09-28 22:47:55 +09:00
Tadashi G. Takaoka
11dbf025c6 am 2626bf08: am c8f25294: Merge "Temporarily suppress key popup preview after gesture input" into jb-mr1-dev
* commit '2626bf0889af798e484824737e9973ffb447498f':
  Temporarily suppress key popup preview after gesture input
2012-09-28 03:42:38 -07:00
Tadashi G. Takaoka
c8f252940f Merge "Temporarily suppress key popup preview after gesture input" into jb-mr1-dev 2012-09-28 03:38:20 -07:00
Ken Wakasa
b88c8ac8e4 Merge "Add updateChildrenAddress." 2012-09-28 03:18:18 -07:00
Tadashi G. Takaoka
29d2d48182 Temporarily suppress key popup preview after gesture input
Bug: 7244317
Change-Id: I39cdb0fbda51f3e4339301d9cc53403b1ad15409
2012-09-28 19:10:56 +09:00
Yuichiro Hanada
f3aed3ea26 Add updateChildrenAddress.
Change-Id: Ic06a755d85612476e719e580469dc1cd9447286c
2012-09-28 18:45:56 +09: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
Yuichiro Hanada
7a7d117aa7 Ignore the broken file.
bug: 7249561

Change-Id: If001bf75ef12b4d342a77e54706c7fed90c89afb
2012-09-28 14:19:14 +09:00
Tadashi G. Takaoka
a28a05e971 Cleanup: Make some classes as final
Change-Id: I6009b3c1950ba32b7f1e205a3db2307fe0cd688e
2012-09-27 19:03:30 +09: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
Yuichiro Hanada
84d858ed5e Use BinaryDictInputOutput to save UserHistoryDictionary.
bug: 6669677

Change-Id: I08193c26f76dbd48168f8ac02c1b737525bfc7b2
2012-09-27 12:02:17 +09:00
Tadashi G. Takaoka
c0a1dc0e07 Merge "Draw gesture trail that is above the keyboard" into jb-mr1-dev 2012-09-26 05:01:18 -07:00
Tadashi G. Takaoka
157fe98fd4 Draw gesture trail that is above the keyboard
Bug: 7233992
Change-Id: Ia848543a9d008c68d6ecbc7f715aa6ccdba9d1c6
2012-09-26 20:43:13 +09:00
Yuichiro Hanada
2aea34fb31 Add updateParentAddress.
bug: 6669677

Change-Id: I353f8ae53720cdf7a809271a28cb703709609f53
2012-09-26 17:18:01 +09:00
Yuichiro Hanada
2ee70804e9 Add moved char groups.
bug: 6669677

Change-Id: I372f841044fe8e076a50a80ac10b715e5f8fd4eb
2012-09-26 17:01:48 +09:00
Tadashi G. Takaoka
1c820c4146 Merge "Don't cancel gesture trail update drawing" into jb-mr1-dev 2012-09-25 22:50:50 -07:00
Tadashi G. Takaoka
1645902cce Postpone gesture start detection on non-letter key
Bug: 7108223
Change-Id: Ie1ead5cec947ddf86c5150dca5b20b224527e511
2012-09-26 12:46:55 +09:00
Tadashi G. Takaoka
936371e64f Don't cancel gesture trail update drawing
Bug: 7216955
Change-Id: Ie12bf45637b1012c9addb47279f9653334fae702
2012-09-26 12:25:24 +09:00
Yuichiro Hanada
a161bdac88 add capacity to FusionDictionaryBufferInterface.
bug: 6669677

Change-Id: I4627093811a19c46ce13fe351d1db63cbd78cf4a
2012-09-25 21:47:11 +09:00
Jean Chalard
35ffb90629 Merge "Make getTerminalPosition read linked-list nodes." into jb-mr1-dev 2012-09-25 05:39:24 -07:00
Yuichiro Hanada
93d7c6233f Make getTerminalPosition read linked-list nodes.
bug: 6669677

Change-Id: I599d276f430efe23d402695c325e23906b7705b3
2012-09-25 21:11:15 +09:00
Tadashi G. Takaoka
630d9c95e5 Introduce typing aware gesture detection
Bug: 7218902
Change-Id: I11ad85914bf991eca513e04ed8b5d12779101dda
2012-09-25 20:11:05 +09:00
Tadashi G. Takaoka
10d76cdcd6 Merge "Fix touch position correction data passing" into jb-mr1-dev 2012-09-24 22:26:48 -07:00
Tadashi G. Takaoka
6ca50d9920 Fix touch position correction data passing
Bug: 7225811
Change-Id: I3dcc0385ed633585d6810fdb742e0f88c2efbbd2
2012-09-25 14:24:15 +09:00
Yuichiro Hanada
8ec0064c49 Make children addresses and parent addresses use signed addresses.
Signed addresses are used only in version 3 with dynamic update.

bug: 6669677

Change-Id: Iadaeab199b5019d2330b4573c24da74d64f0945e
2012-09-25 12:55:14 +09:00
Jean Chalard
0eef4b1e6f Merge "Add suggestion span upon starting a gesture." into jb-mr1-dev 2012-09-24 04:30:32 -07:00
Jean Chalard
6a58bb7ac9 Add suggestion span upon starting a gesture.
Bug: 7196761
Change-Id: If60cb809b205159ced1887f94b7caf9775fcf3bb
2012-09-24 20:25:46 +09:00
Jean Chalard
88985bfa2e Merge "Fix a bug where the cursor pos wouldn't be tracked correctly" into jb-mr1-dev 2012-09-24 03:41:48 -07:00
Jean Chalard
72c5d32888 Fix a bug where the cursor pos wouldn't be tracked correctly
This would cause
Bug: 7208199

Change-Id: I8474985bfe349e1530b27bc98842937627bbe4e0
2012-09-24 19:33:42 +09:00
Jean Chalard
d3fabe7fa5 Merge "Set punctuation suggestions at start if activated" into jb-mr1-dev 2012-09-24 01:30:38 -07:00