Commit Graph

3910 Commits (43f579e9f69fa8a55c6e65d3d78206094f0c9fe5)

Author SHA1 Message Date
Tom Ouyang e68385871a Fix gesture trail rendering on tablet.
Bug: 6867837
Change-Id: I54dceee1c83679f78462104d6cee1f2300a0cfc2
2012-07-25 16:12:37 +09:00
Tadashi G. Takaoka 0657b9698a Update gesture mode state when dictionary gets available
Bug: 6860204
Change-Id: I840b7bf1983ab92fa4e0b180129176539e96409f
2012-07-25 16:11:53 +09:00
Tadashi G. Takaoka 369e54cc33 Add Suggest initialization finish listener
Bug: 6860204
Change-Id: I1e4c03c99415cd9bdea5a8556ff4093c33f0f508
2012-07-25 09:55:22 +09: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 a01d9aea64 Add Tagalog keyboard layout
Bug: 6867914
Change-Id: I78ca6216cc74f8d34291950c05c810c800a3ddba
2012-07-24 18:54:43 +09:00
Tadashi G. Takaoka 506259396f Merge "Update gesture suggestions even when suggestions strip is off" 2012-07-23 03:45:21 -07:00
Tadashi G. Takaoka 7575ac7054 Update gesture suggestions even when suggestions strip is off
Bug: 6852483
Change-Id: I873ae0f2e3bc863e989629f8bc0cc90ee33a4920
2012-07-23 19:37:00 +09:00
Jean Chalard c0f0ceeccf Merge "Fix a bug with the 'add to dict' hint popping up too much" 2012-07-23 03:20:01 -07:00
Jean Chalard 491d451e38 Fix a bug with the 'add to dict' hint popping up too much
Not having a main dictionary is not sufficient reason to display
the hint. If the user already added the word to the dictionary then
we shouldn't be displaying it again, even if we don't have a main
dictionary for the current language.

Bug: 6829798
Change-Id: I6b081f51c82ef395fe2e394fd3167363e743ea6f
2012-07-23 18:32:13 +09:00
Tadashi G. Takaoka 259905ba90 Rename suggestion strip related methods
Change-Id: I942692bbc2e577482f353d875405c4658a1102fc
2012-07-23 18:04:02 +09: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 a4f762ff98 Merge "ResearchLogging indicator" 2012-07-22 19:31:40 -07:00
Kurt Partridge 4fa6e57260 ResearchLogging indicator
- shows a indicator that logging is on.  two options are available: an obvious
red outline around the keyboard, and a subtle red dot in the lower right-hand
corner.  currently configured for the subtle red dot.

Bug: 6188932
Change-Id: I0fd1ac5a0f20329adc603aa65ab85f2d38b9fc43
2012-07-22 19:04:34 -07:00
Kurt Partridge 74c95d6d18 Merge "ResearchLog splash screen" 2012-07-22 18:53:38 -07:00
Kurt Partridge f0c6606807 Merge "ResearchLogger feedback form" 2012-07-22 18:53:30 -07: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
Tom Ouyang ccaa799ee9 Update gesture bounding box handling.
Change-Id: I085611ce6fd82608f284d74973e5bb14258cdc24
2012-07-22 10:54:27 +09: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
Kurt Partridge 6b966160ac ResearchLog refactor
- new package: com.android.inputmethod.research

multi-project commit with Ic0a5744f3160d13218addd589890623c0d120ffc

Bug: 6188932

Change-Id: Icf8d4a40a5725401799be6e209a640d99a5f34c4
2012-07-20 15:06:51 -07:00
Tadashi G. Takaoka 7519091f7c Use ResizableIntArray in GestureStroke
Change-Id: I034e80df03c7c6c0895fdf2c03763627d410d425
2012-07-20 19:32:28 +09:00
Tadashi G. Takaoka 2474b37abd Merge "Disable gesture input detection when more keys keyboard is showing" 2012-07-20 03:28:52 -07:00
Tadashi G. Takaoka 62b8dddb6d Add gesture input enable settings
Bug: 6845325
Change-Id: I3165465b0b280e32a9288da16abb75baa67288dc
2012-07-20 19:26:36 +09:00
Tadashi G. Takaoka cc3500b0c8 Disable gesture input detection when more keys keyboard is showing
Bug: 6852441
2012-07-20 18:40:31 +09:00
Tom Ouyang b8bd45a22a Merge "Fix bug where key previews do not show up." 2012-07-20 02:06:29 -07:00
Tom Ouyang c022a9f8d4 Fix bug where key previews do not show up.
Bug: 6852705

Change-Id: Ib90107a5dde774b4d6c1e570629ce7f7eaff44bc
2012-07-20 18:02:12 +09:00
Ken Wakasa afed0567e9 Performance improvements - Avoid using iterators
Change-Id: Iab604aa1ef67acf5d54208a6bc44635632845ae0
2012-07-20 17:51:52 +09:00
Tom Ouyang 528738341d Merge "Add gesture trail feedback." 2012-07-20 01:26:30 -07:00
Tom Ouyang 4daf32b6c0 Add gesture trail feedback.
Change-Id: I32709fac0dec3165678a052aa286e2fb3d90721b
2012-07-20 17:09:23 +09:00
Tadashi G. Takaoka 2f6a90ac31 Merge "Implement ResizableIntArray.fill" 2012-07-20 00:33:07 -07:00
Tadashi G. Takaoka 7abdcf1ed3 Implement ResizableIntArray.fill
Change-Id: I570641bc2f32d016c247db6c065a138d8235ab8c
2012-07-20 16:05:37 +09:00
Tadashi G. Takaoka 732edc1ff1 Merge "Fix NPE where the current subtype is null" 2012-07-19 22:57:39 -07:00
Tadashi G. Takaoka d6a18cdedb Fix NPE where the current subtype is null
Bug: 6847999
2012-07-20 14:51:41 +09:00
Kurt Partridge 48ded4e3b1 Merge "ResearchLogger: make logging more reliable (esp on startup)" 2012-07-19 21:31:41 -07:00
Tadashi G. Takaoka 19ac19e5fd Merge "Implement ResizableIntArray.setLength and .get" 2012-07-19 20:44:54 -07:00
Ken Wakasa 2fc127698a Make ALPHA_OPAQUE public
Change-Id: I904685be07e23292dd95296617a4b64c366f06f2
2012-07-20 12:17:31 +09:00
Tadashi G. Takaoka c49c85f835 Implement ResizableIntArray.setLength and .get
This change revises ResizableIntArrayTests as well.
2012-07-20 12:02:38 +09:00
Tom Ouyang 0c5f72e2bf Improve incremental gesture tracking.
Eliminates need to recreate batch InputPointers on each gesture move event.
Fixes issue where batch points from previous tapping input get mixed into next gesture.

Change-Id: I9ecac66db88f5a87c6dde2138408906dd3d11139
2012-07-20 10:44:37 +09: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 9370ab9ada Make ScalableIntArray public as ResizableIntArray
Change-Id: Ibbbc117214912ffa192c694bde5b7d55154f40c4
2012-07-19 20:37:53 +09:00
Tadashi G. Takaoka 1e6f39a9f9 Tune the gesture detection logic a bit
Change-Id: Ia8e8c15fdbbd49768d57cafd50325e7e45af6251
2012-07-19 18:53:39 +09: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
Tadashi G. Takaoka 57f7de0ba6 Add default capacity parameter to InputPointers' constructor
Change-Id: I02f23096f0682d30effe4dfc1ca57881a1e4aedc
2012-07-19 12:06:00 +09:00
Tadashi G. Takaoka 9580c467f9 Consolidate GestureTracker into PointerTracker
Change-Id: Ib28fae10493a9142ba4dff6cf57f52c59766b209
2012-07-18 20:11:06 +09:00
Tadashi G. Takaoka 10102f02af Change the batch input methods of KeyboardActionListener
This change also removes the reference of SuggestedWords from
GestureTracker and KeyboardActionListener.

Change-Id: I25ef8756007986abf99a931afd665bbfe6fa387f
2012-07-18 18:53:36 +09:00
Tadashi G. Takaoka f39fccbd0f Make GestureStroke as top level class
And make PointerTracker object has GestureStroke object.

Change-Id: Ibf5cfd593c4f13468368e01acb847589b0ab12e7
2012-07-18 17:32:17 +09:00
Tadashi G. Takaoka 3ec31f4971 A gesture should not start from the delete key
Change-Id: I5c8c7665454b7f10f944f307431dfffe20cf3134
2012-07-18 14:38:51 +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
Kurt Partridge 5e53542489 Merge "delete old ResearchLog files" 2012-07-16 09:41:10 -07:00
Kurt Partridge 81dae8d015 delete old ResearchLog files
cleans out the local directory of files that may have persisted
accidentally because of system crashes, etc.  default lifetime is
curently 1 day.

Bug: 6188932
Change-Id: I4b51169d6dd0eddb6bf8b661165f88e63782ce7d
2012-07-13 20:25:38 -07:00
Kurt Partridge 73c5dbd9d2 researchLog records versionCode, versionName
Bug: 6188932
Change-Id: I3d8502a5397035be5287ea720599e3fda4c669d6
2012-07-13 20:21:18 -07:00
Tom Ouyang eea34598bf Merging minimal gesture input
Change-Id: Iee6ae48bb6309c2867b5d2e344fe7d86dfabd654
2012-07-13 19:32:18 +09:00
Jean Chalard e9808694fe Fix a bug where the word composer is not correctly reset
...upon commit

Change-Id: I1fea87cb4c133a0884329eb9b61bf3053c36cd1b
2012-07-13 13:31:27 +09:00
Tadashi G. Takaoka 7247bff6d6 Fix InputPointers.append
Change-Id: I6995f9b2ed00b9f948e1299e576a5e24725d58f8
2012-07-13 11:46:03 +09:00
Jean Chalard c7387a4fd0 Add values for suggestion types (A120)
Also, use it in getBigrams.

Change-Id: Ia0be9b57d1b7effcd8a936e01e957d1195b39c68
2012-07-12 19:21:44 +09:00
Jean Chalard 6931df9c17 Pass an array to output suggestion types (A119a)
This needs the matching A119b change to not break the build.
The array is passed, but not used yet.

Bug: 6166228
Change-Id: Ia91d658461d989ee8c94e9b31bb06f4a36f4c5b6
2012-07-12 19:21:42 +09:00
Jean Chalard 2c5cf744e5 Increase encapsulation (A118)
showSuggestions is only ever called by updateSuggestionsOrPredictions.
It only feels natural that, when called with a 0-sized or null
suggestion list, it clears the suggestions.

Change-Id: I5b52bc9151afca1bb6c6f0a7f81e3255add92177
2012-07-12 15:58:16 +09:00
Jean Chalard 1343d27de3 Readability improvement (A117)
Change-Id: I6f8bb05a23edb40a079da60b7136170ec9043282
2012-07-12 15:58:16 +09:00
Jean Chalard 24a63b5537 Simplification (A116)
Change-Id: I97cf92a7b0dabc251dd241b24978ea00d1e5f047
2012-07-12 15:58:16 +09:00
Jean Chalard f5b55cb70c Compute variables closer to where they are used (A115)
This improves locality, it's better for readability/performance

Change-Id: Ibb1efaf86e362dd2c9398722d0da2144df96b333
2012-07-12 15:58:09 +09:00
Jean Chalard 2549b4978e Cleanup (A114)
Change-Id: I7e24e0aeae7c004cae310ae9f46cf90dac2d4d14
2012-07-12 15:09:57 +09:00
Jean Chalard 02f1c1534c Cleanup (A113)
If not composing a word, then consideredWord is always the empty
string.
Hence, it's never whitelisted, but it's also always "NotAWord",
so isWhitelistedOrNotAWord returns always true, so
allowsToBeAutoCorrected is always true. Which means that
isPrediction implies allowsToBeAutoCorrected == true.
Thus, !isPrediction && !allowsToBeAutoCorrected is strictly
equivalent to !allowsToBeAutocorrected.

Change-Id: I4ad7a7c3447851c539646d97cf55ff065e6ee115
2012-07-12 15:09:48 +09:00
Jean Chalard ae13061245 Simplification (A112)
If we are not composing a word, that isFirstCharCapitalized
and isAllUpperCase are guaranteed to return false.

Change-Id: Ic4a0be9574acf4653c729a9594f963f5bcf0c757
2012-07-12 14:30:33 +09:00
Jean Chalard d8afa2fbe1 Remove the ultimate code duplication (A111)
Change-Id: I7c76613df8f148feb02765f187db3ca6dc577977
2012-07-12 14:30:33 +09:00
Jean Chalard 3b57631b60 Resolve a TODO: bury some implementation detail in native (A110)
The fact that prediction does not accept a null argument is an
implementation detail, it should not be visible to Java code.

