Commit graph

6607 commits

Author SHA1 Message Date
Jean Chalard
be79227dc9 Remove the CharacterStore class (A7)
Remove the now useless WordComposer.CharacterStore class
and merge back its members inside WordComposer. This should
simplify the word composer a bit.

Change-Id: I5fe32418c62a583cd558dce98758a4701559bdf5
2012-01-26 20:03:44 +09:00
Jean Chalard
f108ec1103 am c7c152de: Guard against wrong auto-correction cancellation (A6)
* commit 'c7c152de4b42853086fc6fd918387ad0583d0e3e':
  Guard against wrong auto-correction cancellation (A6)
2012-01-26 03:02:17 -08:00
Jean Chalard
c7c152de4b Guard against wrong auto-correction cancellation (A6)
This deactivates the cancellation at each separator pressed while
not composing a word. The net effect is to fix
Bug: 5875776

Change-Id: I67aa3f842ddff250828c60596ad5a7e466c1ddaa
2012-01-26 19:57:37 +09:00
Jean Chalard
947bb69b9d am b6b87293: Straighten out resuming suggestion on kept word (A5)
* commit 'b6b8729374dc68b153f00730c79828532acf1ee5':
  Straighten out resuming suggestion on kept word (A5)
2012-01-26 02:31:40 -08:00
Jean Chalard
b6b8729374 Straighten out resuming suggestion on kept word (A5)
This is cleanup.
This also introduces a "deactivated" state to the last committed
word, that can be used for
Bug: 5875776

Change-Id: I1855adb8ac8123f6d2c5365b0ae899145e5c3ba1
2012-01-26 19:24:36 +09:00
Jean Chalard
7498ef4d0e am dd5e1d15: Merge "Remove mCommittedWordSavedForSuggestionResuming (A4)"
* commit 'dd5e1d157b6bd8d7642dfd1dd855c97adc9f4b67':
  Remove mCommittedWordSavedForSuggestionResuming (A4)
2012-01-26 02:17:33 -08:00
Jean Chalard
dd5e1d157b Merge "Remove mCommittedWordSavedForSuggestionResuming (A4)" 2012-01-26 02:15:38 -08:00
satok
6f53d79379 am 3c09bb18: Merge multiple words suggestions algorithm
* commit '3c09bb18d93800be14466f90502c344dcfafa738':
  Merge multiple words suggestions algorithm
2012-01-26 02:05:27 -08:00
satok
3c09bb18d9 Merge multiple words suggestions algorithm
Change-Id: I70d85b90ddaa28a41e9679f445bc14ef9ff50f16
2012-01-26 18:59:51 +09:00
Jean Chalard
2f2f1f5403 am 2692a870: Move some functionality into LastComposedWord (A3)
* commit '2692a8700737d8eed268039aa27b22a31669da08':
  Move some functionality into LastComposedWord (A3)
2012-01-26 01:36:46 -08:00
Jean Chalard
2712f23acb Remove mCommittedWordSavedForSuggestionResuming (A4)
Change-Id: Ia62ef33b5c777a258b02280bda1b8368780a7eef
2012-01-26 18:36:28 +09:00
Tadashi G. Takaoka
757f8d96ee Add KeyboardState.SwitchActions.setAlphabetShiftLockShifted
Change-Id: I6c49d8eb0a8272840ff03e0940d88a31c3d20bd9
2012-01-26 18:25:48 +09:00
Jean Chalard
2692a87007 Move some functionality into LastComposedWord (A3)
Change-Id: Ie0ea02a061dd0cb84db5f33113ff433584636bc7
2012-01-26 18:25:08 +09:00
Jean Chalard
183ba6a09e am 1f8fc62c: Add useful information to LastComposedWord (A2)
* commit '1f8fc62ccb5018716457dc309ab11ad3e1506ad1':
  Add useful information to LastComposedWord (A2)