Change-Id: I3a156b323b6db9353de898d33f3f7c81751cecb1
2012-07-12 14:30:30 +09:00
Jean Chalard 18d76afa91 Remove an unused method (A109)
Change-Id: Ib785b7e8c554d030395e2c0ca92edb44eb2b245f
2012-07-12 14:30:03 +09:00
Jean Chalard 251f302985 Stop using a redundant method (A108)
Change-Id: Iffc0bae0a273419e7c50d69526c0c8e402c6461c
2012-07-12 14:30:00 +09:00
Jean Chalard 6a5d17cd2f Remove a useless parameter (A106)
Change-Id: Ic0ecea22212fd1a098a3a168da460374e446f4a3
2012-07-12 11:28:16 +09:00
Jean Chalard b7d7c5a369 Make a constant really constant (A104)
Change-Id: Ied1f9f96a574b1e6a8ee0a71bfb1604d9c962e1c
2012-07-12 11:16:30 +09:00
Jean Chalard e4e7e5fc82 Cleanup (A103)
Change-Id: Ib5ebddfdb87ef71a2f8d859fb45d3ac78040e97a
2012-07-11 16:14:58 +09:00
Tadashi Takaoka 5e21ea1a35 Revert "Workaround to avoid a bug in the batch input bigram dictionary lookup"
This reverts commit 1250cdeab2
2012-07-11 00:07:08 -07:00
Tadashi G. Takaoka 1250cdeab2 Workaround to avoid a bug in the batch input bigram dictionary lookup
Change-Id: I8a5641c88c45918d6bed81a0b03efdcff0b380c5
2012-07-11 15:38:13 +09:00
Jean Chalard 9c09fd02eb Inline a method to be able to factorize code (A102)
Change-Id: I121071f80c8af3c1053968dc76aaeca3352ca9a8
2012-07-11 14:57:51 +09:00
Jean Chalard d6c610400e Inline a wrapper method (A101)
Change-Id: I6ce856ff49a8f8c696851b2487590704010fc758
2012-07-11 14:57:51 +09:00
Tadashi G. Takaoka eb1443883f Support batch input
Change-Id: Ibe63212fe71cdebb5b897bc5018ae75b2a87555a
2012-07-11 14:53:20 +09:00
Jean Chalard 21e5759e8e Merge "Small readability improvement (A100)" 2012-07-10 22:49:25 -07:00
Jean Chalard 27207eaa04 Merge "Pull up some common code again (A99)" 2012-07-10 22:49:06 -07:00
Jean Chalard 722b00275d Merge "Pull up some identical code (A98)" 2012-07-10 22:48:58 -07:00
Jean Chalard 8b166465b0 Merge "Inline a method to avoid confusion (A97)" 2012-07-10 22:48:52 -07:00
Jean Chalard fd9b485111 Merge "Remove parameters for easier inlining (A96)" 2012-07-10 22:48:44 -07:00
Jean Chalard 0b329fd0d1 Merge "Pull up some more common code (A95)" 2012-07-10 22:48:38 -07:00
Jean Chalard a5acd68caa Merge "Pull up common code in the caller (A94)" 2012-07-10 22:48:33 -07:00
Kurt Partridge 0d54692ce4 Merge "intentional logging" 2012-07-10 21:20:47 -07:00
Jean Chalard 82d5ed6fcd Small readability improvement (A100)
Change-Id: I6340748654a95d203ed43ceb9a7e6468b5b8ab1c
2012-07-11 11:19:50 +09:00
Jean Chalard 860a9f85ff Pull up some common code again (A99)
Change-Id: I9e9f5664bb12bb25d74c8a076a6ee1024c708145
2012-07-11 11:19:50 +09:00
Jean Chalard 8eaeb60e7f Pull up some identical code (A98)
Change-Id: I6c265956394cf49e74b0256dfa5af06fe6b30467
2012-07-11 11:19:33 +09:00
Jean Chalard e77f2996ea Inline a method to avoid confusion (A97)
Change-Id: I3c3ffcd3d40493f4bfa0f6596f923b3430e605aa
2012-07-11 11:19:18 +09:00
Jean Chalard cfae32c610 Remove parameters for easier inlining (A96)
Change-Id: Ied2e291393609300173681e26e82b7dd36b41bd0
2012-07-11 11:16:22 +09:00
Jean Chalard ea98e026f1 Pull up some more common code (A95)
Change-Id: I3ac7ee823471a6d1da8031e064bce38b0e5a8f5c
2012-07-11 11:15:18 +09:00
Jean Chalard b4b93dbf3e Pull up common code in the caller (A94)
Change-Id: I84b97886280eca75d5f2b7546f20f8b1bced55bc
2012-07-11 11:13:56 +09: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
Tadashi G. Takaoka 86ade47236 Merge "Initialize SubtypeLocale from Settings (DO NOT MERGE)" into jb-dev 2012-07-10 18:32:19 -07:00
Jean Chalard ff730dbd14 Merge "Remove useless member variables (A93)" 2012-07-10 04:33:32 -07:00
Tadashi G. Takaoka 20823b4623 Merge "Register the key when the finger slides off it in multitouch" 2012-07-10 04:19:40 -07:00
Jean Chalard 6f233f7ba1 Remove useless member variables (A93)
Change-Id: Iff0a0e8835f4d630b51a15c0d91881437094e785
2012-07-10 20:18:10 +09:00
Tadashi G. Takaoka 5e06b8534f Register the key when the finger slides off it in multitouch
Moved from jb-dev branch (I807fd6f4).

Bug: 6722867
Change-Id: I9764ac72f726396caaac819675d440372c882981
2012-07-10 20:14:29 +09:00
Jean Chalard 2ae75ed56b Start converging two identical methods (A92)
Change-Id: I3c85a80610fde664a328f5606d0724f00d445ebe
2012-07-10 20:13:54 +09:00
Tadashi G. Takaoka d82dcdc924 Add batch input dictionary lookup
Change-Id: I4da3c976838e8eb56c9ec80aafaaf54d759b7981
2012-07-10 20:01:28 +09:00
Jean Chalard 5e573a1f0a Remove a useless parameter (A91A)
Change-Id: I1d1758048649ef337875a5141d825569af7ad38c
2012-07-10 19:31:36 +09:00
Jean Chalard f5943153ad Cleanup old methods (A90)
Change-Id: I5435cef8ac6be523934ffa394952cb120c8e89d6
2012-07-10 19:30:46 +09:00
Jean Chalard b30d2185f2 Implement the common Dictionary interface (A89)
This will de-duplicate a lot of existing code.

Change-Id: Idaffb2fde23b9741f057bcb2ecb3dde9d12ea5c5
2012-07-10 19:30:42 +09:00
Jean Chalard a69f12a246 Reduce method visibility (A88)
Change-Id: I29d6afbcba0998558c9b19287a460d9f0e410994
2012-07-10 19:19:47 +09:00
Jean Chalard 0f57bdc0e5 Factorize code (A87)
Why was this copy-pasted :(

Change-Id: I6a537c56425ad039d7301a5fe1e0485784f07914
2012-07-10 19:19:43 +09:00
Jean Chalard 4e42e378fa Move stuff around for readability (A86)
Change-Id: I5f4a18e43f3012acf96978d625325bf7c69c9c80
2012-07-10 18:57:57 +09:00
Jean Chalard 82009901ea Add a consolidated method to the Dictionary interface (A85)
Change-Id: I5d79021e69cc738e3013e31764ab0a59e15decdf
2012-07-10 18:57:12 +09:00
Jean Chalard 2a37fb9d30 Refresh the cached single quotes count on commit
Change-Id: I9df5cf95c14da2e11ac709ca5e32dc7db3b02c37
2012-07-10 18:43:42 +09:00
Jean Chalard a9632d8173 Merge "Enhance behavior consistency (A84)" 2012-07-10 02:31:40 -07:00
Jean Chalard 184c552917 Merge "Refactoring for whitelist (A83)" 2012-07-10 02:24:58 -07:00
Jean Chalard b53e96813c Merge "Refactoring (A82)" 2012-07-10 02:24:47 -07:00
Jean Chalard 50d1b7902f Merge "Fix a bug with suggestion behavior (A81)" 2012-07-10 02:24:36 -07:00
Jean Chalard a4d346c37a Merge "Cleanup visibility in LatinIME (A80)" 2012-07-10 02:21:46 -07:00
Jean Chalard c677b0071d Enhance behavior consistency (A84)
Use the word the same way for suggestion and prediction. It makes
little logical sense that the trailing single quotes be removed
for suggestion lookup but not for prediction lookup.

Change-Id: I0de4b5f7c5b4c1b4ba1817ff9653d7c03967146d
2012-07-10 18:05:20 +09:00
Jean Chalard 1c6693a219 Refactoring for whitelist (A83)
Avoid special casing the whitelist dictionary by having it implement
the interface it pretends it implements

Change-Id: I8b873cb0f3fe13cefd32c8cb756a25c8ae16a2b4
2012-07-10 18:05:20 +09:00
Jean Chalard fb6eeeb35a Refactoring (A82)
The user history dictionary should be the one knowing it does not suggest words
beyond 2 characters, not Suggest.

Change-Id: Ie85ec6116eb495e0c7f51108e4620c5ae536f4bf
2012-07-10 18:05:20 +09:00
Jean Chalard 966efe4889 Fix a bug with suggestion behavior (A81)
Bug: 6788235
Change-Id: I5a4212872e0fd3f9e80168fd3abd5c2b3bc4110f
2012-07-10 18:05:19 +09:00
Jean Chalard a5bb353de9 Cleanup visibility in LatinIME (A80)
Many methods were public but could have been private: change them
to private. Also, add a comment above public methods that don't
come from the IMF to make it clearer why they are necessary.

Change-Id: I574154b015d09c0f8542b81763f497691afdc3c1
2012-07-10 18:05:15 +09:00
Satoshi Kataoka 7fcad7b9b6 Separate ICS-dependent code from the spell checker service
Bug: 6789576
Change-Id: Ia768258f6fa121c7a7757093eb8a20e665580865
2012-07-10 17:45:26 +09:00
Jean Chalard b98414f8fd Merge "Remove useless code (A79)" 2012-07-10 00:47:56 -07:00
Jean Chalard 29540b25f0 Merge "Simplification (A78)" 2012-07-10 00:47:10 -07:00
Jean Chalard 728c0cb251 Remove useless code (A79)
We postUpdateSuggestionStrip right away anyway - this only
makes the suggestion strip blink

Change-Id: I2ebd933e9a4c804ef1e8c62ccdaf4953a98a792e
2012-07-10 16:41:49 +09:00
Jean Chalard 09fdd30e52 Simplification (A78)
Change-Id: I622503af858ef419e94a17f182253cb03da00462
2012-07-10 16:41:47 +09:00
Satoshi Kataoka 74620f449e Merge "Create AndroidSpellCheckerSessionFactory" 2012-07-10 00:26:00 -07:00
Satoshi Kataoka 37b19ffe6c Create AndroidSpellCheckerSessionFactory
Bug: 6789576
Change-Id: I6de1e1aa64cf14f38ecb250579418bc518f0d838
2012-07-10 16:16:53 +09:00
Satoshi Kataoka 759778a751 Merge "Separate SpellCheckerSession from SpellCheckerService" 2012-07-09 23:42:15 -07:00
Satoshi Kataoka 84ed096641 Separate SpellCheckerSession from SpellCheckerService
Bug: 6789576
Change-Id: I7c55d36afad7ef6046353b3c9e849a54a6dc83ae
2012-07-10 15:34:40 +09:00
Jean Chalard fed702a0ad Merge "Move a test (A77)" 2012-07-09 23:01:33 -07:00
Jean Chalard 75e605f7ca Merge "Pull up common code in the consolidated method (A76)" 2012-07-09 22:41:33 -07:00
Jean Chalard c466cd3f99 Move a test (A77)
Change-Id: I417bd5f1318696aaa39fee18f3e750ea5c231f6b
2012-07-10 14:24:33 +09:00
Jean Chalard 32f5384fc9 Pull up common code in the consolidated method (A76)
Change-Id: I3ebecec37b49e139c243cf9da8bfe491e7ddada1
2012-07-10 14:22:12 +09:00
Tadashi G. Takaoka 80973dc76f Merge "A little optimization of InputPointers.copy" 2012-07-09 21:09:13 -07:00
Tadashi G. Takaoka 2ad6d12a30 A little optimization of InputPointers.copy
Change-Id: Id83b34e076ef91e06d7c1dd2b3ee7bb64d01b8cb
2012-07-10 13:05:43 +09:00
Jean Chalard 24e8a06f98 am 949d2ae5: am 4bcf70c9: Fix a bad interaction with mmap
* commit '949d2ae5788977c5e87e35e1bd1770f54ac88f5b':
  Fix a bad interaction with mmap
2012-07-09 20:24:01 -07:00
Tadashi G. Takaoka 7389c601e3 Merge "Add InputPointers.append() method" 2012-07-09 01:39:38 -07:00
Tadashi G. Takaoka 1087c53f5a Add InputPointers.append() method
Change-Id: Id2b0e242f7e9ce0ca888067857f8b64c02fde84e
2012-07-09 17:33:10 +09:00
Jean Chalard e4498929b0 Simple refactoring (A75)
Change-Id: Id19efc5d279616da52667fa70326b86aba70d4a0
2012-07-09 15:06:16 +09:00
Jean Chalard d579f1aefc Consolidate methods that do the same thing (A74)
Change-Id: I6e7c3aba2b40ecefa483c9680978bc806368e96e
2012-07-09 15:06:16 +09:00
Jean Chalard 347a80f793 Tiny refactoring (A73)
If !mWordComposer.isComposingWord(), then mWordComposer.getTypedWord()
will always return an empty string.

Change-Id: Ife66d0abc44c743cbc30d31724e833cda168fd5c
2012-07-09 15:06:16 +09:00
Jean Chalard 7a422a0142 Cleanup again (A72)
Change-Id: Id3765bf9826cc2c7ca70158cda53c75dc58f51c6
2012-07-09 15:06:16 +09:00
Jean Chalard 37eaa24b5a Simplification (A71)
Change-Id: I7a91d84291bea581ecc8ec5b29b9a87ccec76e7d
2012-07-09 15:06:16 +09:00
Jean Chalard dc1b84d96c Defer testing composition to a later time (A70)
This is not exactly the same logically speaking, because it's
theoretically possible that the composing state changed in between
the message enqueueing and it's retrieval. However in the practice,
if the composing state changed the message *must* have been
cancelled and resent, else the behavior breaks. So this actually
is more robust, and removes some obscure requirements on the
calling code.

In the practice, it should also make the cancelUpdateSuggestionStrip
message useless, although this change does not yet remove it.

Change-Id: I75141920ce64e38e2f92e9c02b6c979936eee9a9
2012-07-09 15:06:16 +09:00
Jean Chalard a6757f400a Code simplification (A69)
Change-Id: I2a77e437795fbbea47fd2e604ee6c26f8d0e458a
2012-07-09 15:06:16 +09:00
Jean Chalard 8f9c9377fc Consolidate two methods (A68)
Change-Id: I4b91414190b3786065ebd962a76299b605e5797e
2012-07-09 15:06:15 +09:00
Jean Chalard 146bd2e456 Pass the value we really want to pass to update functions (A67)
Change-Id: Ica9b875d119dea2f8dc237fd63e5b4eaa5e1c400
2012-07-09 15:06:15 +09:00
Jean Chalard 60dbe0be43 Preparative change to pass a boolean with known value (A66)
Change-Id: Iff03fe7c4a8eec17c00a2fe99197e0cf21a0630a
2012-07-09 15:06:15 +09:00
Jean Chalard 853f4221ab Merge "Remove useless processing (A65)" 2012-07-08 23:05:11 -07:00
Tadashi G. Takaoka 6b4ce58fc6 Remove unused WordComposer.init method
Change-Id: I46c6a6e1c1536599cb909bf81297001b238f2ec8
2012-07-06 20:12:14 +09:00
Tadashi G. Takaoka 36311cacd6 Merge "Extend onTextInput to be able to inject suggestions" 2012-07-06 03:40:03 -07:00
Tadashi G. Takaoka 4be03befe3 Extend onTextInput to be able to inject suggestions
Change-Id: I1061da0edfdb05c64c5711717d4ef9fa9681e568
2012-07-06 19:36:11 +09:00
Jean Chalard a3dee0d062 Merge "Fix a bug where spaces would be forgotten" 2012-07-06 02:09:28 -07:00
Jean Chalard 4fde56b818 Fix a bug where spaces would be forgotten
Bug: 6785706
Change-Id: Ic7bf242ef058d116b986d47ad197b6d2802e2342
2012-07-06 17:51:10 +09:00
Jean Chalard 8e36e5102e Remove useless processing (A65)
We just resetted the composing state - updating suggestions
is sure to yield no results. We may as well not call
updateSuggestions at all.
We should however still cancel any lingering timer from a
previous input field, to avoid this useless processing.

Change-Id: Ic1a19d577903d792bb797c837cc517ea8d430e75
2012-07-06 16:28:42 +09:00
Jean Chalard 449be371ae Refinement (A64)
Change-Id: I7c16e28ffce4fe0965b756bf2b00ee63b77dd039
2012-07-06 16:28:42 +09:00
Jean Chalard 43193ad60f Remove useless code (A63)
If the separator is not a space, then we will always call
setPunctuationSuggestions and reset the suggestion strip anyway.
If the separator is a space, then the cursor has a space on
the left, which means isCursorTouchingWord depends only on
whether it touches a word on the right. If we were displaying
the "add to dictionary hint", it means a suggestion was just
chosen, so it had to be displayed, and that requires a composing
word and no non-separator at the right of the cursor.

In the end, if we go through this postUpdateSuggestions call,
we are sure we will reset the suggestions later in this method,
either by calling postUpdateBigramPredictions, or
setPunctuationSuggestions.

Change-Id: I95d5f77a5d0ac6d1a6ced8d67d6ac8f650db4a32
2012-07-06 16:28:42 +09:00
Jean Chalard 8ba33c1a49 Simplification (A62)
Change-Id: I606270a0387787445b7cd6b94e4830bfc144b49e
2012-07-06 16:27:55 +09:00
Jean Chalard 66a2e96fb4 Remove useless code (A61)
Just after this, clear() will be called, removing the suggestion
strip from the screen. It will later be displayed again through
onStartInputView, which will update its content.

Change-Id: I15c23ad2adecab76b0791d7fc222d15b6533f3bd
2012-07-06 13:07:48 +09:00
Jean Chalard b1dc8ad5f2 Simplification (A60)
Change-Id: I99e912d3edfc7dd3f17ee835331d5fcba976750c
2012-07-06 13:07:48 +09:00
Jean Chalard 663dbfd1cc Simplification & UI improvement (A59)
The responsivity is better like this. This does not seem to
feel slow as the previous comment seemed to indicate.

Also remove a stale comment.

Change-Id: I4e7bf9fe28716e112db182e44b3fa88ee4526bb4
2012-07-06 13:07:48 +09:00
Jean Chalard 746e014eb5 Show predictions in the right cases (A58)
After reverting an auto-correct we always have a separator after
the previously inserted word, and the cursor is never touching
a word. Showing predictions is the right thing to do, while
calling postUpdateSuggestions will invariably yield an invariably
blank suggestion strip, which is not very helpful.

Likewise, after we pick a suggestion, we should be showing the
predictions unless showing the addToDictionary hint. There was
a bug here in the corner case that the word would be a candidate
for user dictionary, but the user dictionary provider is not
available: in this case we should be showing predictions, but
we were showing an unhelpful empty suggestion bar.

Change-Id: I287bb5eb4af762bd5a433e85e185fab6d203e91a
2012-07-06 13:07:48 +09:00
Jean Chalard 0e9e7e337d Cleanup (A57)
We stopped cancelling manual picks a few weeks ago. This code
is dead.

Change-Id: I4032fcc3c95e9379f1839fe860a1b8a9bd7d0bc7
2012-07-06 13:07:30 +09:00
Jean Chalard 29eeef75ec Merge "Fix a bug where the caps mode would not be changed" 2012-07-05 19:11:28 -07:00
Jean Chalard f254e3fec7 Fix a bug where the caps mode would not be changed
Bug: 6766059
Change-Id: I378f9d35c4904c4f373260bda5863235d833eb31
2012-07-06 11:08:20 +09:00
Jean Chalard d81e7d24d3 Simplification (A56)
If suggestion and prediction messages both happen to be in
the queue, the latest one will win (update the suggestion strip
later than the other, overwriting any previous suggestions).
So when we enqueue either one, it is always safe to cancel
all messages of both types.

Change-Id: Iad9dd06d08c49f60cac16b88edcc9531a18ec02e
2012-07-05 18:19:51 +09:00
Jean Chalard 414f14436e Remove an unused method (A55)
Change-Id: I9974b88923b85cd6bec74f7607067c660f36f040
2012-07-05 18:10:37 +09:00
Jean Chalard c84f178cd9 Merge "Remove a useless method, rename another. (A54)" 2012-07-05 02:05:50 -07:00
Tadashi G. Takaoka 92d2f7e03b Merge "Initialize SubtypeLocale from Settings" 2012-07-05 02:04:35 -07:00
Jean Chalard 792e7ddc24 Merge "Remove a redundant test (A53)" 2012-07-05 01:57:04 -07:00
Jean Chalard 9636735c0a Merge "Small simplification (A52)" 2012-07-05 01:56:55 -07:00
Jean Chalard 21524c755c Merge "Put some more code in common (A51)" 2012-07-05 01:50:44 -07:00
Jean Chalard 71d7fc91b7 Merge "Pull up a common variable into the wrapping method (A50)" 2012-07-05 01:47:59 -07:00
Jean Chalard ac3ad6ef9f Merge "Factorize some common code (A49)" 2012-07-05 01:45:08 -07:00
Tadashi G. Takaoka bffa6cc1b2 Initialize SubtypeLocale from Settings (DO NOT MERGE)
Bug: 6781106
Change-Id: Ic1b2b8363486820eabaa415ab3812c0e8565b7bb
2012-07-05 17:40:13 +09:00
Tadashi G. Takaoka d6ac0443f0 Initialize SubtypeLocale from Settings
Bug: 6781106
Change-Id: I22f04af4fabf93346ab6f72c1841f096afaccb96
2012-07-05 17:39:30 +09:00
Tadashi G. Takaoka 15d3532170 Merge "Fix tab key's navigation behavior" 2012-07-05 01:24:00 -07:00
Jean Chalard 3d8e7a62fc Remove a useless method, rename another. (A54)
Change-Id: If36b5375b04f68deeb72bcece3cb8d37aed57f59
2012-07-05 17:22:15 +09:00
Jean Chalard 0783366036 Remove a redundant test (A53)
Change-Id: If711074fdcb586e35d02e421c845f2c9024ca718
2012-07-05 17:22:04 +09:00
Jean Chalard 4cba560dbb Small simplification (A52)
Change-Id: I56bc5b9b584de5a14b41fc32c19f7fefb3b12e88
2012-07-05 17:22:00 +09:00
Jean Chalard ea80794dd4 Put some more code in common (A51)
Change-Id: If1589e29728df20713c75e08df7f47f0de9202d4
2012-07-05 17:21:55 +09:00
Jean Chalard cbfd2e1fdb Pull up a common variable into the wrapping method (A50)
Change-Id: I0b62098308169b5c44ced25ffb902766e3732fbf
2012-07-05 17:21:51 +09:00
Jean Chalard 7ed22f1f72 Factorize some common code (A49)
Also add some comment to clarify what's happening inside those
methods

Change-Id: I5b9b1e105b3145f0b050f35d12c5b6ca6e4a4d8c
2012-07-05 17:21:44 +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
Tadashi G. Takaoka 133bb8544a Merge "Fix upper case Eszett more key" 2012-07-05 00:52:08 -07:00
Tadashi G. Takaoka 5946838b8e Fix upper case Eszett more key
Bug: 6773873
Change-Id: I1a533c729c312a53663fb142cb6fcb4915b53206
2012-07-05 16:13:52 +09:00
Jean Chalard 0726f466f7 Merge "Add a wrapper to updateSuggestions / Predictions (A48)" 2012-07-04 21:08:21 -07:00
Tadashi G. Takaoka 7aeb7ef1ab Merge "Fix Keyboard.getKey as thread safe" 2012-07-04 19:58:17 -07:00
Tadashi G. Takaoka 8f6c603b3b Fix Keyboard.getKey as thread safe
This is a follow up of Id962e670.

Change-Id: I9e8542bff9e8faf57f934051fe612463c99ad61f
2012-07-05 11:43:43 +09:00
Jean Chalard e47c728dd5 Add a wrapper to updateSuggestions / Predictions (A48)
The goal is to have those converge, as they contain almost 100%
duplicated code.

Change-Id: I6921791d47efce9fb396efd9626839d706664a91
2012-07-05 11:10:04 +09:00
Jean Chalard 7b40c68277 Refactoring which will help with future changes (A47)
Change-Id: Ibc2d28f9f95966f77d4d7bdf9ae4688baaed5989
2012-07-05 11:10:02 +09:00
Jean Chalard e9a86e2cdb Search bigrams for the lower case version of the word (A46)
...if there aren't any for the exact case version.

Bug: 6752830
Change-Id: I2737148b01ba04a64febe009ceb2ef53c265d224
2012-07-04 20:12:58 +09:00
Jean Chalard 4bcf70c931 Fix a bad interaction with mmap
Bug: 6761221
Change-Id: I7e6d98dc9d7cb34a6163c3957e401ff97abb975c
2012-07-04 17:57:06 +09:00
Tadashi G. Takaoka ac3bd96192 Merge "Remove WordComposer.add(int, int, int, KeyDetector) method" 2012-07-04 01:48:42 -07:00
Tadashi G. Takaoka 5c641a9f59 Remove WordComposer.add(int, int, int, KeyDetector) method
Change-Id: Ie6af46acba18a2d1cf3ddd1578d60ded4c90f89a
2012-07-04 17:29:47 +09:00
Tadashi G. Takaoka 5c98206dc5 Merge "Use Keyboard.getKey" 2012-07-04 01:12:02 -07:00
Tadashi G. Takaoka adc80eef15 Use Keyboard.getKey
Change-Id: I722b9e981389f660db928b7fd5ced1b82371fbf3
2012-07-04 16:31:57 +09:00
Tadashi G. Takaoka 040aa28ed4 Merge "Get rid of redundant CharSequence member from SuggestedWordInfo" 2012-07-04 00:27:07 -07:00
Tadashi G. Takaoka f3897fb54e Get rid of redundant CharSequence member from SuggestedWordInfo
Change-Id: Ie8792f4f5d3593c25c992fc72cf219daeaa70beb
2012-07-04 16:04:59 +09:00
Jean Chalard c5e911c06b Consolidate a method inside another (A45)
It's simpler to check the safety net directly inside the
function that checks for auto-correction threshold.

This introduces one very slight change in behavior. The value
checked by the safety net is not any more the "typed word" but the
"considered word", the difference being any possibly appended
single quotes.
E.g. the user types "this'''" : the typed word is "this'''" but
the considered word is "this".
This change in behavior can be considered a bugfix.

Change-Id: Ia7ab4bc933183dfbd41bb00328e4c0b5ab76bc63
2012-07-04 11:51:51 +09:00
Jean Chalard f72b8f5662 Move the safety net function to AutoCorrection (A44)
Change-Id: Iec791d061f237f60992dd6048c4a37b46f4cb9aa
2012-07-04 11:51:46 +09:00
Jean Chalard accd63f35f Merge "Refactoring (A43)" 2012-07-03 19:40:19 -07:00
Jean Chalard b87b23eb75 Merge "Remove useless code (A42)" 2012-07-02 18:56:41 -07:00
Jean Chalard 6547f43666 Merge "Clarify some code and fix a bug (A41)" 2012-07-02 18:52:56 -07:00
Jean Chalard d6496c0913 Merge "Fix a bug with the user dictionary locale." 2012-07-02 02:57:50 -07:00
Jean Chalard d113fd0be4 Fix a bug with the user dictionary locale.
We internally use the string "zz" to mean no locale, but
the user dictionary service does not understand that and
words added with this locale pitifully end being added to
a "zz" user dictionary, which makes no sense to the user.
This change fixes things so that words added when the
keyboard is in a "no locale" layout, the words are added
to the global, all-locales user dictionary.

Bug: 6645306
Change-Id: Iec3cdd1fe3d5bc43427a43ef9ae9bf89e12be1f2
2012-07-02 17:14:47 +09:00
Jean Chalard 4ca05e2474 Refactoring (A43)
Change-Id: Ib0b6f36999518096819ada2f19365767cb5f9931
2012-07-02 15:46:11 +09:00
Jean Chalard 7ad088a4cf Remove useless code (A42)
If allowsAutoCorrected is false, there is no point in making
hasAutoCorrection true, since in the only place where we use
it again, it's &&'ed with allowsAutoCorrected !

Well that was extremely obscure, good thing refactoring allowed
to realize this was useless >.>

Change-Id: I34936d445f1ced17c7bd04a9524bf608f9e8b9c8
2012-07-02 15:46:08 +09:00
Jean Chalard 90d300c770 Clarify some code and fix a bug (A41)
The test against hasMainDictionary is a test to know if we should
auto-correct or not. Its result should be recorded in
hasAutoCorrection, not in allowsToBeAutoCorrected.

Actually, this value being inserted in allowsToBeAutoCorrected was
causing a bug that nobody noticed: when typing in a language with
no dictionary, the word in the middle of the suggestion strip would
always be bold, as if it was going to auto-correct to itself !
This change fixes this bug.

Change-Id: Ia1f08efd7089b9c5cbede910c5b0951d83e698d2
2012-07-02 15:46:03 +09:00
Jean Chalard 2631e3b195 Small refactoring (A39)
Change-Id: I3c45b5a6571f986acc7adb3a8fe17b210303f7ea
2012-07-02 15:45:58 +09:00
Jean Chalard 79f5317848 Match calls for future consolidation (A38)
Change-Id: I2b2ab99e801fa8b4b30eab16a8aefb8cfe104ba9
2012-07-02 15:45:54 +09:00
Jean Chalard cd288620ea Make the autocorrection scheme more straightforward (A37)
Change-Id: I4833ca7e057b8c1f1f22390673cbca0d2433b1bd
2012-07-02 15:45:34 +09:00
Jean Chalard aba432bf8d Remove a duplicate method (A36)
Bug: 6705473
Change-Id: Ib6260034b09739b60071e90a018b2dc6be3815d7
2012-07-02 12:12:16 +09:00
Jean Chalard 84074cf503 Update log and make a variable private (A35).
Change-Id: Ib4a8f41dc5941bce46402e1a41a6c21dccb0601f
2012-07-02 12:11:27 +09:00
Jean Chalard 1842fbba93 Remove old debug code that has been long broken (A34)
Change-Id: I9b5a0e34529724984aad1e2bf99b3e00f8ed0dd7
2012-06-29 19:47:00 +09:00
Satoshi Kataoka 105069a15f Merge "Add input pointers" 2012-06-29 03:03:01 -07:00
Satoshi Kataoka 71538b08e4 Add input pointers
Change-Id: I95300bf0a847fb86d026e846ff4ad723bb45284f
2012-06-29 18:58:51 +09:00
Jean Chalard f2af726f79 Merge "Add a more synthetic variable (A33)" 2012-06-29 02:22:05 -07:00
Jean Chalard aa246f23ce Merge "Remove cruft (A32)" 2012-06-29 02:12:47 -07:00
Jean Chalard defc2e2efa Merge "Simplification (A31)" 2012-06-29 02:09:16 -07:00
Jean Chalard 7a6ac44f5f Merge "Small refactoring (A30)" 2012-06-29 02:09:06 -07:00
Tadashi G. Takaoka e0b7359126 Merge "Use SparseArray<E> instead of HashMap<Integer,E>" 2012-06-29 02:05:39 -07:00
Tadashi G. Takaoka 56853c1e48 Use SparseArray<E> instead of HashMap<Integer,E>
Change-Id: Id962e670ee1a5164e6c69deb84625139bf5e7974
2012-06-29 17:56:31 +09:00
Jean Chalard 1b2e2d893d Add a more synthetic variable (A33)
The goal here is to disambiguate TypedWordValid and
HasAutoCorrectionCandidate. Ultimately, HasAutoCorrectionCandidate
will disappear.

Bug: 6705473
Change-Id: I1acbd0a5efc7f4bf7b0bdb12839fe3d84e9d1dda
2012-06-29 17:00:57 +09:00
Jean Chalard 9011b89f4e Remove cruft (A32)
Change-Id: I35c2ba4caf6be4ba0449e11c0597ae8e468c0e6e
2012-06-29 17:00:57 +09:00
Jean Chalard 2cda148fd5 Simplification (A31)
Change-Id: I9e4d030974ccec1a6256de6ca87610870e404149
2012-06-29 17:00:57 +09:00
Jean Chalard deb2d88245 Small refactoring (A30)
Change-Id: I41b413986a3c5bb6697bb7bbced17ed1e361913c
2012-06-29 17:00:57 +09:00
Jean Chalard 0a63111821 Remove a useless parameter (A29)
Change-Id: I52625e707abf61da9b95e542f0814c66b532f483
2012-06-29 17:00:56 +09:00
Jean Chalard 4f444410f2 Remove a useless variable (A28)
Change-Id: I1058123d233540fb72a94028987a43740224f635
2012-06-29 17:00:56 +09:00
Jean Chalard f4267c0521 Fix a small bug (A27)
TypedWordValid and AllowsToBeAutoCorrected are almost the
same thing; the difference is whether the word is also a
whitelist entry or not. In this case, TypedWordValid was
the right one to test.

Change-Id: I695fe5b9f6bbe9d3ba314c646da3a25742c9f4ed
2012-06-29 17:00:56 +09:00
Jean Chalard 9e0af57736 Optimization (A26)
Change-Id: I1d7790289635729645995fb8c38868259ab1b3be
2012-06-29 17:00:56 +09:00
Jean Chalard 7a94cbd2a4 Remove useless code (A25)
isWhitelistedOrNotAWord takes an 'ignoreCase' argument. By looking
at the contents of the wordcomposer here, there is only one case
where its output will be different : when the word is typed with a
capital, but the lower case version exists in the dictionary.
E.g. the user typed "This".

In this case, isWhitelistedOrNotAWord in line 235 will return false
instead of true, so the test will score a true instead of a false,
so hasAutoCorrection may be true instead of false in this specific
case and that's the only case where it's different.

But in this case, allowsToBeAutoCorrected is certain to be false,
which means the result will not have changed if hasAutoCorrection
was true in the first place. So in the end this change is sure not
to change the behavior.

Change-Id: Ic41cf959c20c19165f84d9b8ff006731fa595d84
2012-06-29 16:57:56 +09:00
Jean Chalard b3cfde2cbb Add a few comments for future reference (A24)
Change-Id: Ia356130b8a95ec9cf676bc6be05d801c13f14b64
2012-06-29 15:45:27 +09:00
Jean Chalard e398c6c024 Rename a method for readability (A23)
Change-Id: I6f569322e645d36bc82fddf4ec2fd621972e3b47
2012-06-29 15:45:24 +09:00
Jean Chalard ea578f6b1d Revert a test for readability (A22)
Change-Id: I1df4cef5ae2736a22273843dce67f0012181bfd3
2012-06-29 15:44:55 +09:00
Jean Chalard 19d02c19d0 Remove a useless variable (A21)
Change-Id: I901e6b0e2b994128da19d68233b9f68bb308cb95
2012-06-29 15:44:17 +09:00
Jean Chalard 1333579b4b Don't special-case 1-letter words (A13)
There is no reason to prevent 1-letter words to auto-correct
to themselves, or to dictionary words. Don't do it.

Change-Id: Iceada847ae632336026ada29afed0353cd9c51b5
2012-06-29 15:12:51 +09:00
Jean Chalard 4d5e7235c5 Remove a useless variable (A20)
Change-Id: Ifc37462f5243563693c8cd7cbeb401ff054daa52
2012-06-29 15:12:51 +09:00
Jean Chalard d426941ee8 Fix a theoretical bug (A12)
If a word is a dictionary word but still has no suggestion,
this method should return true. In the practice, it makes
no difference since a word without suggestion won't be changed
anyway.

Change-Id: Ib1f5ef254b7da7e5cedb2f973529ad431beb93f9
2012-06-29 15:12:51 +09:00
Jean Chalard 739683dcfb Rename a method for readability (A19)
Change-Id: I0b8c06d1fd0bfb3caf363c048acc7048abed1752
2012-06-29 15:12:51 +09:00
Jean Chalard 31b346aac6 Remove a useless test (A18)
allowsToBeAutoCorrected always returns false if the word is empty.
This is because the whitelist never contains an empty string,
and isValidWord returns false if the word is empty.

Change-Id: I34ecc2a1563aea6db5b2f12796f251f6598576a2
2012-06-29 15:12:51 +09:00
Jean Chalard b01cdb975a Inline a method (A17)
This will allow us to remove unnecessary processing

Change-Id: I251dfdaffb077906186686ebe65fd82e1e360bd2
2012-06-29 15:12:51 +09:00
Jean Chalard 42dde06782 Make a function a one-liner (A16)
...to better inline it

Change-Id: I88496b8f18b81f0c05e4bbf2d1039de1f93e0c25
2012-06-29 15:12:51 +09:00
Jean Chalard a96a11949f Inline a simple method (A15)
Change-Id: Ib74fcbf33c680bf02c39a9896e30e3afbcfd149a
2012-06-29 15:12:51 +09:00
Jean Chalard 074c90af98 Inline a method (A14)
The new code is worse than the old one, but this is a necessary
step to make things prettier.

Change-Id: If6e8a139bb85e6920c749743c78792a22a8acb45
2012-06-29 15:12:51 +09:00
Jean Chalard 9701b360d9 Rename a terribly-named method for clarity (A11)
Change-Id: Id180000404dc6929d80f98c0e9cd2026230ad2d1
2012-06-29 15:12:50 +09:00
Jean Chalard 6b911c27a3 Merge "Small readability improvement (A10)" 2012-06-28 23:11:23 -07:00
Jean Chalard f89a75134b Small readability improvement (A10)
Change-Id: Iba326921711e1c4eab38264e66b6b44a64fec398
2012-06-29 15:05:08 +09:00
Jean Chalard 305326e789 Refactoring and add debug prints (A9)
Change-Id: I46497bff107f0def0dfa2b043b20d9a0b0cde040
2012-06-29 14:24:54 +09:00
Jean Chalard 5110e2cb51 Optimization (A8)
Change-Id: I2b9e8cc6a13fd9af84a5189e4d3fbb2b05c68d46
2012-06-29 12:54:11 +09:00
Jean Chalard 4847a27f74 Cleanup (A7)
Change-Id: Iba97e0062b702c005ab3ff9ce59f181d19ab7c98
2012-06-28 19:13:16 +09:00
Jean Chalard ed83d4b143 Stop special-casing a single suggestion (A6)
Treat it like the others

Change-Id: Ic24e40ada0e75773c3ece9470ab61c350697be5d
2012-06-28 19:12:37 +09:00
Jean Chalard 251bb70f08 Cleanup (A5)
Change-Id: I06134145b47c46bbc6c340ca539f34a01e2ca163
2012-06-28 19:12:37 +09:00
Jean Chalard 4c4e3a0949 Transform the whitelist suggestion like the others (A4)
...instead of having a different code path

Change-Id: Icd177e2151e45d25300000d4b63d4fba1f52b6a8
2012-06-28 19:10:32 +09:00
Jean Chalard 33b3805e79 Small refactoring (A3)
This will help make upcoming changes clearer

Change-Id: Ida8d4935f7315e5da6007ad364124694da3112d0
2012-06-28 19:10:24 +09:00
Jean Chalard b7cdafd78a Don't pass everything to a function that needs only the head (A2)
Change-Id: Ic367836202ab8071c1a9a02eaf0651b0da947d51
2012-06-28 19:10:13 +09:00
Jean Chalard 09b30ac954 Merge "Use a TreeSet to sort suggestions instead of doing it by hand (A1)" 2012-06-28 03:08:26 -07:00
Jean Chalard 2d2e348033 Use a TreeSet to sort suggestions instead of doing it by hand (A1)
Change-Id: I16ba39321107e87ad48a99c2410a15995a66f23c
2012-06-28 18:54:14 +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
Jean Chalard 10abf10c1f Convert local members to local variables
Change-Id: I852787986c79502a4de7effe9c8281a4cf2d519d
2012-06-27 19:54:29 +09:00
Jean Chalard 3ecb2747b3 Optimization.
It's useless to do this for all suggestions including those
that will be ousted from the list.

Change-Id: I7bd63d783e21984a269e4b1ae17e9b9d8c0859e3
2012-06-27 18:55:43 +09:00
Jean Chalard 3705ef407b Read the suggestion type from the suggestion
...instead of dirtily passing it from the dictionary loop

Change-Id: I92ddbd7451609b69f6d4dc31bf89d614423b2016
2012-06-27 18:18:35 +09:00
Jean Chalard 24eec0fa68 Remember the source dictionary for each suggestion.
Change-Id: I3c63372bd5572a479a67eaecfe8c8ea1cabc70d9
2012-06-27 18:17:28 +09:00
Jean Chalard d8f0caa406 Move constants to a better place.
Change-Id: I5c27a3ed99b17f850e26a8503de16f001c7111c1
2012-06-27 18:08:08 +09:00
Jean Chalard 089c11a086 Cleanup
Change-Id: I575f22330bf6881af1d9a35f22b51b7bf2198113
2012-06-27 17:59:58 +09:00
Jean Chalard b5afd3de0c Remove unused stuff.
Change-Id: Ifd0d5b6978f76b841574a6e10157c32d0cd656b6
2012-06-27 17:44:16 +09:00
Jean Chalard 05efe576f9 Cleanup the dictionary type.
Stop storing an int in each of the different class types, and
just store a string in the top class.

Change-Id: I2af1832743e6fe78e5c1364f6d9cc21252bf5831
2012-06-27 17:31:09 +09:00
Jean Chalard c356df8e08 Merge "Update the prototype of onAddSuggestedWord - calling side." 2012-06-27 01:25:59 -07:00
Ken Wakasa e55c23e4b0 Small cleanups
Change-Id: Ic1a198ab1b4f0323fde9e4245729fd0e6011b914
2012-06-27 16:54:37 +09:00
Jean Chalard 32ff2504a0 Update the prototype of onAddSuggestedWord - calling side.
We want to get rid of all those IDs in Latin IME.

Change-Id: Ibe08100a5e2976c80abb049889233b4047a686f3
2012-06-27 16:17:14 +09:00
Jean Chalard 2db27bcd06 Merge "Use binarySearch instead of a hand-written linear search" 2012-06-26 23:55:46 -07:00
Jean Chalard 78a8d5b6bc Merge "Implement a comparator for SuggestedWordInfos." 2012-06-26 22:55:51 -07:00
Jean Chalard 56beb9e321 Use binarySearch instead of a hand-written linear search
Yay.

Change-Id: Icf686eb2d675da959f19edc856b521e6288dcea3
2012-06-27 14:17:29 +09:00
Jean Chalard 9da0027b38 Implement a comparator for SuggestedWordInfos.
Change-Id: Ic4b0ae05cd98a1aec5806c5e4b744158e73aea7a
2012-06-27 14:16:23 +09:00
Kurt Partridge 30447239e8 Merge "only output every kth word to log" 2012-06-26 20:49:03 -07:00
Jean Chalard 4ef01c51f8 Merge "Remove some special casing" 2012-06-26 20:33:43 -07:00
Kurt Partridge e961188e9f only output every kth word to log
multi-project CL with Ib5b544b9b2d8b0e4419238976b2e274e5ac564f8

Bug: 6188932
Change-Id: Iea68cf36924d6fda126130a98431a6ce02ba251e
2012-06-26 16:15:20 -07:00
Jean Chalard 7e49a2b6b8 Remove some special casing
This special casing is useless. If the word is the same as what
user typed, the scoring algorithm already ensures that it comes
out at the top. Actually, as is written in a comment here, code
executed later is actively relying on this suggestion having
the top score ! There is no need to test it for equalness and
inserting it at the top then.

Change-Id: I263a6de59b77ec72a2dcbb933361b8e16fca0681
2012-06-26 20:40:42 +09:00
Jean Chalard a3f5f51ec4 Fix a bug where a log would mysteriously not work
Change-Id: I5ca77ed65e95a6d357215c0e730238fb463986bb
2012-06-26 20:36:51 +09:00
Jean Chalard 22657dcba0 Optimization.
We already had that computed

Change-Id: I2a9742eaee2e9db1f73aeddda7bae7e237b4d15c
2012-06-26 20:02:07 +09:00
Jean Chalard ec8b27fe49 Cut out a method for clarity
Change-Id: I1dc668698a5cd840297e713a26a525f5e32d35d6
2012-06-26 19:49:01 +09:00
Jean Chalard 0131170da9 Merge "Avoid string conversions when possible." 2012-06-26 03:48:01 -07:00
Jean Chalard 5953dc93cf Avoid string conversions when possible.
Change-Id: Ibf5f3e40da55998364d0d835ecf283f32c80fcf5
2012-06-26 19:45:52 +09:00
Jean Chalard 5d218bc029 Merge "Simplify a method call." 2012-06-26 03:45:02 -07:00
Jean Chalard bed514bd90 Simplify a method call.
Change-Id: Ieede787a13cef79353f13af52488ef3732ac9850
2012-06-26 19:33:16 +09:00
Jean Chalard 61c1002b6b Merge "Refactor and squash long-standing bugs (A2)" 2012-06-26 03:19:20 -07:00
Tadashi G. Takaoka abf81192ff Merge "Remove unnecessary variables" 2012-06-26 03:16:17 -07:00
Tadashi G. Takaoka 342ea3d324 Merge "Pass MotionEvent to PointerTracker" 2012-06-26 03:16:12 -07:00
Jean Chalard 9433ce86b7 Refactor and squash long-standing bugs (A2)
This is awesome.
- Improve performance by stopping useless string/array conversions.
- Simplify method interface.
- Fix localization bugs - we now know our locale
- Fix bugs with surrogate code points

Bug: 4769095
Change-Id: I8a8ee224b713429ee0a4ce5bd52f1b63378cf56f
2012-06-26 19:12:07 +09:00
Tadashi G. Takaoka 3314d38daf Pass MotionEvent to PointerTracker
This is a one of groundwork to integrate gesture input.

Change-Id: I5b75c6978b51df91fdc384a9f6d1d5a5ddc563e2
2012-06-26 19:05:47 +09:00
Jean Chalard a8c9946b44 Merge "Remember the locale in the Suggest object (A1)" 2012-06-26 03:05:05 -07:00
Tadashi G. Takaoka 7bb8e95b52 Merge "Cleanup PointerTracker debug method" 2012-06-26 03:03:49 -07:00
Tadashi G. Takaoka 0d9d37cec2 Remove unnecessary variables
Bug: 6722052
Change-Id: I92e85b3e49b8f4b228f0cf0994216c5050e0865c
2012-06-26 19:01:59 +09:00
Jean Chalard 8e17f6d93a Remember the locale in the Suggest object (A1)
This will be necessary for uppercasing and titlecasing words
correctly.

Change-Id: I0f446a4c82bc482240ff730a2ad6586a61571d6b
2012-06-26 18:55:18 +09:00
Jean Chalard 6cad198d9c Remove a useless member (A2)
Change-Id: Ia727ffc2946352bbf79e0c97684f8fa98f428cef
2012-06-26 18:42:06 +09:00
Jean Chalard 0da9a7c094 Convert a member to a local variable (A1)
Change-Id: I9eab910989443704f83711cf4fb0070c5987a13a
2012-06-26 18:41:49 +09:00
Tadashi G. Takaoka d7edd1cbb5 Cleanup PointerTracker debug method
Change-Id: Ib3bfa0a46f5814a6df838005d7243e2f536a98a0
2012-06-26 18:36:30 +09:00
Jean Chalard f05392f213 Remove an unused method (A22)
Change-Id: I2195f365df1799c8b3b2a53670d1df535ab1a742
2012-06-26 17:59:04 +09:00
Jean Chalard 6234be1fe7 Simplification and optimization (A20)
Change-Id: Ia837e553ccfe67cd4303096290194a5186df059b
2012-06-26 17:59:04 +09:00
Jean Chalard 77e95e60bb Preparation for a simplification (A19)
Change-Id: I4605a571faf5fbc68b18ce525d6019600bfa8cf7
2012-06-26 17:59:04 +09:00
Jean Chalard 0a79446531 Remove a meaningless separation (A18)
Change-Id: I267177044c7d7b0d9119839a11057b2bbf41f75f
2012-06-26 17:59:04 +09:00
Jean Chalard 61e7ec6587 Remove the Callback interface for simpler code. (A17)
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530

Change-Id: I009b54fc2e73cadca6734bdca074d033e81f6a2b
2012-06-26 17:58:52 +09:00
Jean Chalard 2f1b6c9ea4 Remove the callback argument to getBigrams() (A16)
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: I7457ac04f8cd4019fb86c986725aae3de1b1a65e
2012-06-26 17:54:49 +09:00
Jean Chalard 60eed92dc3 Remove the callback argument to getWords() (A15)
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: I919bf70a1213ab5d7c7a9e5715bd72a6e257148b
2012-06-26 17:36:47 +09:00
Jean Chalard 2225b3bace Do away with Utils#addAllSuggestions (A14)
It's not used any more.

Change-Id: Id9da40fdbf7078f3ac647d1368237d6601f5a2ba
2012-06-26 17:36:47 +09:00
Jean Chalard d9df8094e6 Neutralize AndroidSpellChecker.SuggestionsGatherer#addWords (A13)
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: Ia54e1e44e1fd4e8ba2c9316928c0595cbe3f933c
2012-06-26 17:36:47 +09:00
Jean Chalard 7830476022 Neutralize Suggest#addWords (A12)
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: Id923367342a62a650a5f1d38e2fa0e913030dca8
2012-06-26 17:36:47 +09:00
Jean Chalard fd998bd37a Refactoring (A11)
Change-Id: I86bd7587dd80773a51ba6db312ba55dc41e7c8c7
2012-06-26 17:36:47 +09:00
Jean Chalard 64dad2d5a9 Remove an unused method and inline another (A10)
Change-Id: Ifd71ce79711b0c15c7764e97351dbb1b8e4c0c2d
2012-06-26 17:36:47 +09:00
Jean Chalard d522ddefc2 Merge "Merge the interface of two methods that do the same thing (A9)" 2012-06-26 01:35:15 -07:00
Jean Chalard 90981e423a Merge "Change the return type of getWords and getBigrams (A8)" 2012-06-26 01:33:04 -07:00
Jean Chalard 9053862470 Merge "Remove dependency on WordCallback from BinaryDictionary (A7)" 2012-06-26 01:16:43 -07:00
Jean Chalard b9f99c8679 Merge "Remove useless code and storage (A6)" 2012-06-26 01:16:32 -07:00
Jean Chalard 8fb0ff00b1 Merge "Remove a duplicate processing (A5)" 2012-06-26 01:16:19 -07:00
Tadashi G. Takaoka 1c6a9cc44d Merge "Update current key reference in PointerTracker when keyboard is changed" 2012-06-26 00:58:16 -07:00
Jean Chalard 28eeb35d14 Merge the interface of two methods that do the same thing (A9)
Change-Id: Ia5701d713d0fd5bb646b54a03a1a5602dad0a9e6
2012-06-26 16:55:09 +09:00
Jean Chalard d82898c5a9 Change the return type of getWords and getBigrams (A8)
This only returns stuff, but it doesn't change yet how the data
is really passed. It merely adds a way of getting the same data.
Later, the old way will be removed.

Change-Id: If3a064de362175fc5a6781b7a97b65d8730aaf3c
2012-06-26 16:44:26 +09:00
Jean Chalard bda7eaa63a Remove dependency on WordCallback from BinaryDictionary (A7)
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: I8245698fbd170e0f5cbad3c0109774bcaddc0614
2012-06-26 16:42:48 +09:00
Jean Chalard 17111afcd6 Remove useless code and storage (A6)
This is only used as temporary storage to be then added to
the other variable, relying on the fact that it is hopefully
sorted. It's better to just add it right away to the final
storage.

Change-Id: I5da702ac9dc579593ab21feb2021a01e5dfdf4dc
2012-06-26 16:39:32 +09:00
Jean Chalard 5e0545d69d Remove a duplicate processing (A5)
This filtering is already done in native code. It's useless (and
costly) to do it again here.