2012-01-26 00:52:57 -08:00
Jean Chalard
1f8fc62ccb Add useful information to LastComposedWord (A2)
Change-Id: Idf47f2e2bdd1d6394fc4b1ab7df28d64a808da1e
2012-01-26 17:49:55 +09:00
Jean Chalard
56b26195d0 am 95eeb2df: Merge "Add a class for previously composed data (A1)"
* commit '95eeb2df63edf11d9500b9ff48b0b13a94712ba6':
  Add a class for previously composed data (A1)
2012-01-26 00:45:56 -08:00
Jean Chalard
95eeb2df63 Merge "Add a class for previously composed data (A1)" 2012-01-26 00:43:57 -08:00
satok
13c66f2017 am 6a033505: Merge "Refactor words priority queue"
* commit '6a03350521cb1ce65dd17db8fe4a4e8cb40468cb':
  Refactor words priority queue
2012-01-26 00:38:53 -08:00
satok
6a03350521 Merge "Refactor words priority queue" 2012-01-26 00:36:23 -08:00
Jean Chalard
267563d1bb Add a class for previously composed data (A1)
Change-Id: I87498799e6a48b8fa65924a098bb0ceb7626dce1
2012-01-26 17:22:52 +09:00
Tadashi G. Takaoka
4bea2e7613 am 736d740a: Merge "Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker"
* commit '736d740aa5966ad945d0f3ebdb48cebdfdd1ea16':
  Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker
2012-01-26 00:19:28 -08:00
Tadashi G. Takaoka
736d740aa5 Merge "Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker" 2012-01-26 00:17:56 -08:00
Jean Chalard
56c3c944db am a02e7032: Add a missing brace
* commit 'a02e703289d2704963f140c44d630dcc0a65e34a':
  Add a missing brace
2012-01-25 23:16:09 -08:00
satok
7409d151a1 Refactor words priority queue
Change-Id: I14b7ef39263ad2b1d5ec087bc80b7b8d7c30abe7
2012-01-26 16:13:25 +09:00
Tadashi G. Takaoka
160f01211d Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker
This change introduces the following attributes.
 * KeyboardView
   - keyPreviewLingerTimeout
 * LatinKeboardView
   - keyHysteresisDistance
   - touchNoiseThresholdTime
   - touchNoiseThresholdDistance
   - slidingKeyInputEnable
   - keyRepeatStartTimeout
   - keyRepeatInterval
   - longPressKeyTimeout
   - longPressShiftKeyTimeout
   - longPressSpaceKeyTimeout
   - ignoreSpecialKeyTimeout
   - showMiniKeyboardAtTouchedPoint

Change-Id: I25159a87289b12447e20031add173523070e9b03
2012-01-26 16:10:20 +09:00
Jean Chalard
a02e703289 Add a missing brace
Change-Id: Ia51da6506d78a295b8b70a241208fb81602cf0ea
2012-01-26 16:08:53 +09:00
Jean Chalard
b4464e61e7 am 9184d8b2: Add a test for moving cursor then backspace
* commit '9184d8b2352e11a25026ea9eed7f404836a7d476':
  Add a test for moving cursor then backspace
2012-01-25 22:46:41 -08:00
Jean Chalard
d3d0d4196c am 41df8a98: Add a test case for backspace at start of line
* commit '41df8a98fd0b89de87c7531903262c75dc7e505b':
  Add a test case for backspace at start of line
2012-01-25 22:39:38 -08:00
Jean Chalard
9184d8b235 Add a test for moving cursor then backspace
This is a test for the case in
Bug: 5851148

Change-Id: I58ee459d85f463b445a28137bdc6c40bc3067ff5
2012-01-26 15:39:29 +09:00
Jean Chalard
41df8a98fd Add a test case for backspace at start of line
Tests the behavior from
Bug: 5784542

Change-Id: I78ec9d77c5dd1e3ea8eff530f9d7d284a1c094d4
2012-01-26 15:36:27 +09:00
Tadashi G. Takaoka
c400482d17 am bd51aaf9: Merge "Warn deprecated privateImeOptions, "nm" and "forceAscii""
* commit 'bd51aaf98f39a2de01143109714a69dc9c1a7b66':
  Warn deprecated privateImeOptions, "nm" and "forceAscii"