Change-Id: Ide6794d7a8682a881f097f33e222f10d30f297bd
2012-06-26 16:37:05 +09:00
Jean Chalard fac8a16c6f Merge "Remove another dependency to WordCallback (A4)" 2012-06-25 23:31:39 -07:00
Tadashi G. Takaoka 8a092b4ede Update current key reference in PointerTracker when keyboard is changed
This change also checks that the current key is the same key that
started the key repeat, when key repeat timer is fired.

Bug: 6722052
Change-Id: Id69880ded3338a5a3cbe7f8bf951f94f2651119c
2012-06-26 15:00:12 +09:00
Kurt Partridge 3ec249c6d1 Merge "fix IllegalOutOfBoundsException" 2012-06-25 22:52:36 -07:00
Kurt Partridge 01106f6a10 fix IllegalOutOfBoundsException
StringUtils.toCodePointArray() had thrown IllegalOutOfBoundsException if
passed an empty string.  change to just return an empty int[].

Bug: 6188932
Change-Id: Ic41c628c0d407f49fc98cd48cb7ea13d8d5bdd77
2012-06-25 22:40:56 -07:00
Jean Chalard d7b9e8f503 Remove another dependency to WordCallback (A4)
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: I5b277124dc9244e78c4a1f4d542a55071eb479bd
2012-06-26 13:12:01 +09:00
Ken Wakasa 9f78eed456 Remove "Key popup dismiss delay" when "Popup on keypress" is suppressed
bug: 6714783
Change-Id: Idf674e8e1af80642f2c53f7ae5c03e21c9e04292
2012-06-26 00:40:53 +09:00
Satoshi Kataoka 7368009799 Change JNI for Gesture
Change-Id: I774a0052038d16677f60f7efa11fd266cb5f3088
2012-06-25 18:54:37 +09:00
Jean Chalard 5a73d72265 Merge "Refactoring and groundwork to fix a bug with older apps" 2012-06-25 00:42:21 -07:00
Jean Chalard c3ebf1a43a Refactoring and groundwork to fix a bug with older apps
This has a good, although small, impact on performance : it removes
a two-way IPC call in a most frequent case, while possibly adding
one in a rather unfrequent and less critical case.

Also, this fixes a bug with surrogate pairs. This specific branch
of code now correctly handles surrogate pairs.
Aside from this, it should have no impact on behavior.

However, since it does delay access to the previous character in
the text view by a two-way IPC call, it actually goes a long way
toward fixing bug#6668226. It is not really a fix and the race
condition still exists, but this change makes it much, much
harder to hit.

Bug: 6668226
Change-Id: Id11cc6a0b7488d6bd392227cafdcf3a8d4c62f6c
2012-06-25 16:32:25 +09:00
Jean Chalard a316a15984 Merge "Tentatively remove a dependency on WordCallback (A3)" 2012-06-24 23:08:13 -07:00
Jean Chalard dc01bd5ea4 Merge "Improve compatibility for ICS." 2012-06-24 20:41:19 -07:00
Satoshi Kataoka 2cf265b345 Merge "Fix possible NPE from a concurrent problem in LatinIME" 2012-06-21 22:16:48 -07:00
Kurt Partridge e6a39d5677 Merge "Allow punctuation through privacy filter" 2012-06-21 21:53:48 -07:00
Kurt Partridge 33d9f9b6db Allow punctuation through privacy filter
Also cleaned up the privacy code a bit.

multi-project commit with Change-Id: Ic0919a6929ebb2623ff4124f7adc96d9e5f8df3c

Bug: 6188932
Change-Id: Id470fe7cc6e4a8fb01f1ea5b178a74cd27d59218
2012-06-21 00:17:48 -07:00
Jean Chalard 1b71ff00a2 Merge "Update an outdated comment" 2012-06-20 20:18:51 -07:00
Jean Chalard 9997b44846 Improve compatibility for ICS.
ICS didn't have a SHORTCUT column in the user dictionary.
If running on a build under JellyBean, we should not ask
for it lest we crash.

Bug: 6600617
Change-Id: Iac0cbcc63c10064f01e2d51eec5931fd9cdd0922
2012-06-20 18:43:56 -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
Jean Chalard 7c406ed655 Tentatively remove a dependency on WordCallback (A3)
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530
Change-Id: Id5a59eaec2aeefa0ba4524420a8e035d383f6545
2012-06-21 10:03:44 +09:00
Jean Chalard e8bb8351d6 Cleanup, part 9 (C9)
Change-Id: Ifb15553824915d0634aea83689302c2418b093f3
2012-06-21 09:22:32 +09:00
Jean Chalard ca6b7d5265 Cleanup, part 8 (C8)
Change-Id: Iecc9b3d43c191614c2951408e14085cb77eefd4d
2012-06-20 03:45:40 +09:00
Jean Chalard 2f3a694e29 Cleanup, part 7 (C7)
Change-Id: I662be9d3b31fb9e157722f38cab1e6fb8a1152ab
2012-06-20 03:17:33 +09:00
Jean Chalard 0e8b1db948 Merge "Cleanup, part 6 (C6)" 2012-06-19 09:25:33 -07:00
Jean Chalard c03bd090ea Merge "Cleanup, part 4 (C4)" 2012-06-19 09:24:25 -07:00
Jean Chalard bd765d3355 Merge "Cleanup, part 3 (C3)" 2012-06-19 09:24:00 -07:00
Jean Chalard b821b72aa1 Merge "Remove a member (B5)" 2012-06-19 09:15:57 -07:00
Satoshi Kataoka 67b9337b6c Fix possible NPE from a concurrent problem in LatinIME
Bug: 6620746
Change-Id: Icc18de92d7edc6888c712c2cf5ce479a65f8bfad
2012-06-19 03:34:45 +09:00
Svetoslav Ganov 808ba7b8f8 am e6730ac0: am 5e4df66f: Merge "Removing implementation of unnecessary APIs taken out of the support lib." into jb-dev
* commit 'e6730ac0e89de1cd81b92412751ec3950d8befb4':
  Removing implementation of unnecessary APIs taken out of the support lib.
2012-06-18 11:31:43 -07:00
Svetoslav Ganov 5e4df66fce Merge "Removing implementation of unnecessary APIs taken out of the support lib." into jb-dev 2012-06-18 11:28:04 -07:00
Jean Chalard b0561ae980 Remove a member (B5)
The new call in the test ensures getCurrentInputEditorInfo actually
works.

Change-Id: I2ee407bd9927d22db537d12f339e2b977a38054a
2012-06-19 03:27:37 +09:00
Jean Chalard 56523ce0bf Merge "Simplification (B4)" 2012-06-18 10:55:59 -07:00
Jean Chalard 64e52051cf Simplification (B4)
Change-Id: Id5abf722a533980ed2d89381dbddc0a71b6f5b6b
2012-06-19 02:54:13 +09:00
Jean Chalard 5a1259523f Merge "Move a settings method to SettingsValues (B3)" 2012-06-18 10:53:47 -07:00
Tadashi G. Takaoka a5bbb8df75 am e4bbff78: am 38dc9ca3: Fix duplicate period on Persian tablet keyboard
* commit 'e4bbff783bddb70f52402454987ede281fb86039':
  Fix duplicate period on Persian tablet keyboard
2012-06-18 10:52:54 -07:00
Tadashi G. Takaoka 794a9c913a am 58f9b35e: am 6de1b7a7: Fix Persian keyboard having correct code points
* commit '58f9b35e1cf5a975ec1312858aad9b5cc307fda8':
  Fix Persian keyboard having correct code points
2012-06-18 10:52:46 -07:00
Svetoslav Ganov 27bda8fee8 am 866cfd3a: am fa447071: Merge "Update LatinIME due to hidden APIs taken out of the support lib." into jb-dev
* commit '866cfd3a68c370bedc4deb3d40ff4ff7c44902bd':
  Update LatinIME due to hidden APIs taken out of the support lib.
2012-06-18 10:52:42 -07:00
Jean Chalard fe53e5c060 Move a settings method to SettingsValues (B3)
Change-Id: Ibfa27bd919c92be219c4d107b3ace008ca80a19f
2012-06-19 02:52:36 +09:00
Tadashi G. Takaoka 38dc9ca314 Fix duplicate period on Persian tablet keyboard
Bug: 6679579
Change-Id: I8bccbfbdf7ea1fa1b78a5af05eb1df100f22ab0c
2012-06-18 10:33:03 -07:00
Jean Chalard 8b538807a3 Merge "Make a variable final (A2)" 2012-06-18 10:30:19 -07:00
Jean Chalard 0176faf6c0 Merge "Add a kind to the suggestion for bookkeeping (A1)" 2012-06-18 10:30:10 -07:00
Jean Chalard 1c3c0ff1c3 Merge "Cleanup, part 2 (C2)" 2012-06-18 10:29:06 -07:00
Jean Chalard 65b7bcb045 Merge "Cleanup, part 1 (C1)" 2012-06-18 10:28:58 -07:00
Svetoslav Ganov d3cc73ada8 Removing implementation of unnecessary APIs taken out of the support lib.
1. We have hidden a framework API and it was take out of the
   support lib. This API is not necessary and this patch removes
   the implementation in LatinIME.

bug:6675330

Change-Id: I18aff7a6c7bc2b76c7332abe0bf294fbbb99ccfc
2012-06-17 15:22:02 -07:00
Kurt Partridge 6080f6878b Remove non-dictionary words and digit touch data.
Output to the ResearchLogger is now queued and only flushed if the word
the user was working on is a dictionary word.