2012-01-25 22:22:18 -08:00
Tadashi G. Takaoka
bd51aaf98f Merge "Warn deprecated privateImeOptions, "nm" and "forceAscii"" 2012-01-25 22:20:35 -08:00
satok
8da7bc6791 am f8ce19c2: Merge "Cleanup unused code"
* commit 'f8ce19c29de6440e15a16d91a86e0e6d840d114c':
  Cleanup unused code
2012-01-25 22:14:17 -08:00
satok
f8ce19c29d Merge "Cleanup unused code" 2012-01-25 22:12:52 -08:00
Jean Chalard
27310ae012 am 20ec43a2: Merge "Add tests for double space behavior"
* commit '20ec43a2652263532e41035360988567164ac311':
  Add tests for double space behavior
2012-01-25 22:11:21 -08:00
Jean Chalard
20ec43a265 Merge "Add tests for double space behavior" 2012-01-25 22:09:40 -08:00
satok
1c03306994 Cleanup unused code
Change-Id: I6c840f9ed170919e48d1c576cd0a48777ad44030
2012-01-26 14:56:52 +09:00
Jean Chalard
5f859f20a0 am 051ac1ef: Merge "Add a guard against OOB."
* commit '051ac1ef143113df7f8b7b2a693b8c5b8d8c38ca':
  Add a guard against OOB.
2012-01-25 21:24:23 -08:00
Jean Chalard
051ac1ef14 Merge "Add a guard against OOB." 2012-01-25 21:22:18 -08:00
Jean Chalard
8be16f78b1 Add a guard against OOB.
...and avoid crashing in one case where the application may
change the text while we are typing.

Bug: 5685922
Change-Id: I4a22c63168986f43ac84f512aaa4267023d536e3
2012-01-26 14:17:48 +09:00
Jean Chalard
e8ff9e107b am 5a38ff30: Merge "Convert an internal enum into an int of same underlying value."
* commit '5a38ff305f6ee95cecf2d337b7efda1eacff8140':
  Convert an internal enum into an int of same underlying value.
2012-01-25 21:15:19 -08:00
Jean Chalard
5a38ff305f Merge "Convert an internal enum into an int of same underlying value." 2012-01-25 21:13:56 -08:00
Tadashi G. Takaoka
4f5c3a2898 Warn deprecated privateImeOptions, "nm" and "forceAscii"
Public API EditorInfo.IME_FLAG_FORCE_ASCII has been supported by
I6665b483.

Change-Id: I0ffdee15d8177d126cd8fe86a6bc4ab21be58c36
2012-01-26 13:37:35 +09:00
Jean Chalard
159789c962 am fda847a8: Small cleanup
* commit 'fda847a870829f1491cbd5325f9c985213081149':
  Small cleanup
2012-01-25 20:08:44 -08:00
Jean Chalard
6e082cb30d Convert an internal enum into an int of same underlying value.
Goes together with Id4f4e066

Bug: 5922118
Change-Id: I1e39dd01c67e9284d9d7fe008d868847e69986d7
2012-01-26 13:07:51 +09:00
Jean Chalard
fda847a870 Small cleanup
All calls to this method are done with the same parameter,
and it's really hard to understand if we call upon this
member inside.

Change-Id: I787664bb59053ab0fe666ed812fb12b2b9090918
2012-01-26 11:40:16 +09:00
Jean Chalard
60e7718462 Add tests for double space behavior
Bug: 5875776
Change-Id: Icc28b6c5c0132a3afc8d603841c9e321f720b7c9
2012-01-26 10:10:38 +09:00
The Android Automerger
5f5ccb6ad4 merge in ics-release history after reset to master 2012-01-25 07:00:47 -08:00
satok
12e3a077e8 am 61b31a64: Merge "Do other error correction for the second word of two word correction"
* commit '61b31a646ea5c65f55891354dfd0485cbbcbc997':
  Do other error correction for the second word of two word correction
2012-01-25 05:50:44 -08:00
satok
61b31a646e Merge "Do other error correction for the second word of two word correction" 2012-01-25 05:48:15 -08:00