multi-project commit with Ic713ec00777fbdcf4a937b3c77b995257e100fc7

Bug: 6188932
Change-Id: I9de15227ff51be23083d9096f1c1b3d83802fff7
2012-06-17 15:02:15 -07:00
Kurt Partridge 4b91046759 Merge "Replace digits in ResearchLogger" 2012-06-16 20:48:25 -07:00
Tadashi G. Takaoka 6de1b7a709 Fix Persian keyboard having correct code points
Bug: 6679850
Change-Id: Iaa33f48ffb5634de31e039574fb58185c6c078e8
2012-06-16 20:30:45 -07:00
Kurt Partridge a696781c2b Replace digits in ResearchLogger
Digits may represent personally identifying information.  They are
now replaced with a non-identifying symbol.

multi-project commit with I07d1cfdc45f6086f67af45775f4ed12da1833aca

Bug: 6188932

Change-Id: Ifda8079e6c1f29b5f8af34c6d1fccf5770f164ca
2012-06-16 12:37:50 -07:00
Jean Chalard c5f1d998c2 Cleanup, part 6 (C6)
Change-Id: I184f3a336278559df255c5d600a98fbba468a243
2012-06-16 10:52:49 +09:00
Jean Chalard 9b233ecef2 Cleanup, part 4 (C4)
Change-Id: I2821ae71ec49e4b6b512157d17b80198f74321e4
2012-06-16 10:51:04 +09:00
Jean Chalard 5475e92b3f Cleanup, part 3 (C3)
Change-Id: Ib0be8dc26b6fa366a3dabeea940d466602073244
2012-06-16 10:46:18 +09:00
Jean Chalard 71dc280426 Cleanup, part 2 (C2)
Change-Id: I860f41807e9bc2e38b6ad84e1527fc8707a9aa40
2012-06-16 10:40:16 +09:00
Jean Chalard 6883153dd0 Cleanup, part 1 (C1)
Change-Id: I2b1ddd836aaf6bfc0bd2befb78f98239ffcdbb22
2012-06-16 10:38:57 +09:00
Jean Chalard 4a5cb5c36a Update an outdated comment
Change-Id: I3d02dc8597ed14d998caeaa056813353e2d7ec1a
2012-06-16 10:34:57 +09:00
Jean Chalard dca729fddd Move final attributes to SettingsValues (B2)
Bug: 6675475
Bug: 6677394
Change-Id: I4a26efb9226d3f909f331c4d2e47cd83a05c011e
2012-06-16 08:01:09 +09:00
Svetoslav Ganov fa447071df Merge "Update LatinIME due to hidden APIs taken out of the support lib." into jb-dev 2012-06-15 15:00:55 -07:00
Jean Chalard 3d44f489b3 Inline a method for simplicity (B1)
This has a confusing name and is a one-liner

Change-Id: I954a648a8413e38a535c2b81e4b171e1bdc9f1c2
2012-06-16 03:18:00 +09:00
Jean Chalard 0998c48ac3 Make a variable final (A2)
This is never changed, and probably doesn't need to be.
It's public because it's going to be used elsewhere in a future
change

Change-Id: Iec8d65859c470de5e1fb0b05533356fbc3b8e91b
2012-06-16 03:10:54 +09:00
Jean Chalard e7d2ee3ec3 Add a kind to the suggestion for bookkeeping (A1)
This will help for debug as well as serve as groundwork for
Bug: 6252660
Bug: 6166228
Bug: 2704000
Bug: 6225530

Change-Id: I74d0a7b943fb22c514ad79dc064d69ddf336d3ef
2012-06-16 03:10:36 +09:00
Svetoslav Ganov b910b18c2c Update LatinIME due to hidden APIs taken out of the support lib.
1. We have hidden the APIs for accessiiblity focus search since
   it wull be perfomred by the client, updated the support lib,
   and now we are updating the LatinIME.

bug:6675330

Change-Id: I9dd3450b40148be7ce750f6bffc0a047a541982f
2012-06-15 11:01:15 -07:00
Kurt Partridge 23cec44376 Merge "No logging of passwords." 2012-06-14 21:09:20 -07:00
Tadashi G. Takaoka 9328e0f2d9 am aee2ed1f: am 14bc2e89: Fix Arabic diacritics order
* commit 'aee2ed1f4b0be7a538cc5722fed274632f2a40ba':
  Fix Arabic diacritics order
2012-06-14 21:08:18 -07:00
Tadashi G. Takaoka 14bc2e89ef Fix Arabic diacritics order
Bug: 6662536
Change-Id: I96e45ce0e8b9b5440a54f3b321a925bc87ec3ca9
2012-06-14 20:33:52 -07:00
Tadashi G. Takaoka dfcf7cac5e am 1ab436c1: am 0e473e9c: Reorder Persian diacritics
* commit '1ab436c1e60c0e49333549fb93e135fa99458bda':
  Reorder Persian diacritics
2012-06-14 18:30:52 -07:00
Jean Chalard a19c5e6380 resolved conflicts for merge of be82f297 to master
Change-Id: If49ca384ea0ac415a75f8ea1bad77dc6719cb04d
2012-06-15 09:03:52 +09:00
Tadashi G. Takaoka 0e473e9c92 Reorder Persian diacritics
Bug: 6661783
Change-Id: I42bab7655121ec5671854d54c47bd0c7a29e7a98
2012-06-14 16:56:36 -07:00
Kurt Partridge 1cef91e481 No logging of passwords.
Bug: 6188932
Change-Id: Ibf60ec99c50da3675bf89858624218e6cc3eb1d2
2012-06-14 15:14:20 -07:00
Jean Chalard cf6e923b18 am 42ecf39d: am 002e43ea: Merge "Remove irrelevant options." into jb-dev
* commit '42ecf39d04df9eb02e57cf29e63552bc04092857':
  Remove irrelevant options.
2012-06-14 14:51:37 -07:00
Tadashi G. Takaoka 775d8dcaeb am de1d88eb: am 32f4ceb2: Dismiss more suggestions panel when suggestions strip is closed
* commit 'de1d88eb4199160899d227f2c679215e16410c42':
  Dismiss more suggestions panel when suggestions strip is closed
2012-06-14 14:49:08 -07:00
Jean Chalard 7cbd0478cf Merge "Do not display punctuation suggestions when bigrams are on." into jb-dev 2012-06-14 14:37:13 -07:00
Jean Chalard 002e43ead0 Merge "Remove irrelevant options." into jb-dev 2012-06-14 14:36:26 -07:00
Jean Chalard d5b765b3bb Do not display punctuation suggestions when bigrams are on.
Bug: 6310401
Change-Id: I9d31c48e287aceedaf2f4c5129031ddb31402451
2012-06-15 06:01:09 +09:00
Jean Chalard 78573f2e8a Fix an NPE
This code is temporary until we get rid of this member.

Bug: 6662963
Bug: 6667091
Change-Id: I1d970d2a97992507e86c5b94978a2543fe42b375
2012-06-15 05:47:35 +09:00
Jean Chalard 15121cff37 Remove irrelevant options.
Bug: 6667355
Change-Id: I39b6db17fb52e80f510cf6462f41d9cb1f8e0341
2012-06-15 05:04:14 +09:00
Tadashi G. Takaoka 32f4ceb243 Dismiss more suggestions panel when suggestions strip is closed
This change fixes possible NPE as well.

Bug: 6658028
Change-Id: I8706808d1002b7b0b95930fd9b08568f08645da6
2012-06-14 11:57:43 -07:00
Satoshi Kataoka d2f210dbe2 am d9c702d2: am 5caaf1b9: Merge "Do not add profanity to user history bigram dicitonary" into jb-dev
* commit 'd9c702d2ff017452f0264f2be12b6bffd6204e4a':
  Do not add profanity to user history bigram dicitonary
2012-06-14 10:33:47 -07:00
Tadashi G. Takaoka c380959f48 am bbf18807: am 1db4f951: Fix the order of Persian diacritics
* commit 'bbf188075d5e14626c0609f4c3ee6031f6c6d5a6':
  Fix the order of Persian diacritics
2012-06-14 10:33:46 -07:00
Satoshi Kataoka 5caaf1b9e9 Merge "Do not add profanity to user history bigram dicitonary" into jb-dev 2012-06-14 00:31:55 -07:00
Tadashi G. Takaoka 1db4f95105 Fix the order of Persian diacritics
The java source file KeyboardTextsSet.java has rather big change, but
this file is auto generated by "maketext" tool. The crucial part of
this change is in 5 XML resource files.

Bug: 6661783
Change-Id: I1d827ab0ebe6caa5ab73531682d6c32540b0d7aa
2012-06-14 15:18:25 +09:00
Satoshi Kataoka 68c650fb2a Do not add profanity to user history bigram dicitonary
Change-Id: I864c4206e3e6cde4d6ed687a9759e98901e16b9a
2012-06-14 15:15:08 +09:00
Jean Chalard bbd7434229 Merge "Fix an occurrence of nested batch edits." 2012-06-13 10:37:12 -07:00
Tadashi G. Takaoka 8fa20d6a36 Merge "Remove useless copy constructor of ProximityInfo" 2012-06-12 16:24:39 -07:00
Tadashi G. Takaoka 9f42140ae2 Remove useless copy constructor of ProximityInfo
Change-Id: I56b4a99f670ad38708ad83d76b93a631295e3333
2012-06-12 15:13:07 -07:00
Jean Chalard 9d71748ba4 Fix an occurrence of nested batch edits.
This is harmless, but against policy.
Also, rework the checking code to be more readable, give more
information, and be called for all relevant methods - and not
for informative methods, which are not required to be in a
batch edit.

Change-Id: I03fa8b2e7d68a6a133f86be8a214671750c29256
2012-06-13 07:02:07 +09:00
Jean Chalard c7564a787e Optimization
This is much faster. It doesn't create messages, it doesn't post
stuff in a queue, it doesn't delay execution of other messages.
Also, it decouples the timer from the functionality of the Handler
so this can be pulled up in another change to consolidate with
mLastKeyTime or so.

Change-Id: I9044fc031373e66b9b40eee8025633613d0945dc
2012-06-13 07:02:07 +09:00
Jean Chalard 72b358aa90 Small optimization.
This will avoid some two-way IPC calls.

Change-Id: If9eb3e99b3d08346aadd4bbed2a1761f8c2527b9
2012-06-13 07:02:07 +09:00
Satoshi Kataoka 84bb18f4c9 resolved conflicts for merge of ee78e780 to master
Change-Id: I88a4996bdd17c5378a67781d8075eff311670c3b
2012-06-13 06:45:38 +09:00
Jean Chalard 58d9e46ce0 Merge "Consolidate a test." 2012-06-12 11:50:36 -07:00
Kurt Partridge 5e50eec570 Merge "Check inputs to ResearchLogger" 2012-06-12 11:39:11 -07:00
Jean Chalard e86054e5c2 Consolidate a test.
Stop using the numerical value, use the actual method

Change-Id: Iffa7f2d21a0471c7862afd3234cc9c5dd86feb2e
2012-06-13 03:34:58 +09:00
Kurt Partridge 65fc909e13 Check inputs to ResearchLogger
to avoid NPEs.

Bug: 6188932
Change-Id: I377ceaac867df879dc7984dae44e96b369858cca
2012-06-12 10:56:03 -07:00
Jean Chalard 140adf204b Consolidate auto-correction settings.
For some reason, there were several ways, not exactly identical,
to get this setting. The ones that used mAutoCorrectionEnabled
would kick in when the input field was specifying no correction,
so it would be a little strange (although harmless in the practice
because the settings set in this way would not get used later,
because the correct test would be done at that time).

Also perform a very small refactoring

Change-Id: Ica9f32b238d98009ae1852d3c1e940398f5d341c
2012-06-12 10:29:55 +09:00
Jean Chalard 2010aad741 Move two methods in a more appropriate place
Change-Id: I512b04e23490413a44b1ca0517102fe2d9138df3
2012-06-12 10:29:55 +09:00
Jean Chalard a32eb27213 Move an editing method to the RichInputConnection
Change-Id: Ie143ad008ca8deb1c5034cb80ec1cb28a6b0682d
2012-06-12 10:29:55 +09:00
Jean Chalard 243e370fcb Move a member call out of the way
Change-Id: I5da48442c0b39aaff817c3b6d067a9b13fda0643
2012-06-12 10:29:55 +09:00
Jean Chalard 747cf0435a Move two editing utility methods to RichInputConnection
Change-Id: If8d03bea1b6369cb3043da6321048d052995d664
2012-06-12 10:29:55 +09:00
Jean Chalard 70a046f8ca Merge "Rename mSettingsValues to mCurrentSettings" 2012-06-11 18:24:45 -07:00
Jean Chalard 64913d72bc Merge "Move suggestion strip visibility to SettingsValues" 2012-06-11 18:18:50 -07:00
Jean Chalard 15c0090e88 Merge "Accept a null input attributes for reading settings." 2012-06-11 18:18:43 -07:00
Jean Chalard f4bc441256 Merge "Move the correction mode to SettingsValue and make it final" 2012-06-11 18:18:03 -07:00
satok 6a71f0610c Fix UserHistoryBigram data contention in UserHistoryDictionary
Bug: 6637614
Change-Id: I34d26563e59d3b09bf35b8173dac5645ccb6a39f
2012-06-12 08:00:14 +09:00
Jean Chalard 411a98afb9 Merge "Consolidate updateCorrectionMode() calls" 2012-06-11 14:02:15 -07:00
Jean Chalard 297e6d590b Rename mSettingsValues to mCurrentSettings
...for readability. After all, it makes sense that "current settings"
is a "SettingsValues", while it's harder to understand why we'd
manipulate an object named "SettingsValues".

Change-Id: Ide9a17b970a6cc00b80b9a217f986268c739c662
2012-06-08 21:34:07 +09:00
Jean Chalard d273697259 Move suggestion strip visibility to SettingsValues
Change-Id: If34112c69acd5122d87554043d87d8f4dbdf5d15
2012-06-08 21:26:25 +09:00
Jean Chalard 01e3b014bb Accept a null input attributes for reading settings.
Change-Id: I11a8e1aca3541c35d2b39b27716687fcd8ff3dc6
2012-06-08 21:15:33 +09:00
Jean Chalard 4b9e6ee6fb Move the correction mode to SettingsValue and make it final
At last this guy is final, at last

Change-Id: I76911f8d47493f8a1719f75fc7e949be5d7da1a2
2012-06-08 21:10:35 +09:00
Jean Chalard 3791183076 Consolidate updateCorrectionMode() calls
Change-Id: I43c0505e9a1652bfc568f23b787fc68a5c5e9220
2012-06-08 21:02:19 +09:00
Ken Wakasa e7b34b9f86 Add NativeUtils.powf()
Change-Id: I0339f39d49bc6390d098017f32d92c776974e03e
2012-06-08 20:46:19 +09:00
Jean Chalard bbbdab12be Move some editing methods to RichInputConnection.
Change-Id: I8527776a4bd8236a85bb77f9791f9b76977ad181
2012-06-08 20:23:13 +09:00
Jean Chalard e091982868 Straighten batch edits, pass 1
Change-Id: I73acfee9098a87b9cde8aca720586ec748b2a82f
2012-06-08 20:09:41 +09:00
Jean Chalard 02308bec63 Merge RichInputConnection with EditingUtils
Change-Id: I9982ff325bef56694402caef28a77683c52ccd71
2012-06-08 20:04:09 +09:00
Jean Chalard 5475b38328 Make a wrapper for the input connection.
The goal is to simplify the code in LatinIME.java as well as having
a handy place to put debug calls to see interaction with TextView.

Change-Id: I255227e7e7343e0c2f3dcd1f185e5020d6186732
2012-06-08 19:50:12 +09:00
Jean Chalard c33a5428be Merge "Small performance tweak" 2012-06-08 01:22:31 -07:00
Jean Chalard 67fd0c240d Remove deprecated classes.
Should we maybe rename back *BinaryDict* to *Dict* in another
change for simplicity?

Change-Id: I8f7dcb78b9bdf1a13ce403a997fbb8619f2b453b
2012-06-08 17:12:15 +09:00
Jean Chalard d10c473347 Small performance tweak
Change-Id: Icd540742073d49d12e70b2d8bd99aaf7ccb5802d
2012-06-08 17:09:40 +09:00
Jean Chalard e91f32d8c1 Merge "Remove a slew of Eclipse warnings." 2012-06-08 00:35:05 -07:00
Jean Chalard 7214617622 Remove a slew of Eclipse warnings.
Change-Id: I03236386aea13fbd4fb8eaeee18e0008aa136502
2012-06-08 16:23:18 +09:00
Satoshi Kataoka eed2cf287d Merge "Separate state from proximity_info step1" 2012-06-07 22:18:11 -07:00
Ken Wakasa d418580a71 Fix typo
Change-Id: I264f829c1584a37995dbc5ee4ba6b6783d5d4834
2012-06-08 03:42:02 +09:00
Tadashi G. Takaoka 6b8a70105f am e4da18e2: am 6348c54f: Merge "Initializing member variable before it is referenced" into jb-dev
* commit 'e4da18e27916f770fcd704032d30534d287d67c6':
  Initializing member variable before it is referenced
2012-06-07 11:32:50 -07:00
satok 1e96cc1f51 am 674c51a0: am ec2981a4: Fix a bug on upgrading user history scheme
* commit '674c51a01117b73dd25473195f92fb0c0158da26':
  Fix a bug on upgrading user history scheme
2012-06-07 11:28:41 -07:00
Tadashi G. Takaoka 6348c54ffd Merge "Initializing member variable before it is referenced" into jb-dev 2012-06-07 11:27:32 -07:00
Tadashi G. Takaoka 40582ab438 Initializing member variable before it is referenced
Bug: 6584882
Change-Id: I1f76388fa8cc16171bc3fc60c935ddcf0a7c4e92
2012-06-07 11:17:59 -07:00
satok ec2981a487 Fix a bug on upgrading user history scheme
Bug: 6626700
Change-Id: I3190d7404e45e704be79ee2031e79b18475feb8c
2012-06-08 02:55:23 +09:00
Tom Ouyang 11dc22d964 Merge "Contacts binary dictionary updates with change in keyboard locale." 2012-06-07 01:19:44 -07:00
Tom Ouyang 2e8aa06002 Contacts binary dictionary updates with change in keyboard locale.
Bug: 6616436
Change-Id: I8d66a37f295134c5b9875b2a305a9be7442bd75d
2012-06-07 00:25:41 -07:00
Jean Chalard c8a120f970 am eead5492: am 769cecf7: Close spell-checking dictionaries in a background thread
* commit 'eead5492615f0b05ef85ca1f88d3a41ce3f8d496':
  Close spell-checking dictionaries in a background thread
2012-06-06 21:52:46 -07:00
Satoshi Kataoka 3e8c58f68d Separate state from proximity_info step1
Bug: 6548943

Change-Id: I7b4fbe20615a28151a74875be43b9f4a20e0dce9
2012-06-07 13:35:34 +09:00
Jean Chalard 769cecf7e7 Close spell-checking dictionaries in a background thread
Bug: 6584677
Change-Id: Ifd9b0f995f4e0cf4d35a7ecde767826ab976f0b8
2012-06-07 12:56:45 +09:00
Kurt Partridge 9b300f0caa Merge "add research log ui control" 2012-06-06 20:47:53 -07:00
Kurt Partridge 724bc479f7 add research log ui control
- lets users flag a particular time in the research log
- lets users delete the log for this session

also makes the UsabilityLog setting control whether the ResearchLog logs or not.

multi-project commit with I89067e7d3b8daca7179333f1dbe82224c26920fe

Bug: 6188932
Change-Id: I89864ef3ab53b0efe1ea8d75247be08712f0c399
2012-06-06 20:42:01 -07:00
Satoshi Kataoka 91c8c4f3a7 am e08cfda1: am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each language" into jb-dev
* commit 'e08cfda1ebea693c56681816076c419f23c51076':
  Cache UserHistoryDictionary for each language
2012-06-06 10:48:46 -07:00
Satoshi Kataoka 5a8d2fd1d3 Merge "Cache UserHistoryDictionary for each language" into jb-dev 2012-06-06 10:43:50 -07:00
Tadashi G. Takaoka 562239bf51 am 59dae7e1: am 907ba593: Can specify Key.backgroundType in <Row> and <include> attribute
* commit '59dae7e141b6d6a8bea287f6699e34137390c5f9':
  Can specify Key.backgroundType in <Row> and <include> attribute
2012-06-06 10:42:38 -07:00
Tadashi G. Takaoka 2bf014d2a8 Fix xml tag in comment
Bug: 6620122
Change-Id: I2852f77d78b242c1a96c53cdd1e4c0e299f8ea4f
2012-06-06 10:36:30 -07:00
Tadashi G. Takaoka 907ba59397 Can specify Key.backgroundType in <Row> and <include> attribute
Bug: 6568834
Change-Id: I138464b5445e13eaf062ce84a1ba332dfd1afafa
2012-06-06 10:15:51 -07:00
Satoshi Kataoka a836808f8b Cache UserHistoryDictionary for each language
Bug: 6603257
Change-Id: I73b65e921cff8337a00594525f67f6aec2178881
2012-06-06 20:02:00 +09:00
Satoshi Kataoka 21b782cf22 Merge "Cache bigram results in Android SpellChecker" 2012-06-06 01:01:47 -07:00
Satoshi Kataoka 547bc0cf04 Cache bigram results in Android SpellChecker
Bug: 6610579
Change-Id: I255c068f64f99ee80abda49153ed8ea009ca8ad3
2012-06-06 16:58:24 +09:00
Kurt Partridge 6b3b37da97 Merge "Change constants in ResearchLogger" 2012-06-05 20:17:14 -07:00
Tadashi G. Takaoka 876711930d am 2eb5eb4d: am be2fef4d: Merge "Fix backing view height calculation in landscape orientation" into jb-dev
* commit '2eb5eb4d447cb326b4c10cff2cae64df4e431ffd':
  Fix backing view height calculation in landscape orientation
2012-06-05 17:58:59 -07:00
Tadashi G. Takaoka be2fef4d5e Merge "Fix backing view height calculation in landscape orientation" into jb-dev 2012-06-05 17:54:42 -07:00
Tadashi G. Takaoka b94f4cc71c Fix backing view height calculation in landscape orientation
This logic has been dropped by Ib814c07f.

Bug: 6610497
Change-Id: Id89ad3280b73a31d8c9c6826e9ee297791624db1
2012-06-05 17:41:01 -07:00
Charles Chen 7b250c25f7 am 6b0d0fa3: am f8233ec3: Merge "Refresh Accessibility key mapping when KeyboardView changes Keyboards." into jb-dev
* commit '6b0d0fa3501247ccf3190c938dec580102fe0473':
  Refresh Accessibility key mapping when KeyboardView changes Keyboards.
2012-06-05 15:02:27 -07:00
Charles Chen f8233ec32d Merge "Refresh Accessibility key mapping when KeyboardView changes Keyboards." into jb-dev 2012-06-05 14:55:59 -07:00
alanv f147794fd4 Refresh Accessibility key mapping when KeyboardView changes Keyboards.
Bug: 6609626
Change-Id: I93d764b46e96fe70b61c91a7dcb46945ac8853dd
2012-06-05 11:02:54 -07:00
Jean Chalard 5235e0cd91 am c750f9eb: am a6166d37: Fix a bug where Latin IME crashes on spell checker request
* commit 'c750f9eb5398a30b207891e6858863f493875199':
  Fix a bug where Latin IME crashes on spell checker request
2012-06-05 09:54:58 -07:00
Tom Ouyang f93551f77b am 18c4137c: am 7f7739fe: Merge "Fix a bug where the spellcheck is using the old non-binary contacts dictionary" into jb-dev
* commit '18c4137c878c18de24a406b861ddb2a735e02f7d':
  Fix a bug where the spellcheck is using the old non-binary contacts dictionary
2012-06-05 09:54:55 -07:00
Satoshi Kataoka 037cf8c8a5 am 7394fc43: am 0e134e6b: Merge "Avoid redundant access to DB" into jb-dev
* commit '7394fc43028ef6e28579921c30915bd8a9c9c990':
  Avoid redundant access to DB
2012-06-05 09:22:17 -07:00
Jean Chalard c1cbcf949d am 9252fc1b: am dd487247: Merge "Read the script correctly" into jb-dev
* commit '9252fc1b88df0c8bd3870546d1c8ca7681e435d3':
  Read the script correctly
2012-06-05 09:22:15 -07:00
Kurt Partridge f739119f3f Change constants in ResearchLogger
Bug: 6188932
Change-Id: I3c6a3fb3e8fb139e16322e544f12bc3294cdaf1c
2012-06-05 07:13:06 -07:00
Jean Chalard a6166d3776 Fix a bug where Latin IME crashes on spell checker request
Bug: 6611183
Change-Id: I8a879feb598e1ac55d73f9cb27e54aa533d3a010
2012-06-05 16:33:21 +09:00
Tom Ouyang 7f7739fee8 Merge "Fix a bug where the spellcheck is using the old non-binary contacts dictionary" into jb-dev 2012-06-04 23:10:03 -07:00
Satoshi Kataoka 0e134e6be8 Merge "Avoid redundant access to DB" into jb-dev 2012-06-04 20:08:02 -07:00
Jean Chalard dd4872474a Merge "Read the script correctly" into jb-dev 2012-06-04 19:55:47 -07:00
Tom Ouyang faf0059f35 Fix a bug where the spellcheck is using the old non-binary contacts dictionary
Bug: 6607023
Change-Id: I6dc120dea23052a0841e281c20706bfb21fd9876
2012-06-04 14:07:47 -07:00
Satoshi Kataoka a8c13e7942 Avoid redundant access to DB
Bug: 6603257
Change-Id: I2e8017f9e2e222aeab0a80faa239ce83d3b212ad
2012-06-04 23:41:50 +09:00
Jean Chalard b1f3c24c63 Read the script correctly
The script of a language presumably does not depend on the
country variant. This was how it was made but it was later
forgotten and the full locale was registered.

Bug: 6542210
Change-Id: Iebc90c546f9c8caf89f8aa6c6a7c4733e5bcba48
2012-06-04 18:39:16 +09:00
Tadashi G. Takaoka 236c2c3987 am a6c88f10: am fe824948: Dismiss key preview immediately when Keyboard is closing
* commit 'a6c88f106a16fec2e81f87f170e97194c8fa7a3a':
  Dismiss key preview immediately when Keyboard is closing
2012-06-04 00:07:17 -07:00
Tadashi G. Takaoka fe824948bb Dismiss key preview immediately when Keyboard is closing
Bug: 6595594
Change-Id: I52311369929862b17879cd15fdee3598179eedbb
2012-06-04 15:47:32 +09:00
Tadashi G. Takaoka 9895b815a8 am e2832daf: am 8cf3654a: Merge "Use calculated backing view height instead of the view\'s height" into jb-dev
* commit 'e2832daf4c289f94d68c546c485fc06bbf6aefd6':
  Use calculated backing view height instead of the view's height
2012-06-03 21:55:26 -07:00
Tadashi G. Takaoka bc5b89cdff Use calculated backing view height instead of the view's height
This change removes the work around that was introduced by If4f24500.

Bug: 6596131
Change-Id: Ib814c07fdac7d0aa0d7fbc2764fda1af42b82ad5
2012-06-04 12:49:27 +09:00
Ken Wakasa 4a9e5d2c95 am a8b7451b: am 027448e0: Remove an unnecessary thread.
* commit 'a8b7451b31872d217cd61b7d0e6fbbf7221781c8':
  Remove an unnecessary thread.
2012-06-02 09:07:51 -07:00
Ken Wakasa 027448e08a Remove an unnecessary thread.
bug: 6584677

While looking at bug 6584677, we found that LatinIME always spawns an unnecessary thread
for Usability Study Mode.  We don't assume this change will address the root cause of the
bug, but we'd like to remove any suspicious noises in bugreports.

Change-Id: Ie47d104f6cd77ec2ad164f13b4212cb4a70bcf1d
2012-06-03 00:27:07 +09:00
satok 083fb024d7 am e6560252: am 72cd8466: Merge "Fix NPE in user history bigram dictionary" into jb-dev
* commit 'e656025282c0da28ed80b2604949092dbc5fb72e':
  Fix NPE in user history bigram dictionary
2012-05-31 20:29:43 -07:00
satok 72cd84665c Merge "Fix NPE in user history bigram dictionary" into jb-dev 2012-05-31 20:24:20 -07:00
satok 4f96bb4520 Fix NPE in user history bigram dictionary
Bug: 6584882
Change-Id: Id0162bffc4f0f36239cdc68383f8a47d7a957397
2012-06-01 12:19:22 +09:00
Charles Chen 6fd153e554 am d30cfee5: am 40e5f403: Merge "Add special case for speaking ACTION_ENTER keys." into jb-dev
* commit 'd30cfee577228873902a16791cd8c3ad3fad4a4c':
  Add special case for speaking ACTION_ENTER keys.
2012-05-31 18:06:03 -07:00
Charles Chen 40e5f403af Merge "Add special case for speaking ACTION_ENTER keys." into jb-dev 2012-05-31 17:24:50 -07:00
Kurt Partridge 76dbab8eb8 Merge "Include version number in log output." 2012-05-31 16:52:43 -07:00
alanv 080327154f Add special case for speaking ACTION_ENTER keys.
Bug: 6576058
Change-Id: If9a4fc2ddd5bcbac5f610d705441aa379c499a6f
2012-05-31 16:15:21 -07:00
Kurt Partridge 58caa775a7 Include version number in log output.
Bug: 6188932
Change-Id: I1039a3ad317d207599f30fe578bdf814c80d6852
2012-05-31 14:19:38 -07:00
Charles Chen 4f44181acd am c764fd80: am b99788c3: Merge "Update keyboard view used by node provider. Remove global layout listener." into jb-dev
* commit 'c764fd80b56663eb44f52c7b76527b048d282efb':
  Update keyboard view used by node provider. Remove global layout listener.
2012-05-31 11:16:50 -07:00
Charles Chen b99788c3b8 Merge "Update keyboard view used by node provider. Remove global layout listener." into jb-dev 2012-05-31 11:10:02 -07:00
Jean Chalard b012f45242 am bb104678: am 6f0cd9ba: Fix a possible NPE.
* commit 'bb10467863ff531c5cbee8ffd72845a91e487e72':
  Fix a possible NPE.
2012-05-31 03:41:04 -07:00
Jean Chalard 6f0cd9ba6d Fix a possible NPE.
This NPE's at least in unit tests.

Change-Id: I255ac5fec9502e4e5bd18cba1211cdf46c6cafc8
2012-05-31 19:33:39 +09:00
Tadashi G. Takaoka eebe4bb0c2 am c6791d67: am 60ee192b: Utilize Rect\'s method
* commit 'c6791d6773f34990e9aac8f7219be82fa91ab92e':
  Utilize Rect's method
2012-05-30 22:49:34 -07:00
Tadashi G. Takaoka 60ee192b07 Utilize Rect's method
Change-Id: Ia3df1baae4b92eca828c53c17f68ff26b25e525c
2012-05-31 14:05:34 +09:00
alanv 48ccd55281 Update keyboard view used by node provider. Remove global layout listener.
Bug: 6582130
Change-Id: I2976e37e921a3e2c151486a919b0a93a908c3384
2012-05-30 15:39:48 -07:00
Tadashi G. Takaoka 4e3d9d375e am 9f41befb: am 9afafd0e: Merge "Restrict phantom sudden move event hack to specific device" into jb-dev
* commit '9f41befb8b5f4d86a03f9eb7e2d80148e9b55428':
  Restrict phantom sudden move event hack to specific device
2012-05-30 03:59:36 -07:00
Tadashi G. Takaoka 9afafd0ebe Merge "Restrict phantom sudden move event hack to specific device" into jb-dev 2012-05-30 03:55:35 -07:00
Tadashi G. Takaoka d438fcaca2 Restrict phantom sudden move event hack to specific device
Bug: 6571778
Change-Id: I4306af387074d34db68a9bb16ae41debcfc36bfd
2012-05-30 19:49:38 +09:00
Jean Chalard 3d7312af5b am 40bab488: am 4f78f8cb: Merge "Remove a vibration-related option when there\'s no vibrator" into jb-dev
* commit '40bab488cb70875f46e29f595d577cc6cc4a9264':
  Remove a vibration-related option when there's no vibrator
2012-05-29 23:37:09 -07:00
Jean Chalard c7f2878cf5 Remove a vibration-related option when there's no vibrator
Bug: 6567160
Change-Id: I1b5d425ffb64b2d7390cd0b7be0825f6aca17f41
2012-05-30 15:24:59 +09:00
Kurt Partridge 30ff0898fd Merge "Fixes to json output" 2012-05-29 17:48:50 -07:00
Kurt Partridge 86fcadde5d Fixes to json output
- booleans and numbers in SharedPreferences not quoted as strings
- removed redundant logging from KeyboardState
- json output for KeyboardId
- remove unnecessary logging of LatinImeLogger.onStartView() and PointerTracker checking keyboardlayoutchange
- fix to day-of-month part of uuid

Multi-project commit with Idb8f190214f852ab2b58df49f9e514dc7fcbecbb

Bug: 6188932

Change-Id: I67b4a0b34aa26c2804e2b3ee2136614f0ec8181a
2012-05-29 14:04:05 -07:00
Tom Ouyang 609ce32a4d am 126ed424: am 1ed017ef: Fix performance issue when there are no contacts in the dictionary dictionary.
* commit '126ed42415a4dc3841e8981a23cbe8a22a9e2213':
  Fix performance issue when there are no contacts in the dictionary dictionary.
2012-05-29 10:12:33 -07:00
Tom Ouyang 1ed017ef0e Fix performance issue when there are no contacts in the dictionary dictionary.
Bug: 6551480
Change-Id: I8681a1bd82423c612af2d012f9b872501d8c201d
2012-05-29 09:45:42 -07:00
Satoshi Kataoka c5d4362b59 am 408fa1ac: am 961e676b: Merge "Set level 1 as the initial value of the valid words" into jb-dev
* commit '408fa1ac48a3eb6f378274d5dd0e490da0f453ae':
  Set level 1 as the initial value of the valid words
2012-05-29 04:49:33 -07:00
Satoshi Kataoka 961e676b9a Merge "Set level 1 as the initial value of the valid words" into jb-dev 2012-05-29 04:43:54 -07:00
Satoshi Kataoka c88f61215c Set level 1 as the initial value of the valid words
Bug: 4192129
Change-Id: I867e78ce79c78977d08e8b66881a25b6fe5bf41f
2012-05-29 20:39:39 +09:00
Tadashi G. Takaoka 8f3b46fc69 am c79a7104: am 2959fc0f: Delay shift lock transient until long pressed shift key is released
* commit 'c79a710445cca2a69dca9600a2c06eadcb253b62':
  Delay shift lock transient until long pressed shift key is released
2012-05-29 03:31:08 -07:00
Tadashi G. Takaoka 2959fc0f13 Delay shift lock transient until long pressed shift key is released
Bug: 5424586
Change-Id: Ib602af1b38b1b109bdac9cb0c53132169556db2f
2012-05-29 18:14:11 +09:00
Satoshi Kataoka 9a989492db am 40ab25ca: am 51705efc: Merge "Add a JNI to get the frequency" into jb-dev
* commit '40ab25cab0e723f34dc2f1442f414761149b2338':
  Add a JNI to get the frequency
2012-05-29 01:32:48 -07:00
Satoshi Kataoka 2f854e170c Add a JNI to get the frequency
Bug: 4192129
Change-Id: I3f220f5a10114d4eb23956148076cf76220bda0f
2012-05-29 17:21:59 +09:00
Satoshi Kataoka a62f6e363d am d882aead: am bd40b94f: Merge "Optimize the store of bigram list" into jb-dev
* commit 'd882aeadb07d16ed887c71895577faabbd635ff3':
  Optimize the store of bigram list
2012-05-28 23:13:43 -07:00
Satoshi Kataoka bd40b94f96 Merge "Optimize the store of bigram list" into jb-dev 2012-05-28 23:09:59 -07:00
Satoshi Kataoka bc56885062 Optimize the store of bigram list
Bug: 4192129

Change-Id: Idcc62e4f9696b56b1d7013891b2da37b1784423e
2012-05-29 15:03:10 +09:00
Satoshi Kataoka 1963e46080 am 7317a257: am 24c4d626: Merge "Fix NumberFormatException" into jb-dev
* commit '7317a257e553c6ecc7adb4211a0370d502bfa0fe':
  Fix NumberFormatException
2012-05-28 21:24:57 -07:00
Satoshi Kataoka 48255b1747 Fix NumberFormatException
Bug: 6567496
Change-Id: Ib0d9fab8496c8c856b94cce5812a263efbcb724f
2012-05-29 13:16:38 +09:00
Tadashi G. Takaoka 59f5f250cf am e03f6b39: am e0952029: Merge "Make KeySpecParser case sensitive again" into jb-dev
* commit 'e03f6b3917f71a7c9f9459765264b547cc80b751':
  Make KeySpecParser case sensitive again
2012-05-28 03:33:28 -07:00
Tadashi G. Takaoka e09520290f Merge "Make KeySpecParser case sensitive again" into jb-dev 2012-05-28 03:22:46 -07:00
Tadashi G. Takaoka 0a3362d264 Make KeySpecParser case sensitive again
Partially revert I76c3e917.

Bug: 6561272
Change-Id: I5649a8ecb44bd11c67785ea97ddbb67b0a019ccc
2012-05-28 19:07:51 +09:00
Tadashi G. Takaoka 1ef0bcc434 am 0725fdb9: am 8f590c77: Use Math.round instead of (int) to convert Key coordinates from float to int
* commit '0725fdb9522dddb6eeab688c60b24cd84786904b':
  Use Math.round instead of (int) to convert Key coordinates from float to int
2012-05-28 02:52:47 -07:00
Tadashi G. Takaoka 8f590c77e8 Use Math.round instead of (int) to convert Key coordinates from float to int
Bug: 6566563
Change-Id: I97d1e9727077cb4d9abbf1ad5bd5d3f061c7bce7
2012-05-28 16:16:35 +09:00
satok 1c69942683 am fff5cd6f: am aa064139: Merge "Forget user history" into jb-dev
* commit 'fff5cd6f767e248ecb5b30ea39cb9a22a476b953':
  Forget user history
2012-05-27 23:03:46 -07:00
satok aa0641394b Merge "Forget user history" into jb-dev 2012-05-27 22:59:22 -07:00
satok fd53b8cc2b Forget user history
Bug: 4192129

Change-Id: Ic98398e5383093a1c24373849eadc48fc4d3626f
2012-05-28 14:34:02 +09:00
Jean Chalard 1a31b4e484 am fac23787: am bed613cf: Merge "Simulate hardware enter/delete events if the app targets < 16" into jb-dev
* commit 'fac23787bbd7723acba4e7e344aa6f799d9584f6':
  Simulate hardware enter/delete events if the app targets < 16
2012-05-27 21:26:06 -07:00
Jean Chalard bed613cf11 Merge "Simulate hardware enter/delete events if the app targets < 16" into jb-dev 2012-05-27 21:21:22 -07:00
Tadashi G. Takaoka 1b6caa9fe6 am ee78fb26: am 7ab7f66c: Fix adjusting key\'s label/code case
* commit 'ee78fb2634e7bf74d3e21faf9630e5d8cd67cda0':
  Fix adjusting key's label/code case
2012-05-27 21:12:32 -07:00
Tadashi G. Takaoka 7ab7f66c2d Fix adjusting key's label/code case
With this fix, we may probably be able to revert I76c3e917 (Make
KeySpecParser case insensitive).

Bug: 6561272
Change-Id: Ic7571560d7b422ffc9a07f0acecd388e0b330d50
2012-05-28 12:34:49 +09:00
Jean Chalard 4e1a558ee8 Simulate hardware enter/delete events if the app targets < 16
This will make text input buggy on all apps until they target
JB or superior.

Bug: 6537051
Change-Id: I726347db8c84d1582ad1962d3a910e698389e08c
2012-05-28 12:00:43 +09:00
Jean Chalard 6d7ac8a4ef am 250f6a44: am 123017cc: Merge "Wipe the application cache selectively" into jb-dev
* commit '250f6a44a7585d61175ec983f9afd43081cd636f':
  Wipe the application cache selectively
2012-05-25 04:11:16 -07:00
Jean Chalard f27ac2733c am d45e334f: am 7707e045: Merge "Cache application info." into jb-dev
* commit 'd45e334f5a73d2cc36800a81e1bbf881e633f026':
  Cache application info.
2012-05-25 04:11:15 -07:00
Jean Chalard 123017cc74 Merge "Wipe the application cache selectively" into jb-dev 2012-05-25 04:07:46 -07:00
Jean Chalard 7707e0459f Merge "Cache application info." into jb-dev 2012-05-25 04:07:36 -07:00
Jean Chalard 64766fbcaa am 6691bd67: am 9b93817b: Merge "Get information about the target application." into jb-dev
* commit '6691bd675a555163aa59c2ac791c6138c1d8a32c':
  Get information about the target application.
2012-05-25 03:34:46 -07:00
Tadashi G. Takaoka 0dfbde09b2 am 41cf0ced: am b6c314e4: Merge "Clean up some compiler warnings" into jb-dev
* commit '41cf0ced38912c5f4a6d11a88c0deb4ac4d01860':
  Clean up some compiler warnings
2012-05-25 03:34:45 -07:00
Jean Chalard 9b93817b7f Merge "Get information about the target application." into jb-dev 2012-05-25 03:28:00 -07:00
Tadashi G. Takaoka 93ebf74bae Clean up some compiler warnings
Change-Id: I604da15e65fc3cf807ec4033df4e4cd5ef0196fc
2012-05-25 19:04:54 +09:00
Jean Chalard eb696d288e Wipe the application cache selectively
Bug: 6537051
Change-Id: I839d0a98c729f3604582946d70c0140a5cff7dcf
2012-05-25 18:56:13 +09:00
Jean Chalard 1b1243d61f Cache application info.
Bug: 6537051
Change-Id: Ieca891235df0d697bdeb0510651b703654fdef38
2012-05-25 18:54:53 +09:00
Jean Chalard b224b60c94 Get information about the target application.
Bug: 6537051
Change-Id: I9fe7a07b5ddf2a423d5764840753ea70544206f1
2012-05-25 18:41:32 +09:00
Jean Chalard 5ea26193a2 am d8b3e5c6: am 0c207144: Merge "Fix a bug with a concurrent modification of a map." into jb-dev
* commit 'd8b3e5c69f4de663c748c82155fc3b8854119826':
  Fix a bug with a concurrent modification of a map.
2012-05-24 03:44:06 -07:00
Jean Chalard 0c20714403 Merge "Fix a bug with a concurrent modification of a map." into jb-dev 2012-05-24 03:39:09 -07:00
Jean Chalard 1b06b59e28 Fix a bug with a concurrent modification of a map.
Bug: 6538848
Change-Id: I1a8422356d9909213e53cfdc8c5bcc12eb48f19d
2012-05-24 19:38:04 +09:00
Tadashi G. Takaoka d74d2f9c33 am f726d09b: am f11c8cd1: Merge "Get rid of heavy IPC call from key drawing code" into jb-dev
* commit 'f726d09b53e16a9602090da062393bdf9f34282f':
  Get rid of heavy IPC call from key drawing code
2012-05-24 03:37:26 -07:00
Jean Chalard 35dacc8e78 am 9b98c4a8: am 69897af2: Merge "Add new locales for the spell checker." into jb-dev
* commit '9b98c4a8ce496fa45b8ad6e7da57063c79d1d9e4':
  Add new locales for the spell checker.
2012-05-24 03:37:22 -07:00
Tadashi G. Takaoka f11c8cd15a Merge "Get rid of heavy IPC call from key drawing code" into jb-dev 2012-05-24 03:24:13 -07:00
Jean Chalard 69897af20d Merge "Add new locales for the spell checker." into jb-dev 2012-05-24 03:13:56 -07:00
Tadashi G. Takaoka fd60b2f970 Get rid of heavy IPC call from key drawing code
Bug: 6541544
Change-Id: I5c7df486ff72714ae09e1dbc21a8adbe3106ce95
2012-05-24 19:04:49 +09:00
Jean Chalard d527a15ec4 Add new locales for the spell checker.
Bug: 6533167
Change-Id: I1581e8446b1af5dc3679e01be16d4fc34af725cc
2012-05-24 18:45:58 +09:00
Tadashi G. Takaoka fe36e7fd9b am 9c239184: am 49afe45d: Fix build
* commit '9c239184530be37fa806cf37a4f19ae0bc824aec':
  Fix build
2012-05-24 01:21:38 -07:00