Commit graph

7202 commits

Author SHA1 Message Date
Tadashi G. Takaoka
84405d2a68 Fix some comments and rename method and parameter names
This is a follow up change of I12139a925d and I0ac92c56bd

Change-Id: Id6e9f4434fddd5d4274e06da5063606c2ffad932
2014-06-23 13:56:50 -07:00
Jean Chalard
1ec3f158d2 [CS3] Move transformation of words to earlier
Bug: 13238601
Change-Id: I37fe66c6152cdf8c60878d5619bb5dc41f3223df
2014-06-23 22:58:52 +09:00
Jean Chalard
fdebf4005f [CS2] Refactor a bit removeDups
This way is more understandable, and also supporting an
external string is helping for future refactorings

Bug: 13238601
Change-Id: I4ebeed46eb0b35011164946af71ac257c6449ddb
2014-06-23 22:58:46 +09:00
Jean Chalard
debe0dacbd Some cleanup to accommodate a fix
Also, this double tests for CODE_SPACE in the path going through
maybeDoubleSpacePeriod, but that's temporary.

Bug: 15740318
Change-Id: I0a6ace09cc791f0009157d3017675b9b3eb92145
2014-06-23 22:51:45 +09:00
Jean Chalard
e83e79cb05 [CS1] Some initial clean up
Bug: 13238601
Change-Id: I54ee9a85ecfee3c50c8db3eb4cd6f391a775a630
2014-06-23 22:19:09 +09:00
Jean Chalard
7d6bc4d063 Merge "[CS1] Some initial clean up" 2014-06-19 22:58:18 +00:00
Ken Wakasa
ffc843550c Merge "Revert "Reorganize Keyboard settings screen"" 2014-06-19 22:58:18 +00:00
Ken Wakasa
e6a57bc82e Revert "Reorganize Keyboard settings screen"
This reverts commit 339929ba16.

Bug: 11866784
Bug: 13888366
Bug: 15781377

This doesn't build with LOCAL_SDK_VERSION := 19 for UnbundledLatinImeGoogle.

Change-Id: Idf8bd335b076152265f245f578dadf651e291878
2014-06-23 11:20:25 +00:00
Tadashi G. Takaoka
339929ba16 Reorganize Keyboard settings screen
This CL must be checked in together with I6ebfbeb4e8.

Bug: 11866784
Bug: 15781377
Bug: 13888366
Change-Id: I57d47ab174d03121a604fd0dbf553795de0ab9b8
2014-06-22 22:37:26 -07:00
Tadashi G. Takaoka
593fe9b0cf Merge "Add click and long click actions to key node info" 2014-06-20 21:00:34 +00:00
Tadashi G. Takaoka
d4b6af14d8 Add click and long click actions to key node info
This CL adds ACTION_CLICK or ACTION_LONG_CLICK actions to a key node
info. But report a node info without these actions for the same key
while hovering to avoid announcement "double tap to select and double
tap and hold to long press".

Bug: 15727335
Change-Id: I1e9333c94c819d049bda81ad410299f5a509d29c
2014-06-20 18:25:25 -07:00
Tadashi G. Takaoka
d801b6ee66 Populate accessibility root node info of keyboard
Partially reverting Ie033d21ef8 to populate root node info.

This CL also fixes the bounds in screen of virtual node info.

Bug: 15746768
Bug: 15582251
Change-Id: I3a82f904270adf138036ef462fd70b349a3cd33e
2014-06-20 14:32:16 -07:00
Keisuke Kuroyanagi
d2e566f999 Fix unit tests by adding @UsedForTesting.
Change-Id: I62ec07210817295f59a174383ee4b33cc4fc2ca6
2014-06-20 16:27:46 +09:00
Tadashi G. Takaoka
e9d12c9f74 Merge "Refactor drawing preview classes" 2014-06-20 02:09:17 +00:00
Keisuke Kuroyanagi
9bbc3aa02a Merge "Move variables for I/O of a jni method to traverse session." 2014-06-19 22:55:19 +00:00
Tadashi G. Takaoka
294afba81f Merge "Reorganize Keyboard settings screen" 2014-06-21 03:15:09 +00:00
Tadashi G. Takaoka
496fd77850 Merge "Custom view for key preview popup" 2014-06-20 21:00:34 +00:00
Tadashi G. Takaoka
615f431465 Custom view for key preview popup
Bug: 15143928
Change-Id: I12411b9b5b9611ec089e4967def9b5c19a2367c7
2014-06-23 01:07:59 -07:00
Tadashi G. Takaoka
a74719c934 Fix dismissing more keys panel when hiding keyboard
This issue was introduced by Id7002ecb7f.

Bug: 15809493
Change-Id: Iaa51b7f40a54ccbafb45c6444d8bbd21c671f7af
2014-06-22 22:21:39 -07:00
Keisuke Kuroyanagi
f73769c638 Merge "Remove word from personalized dicts when it's canceled." 2014-06-19 22:55:19 +00:00
Keisuke Kuroyanagi
0fbca1ac23 Remove word from personalized dicts when it's canceled.
Bug: 15555552
Bug: 15552347
Change-Id: Ia4d8c79d079e3ce233d46d4bbad4fff1be5c5c39
2014-06-20 14:46:13 +09:00
Tadashi G. Takaoka
0f6f5b1fdc Merge "Disable empty suggestion word on the suggestions strip" 2014-06-20 02:04:45 +00:00
Tadashi G. Takaoka
ae42cd7e43 Disable empty suggestion word on the suggestions strip
It should be disabled when it is empty. But should be enabled even
when it is empty with accessibility exploration on to avoid announcing
"disabled".

Note that this CL may not be able to handle "suspending talk back"
state correctly. It should be handled by registering
TouchExplorationStateChangeListener that is available from API 19.

Bug: 15738513
Bug: 14849593
Change-Id: Id9ad89f770840f74a106f53833060407b20c1e24
2014-06-19 19:22:02 -07:00
Tadashi G. Takaoka
b80fb09ff8 Dismiss more keys panel when hiding window
Bug: 15727301
Change-Id: Id7002ecb7f4eea7be3505f6f0235074264418221
2014-06-19 11:42:32 -07:00
Tadashi G. Takaoka
f49e975740 Clear suggestions strip if a suggestion engine isn't attached
Bug: 15709298
Change-Id: I1b3fff3152960d85060149727d7a3422fea8a0bd
2014-06-18 18:47:34 -07:00
Tadashi G. Takaoka
7fb630b2a8 Refactor drawing preview classes
Change-Id: I0779caa720e3013f055ab48900bed223747b3952
2014-06-18 18:16:21 -07:00
Tadashi G. Takaoka
03288ef47f Refactor MoreKeysKeyboard.Builder a bit
Change-Id: I12139a925d59bb467df629cebc61423d61db1d2d
2014-06-18 18:06:17 -07:00
Tadashi G. Takaoka
d89a34b0a1 Merge "Hide voice input key from URI, Email, Number, and Phone layout" 2014-06-19 00:17:11 +00:00
Tadashi G. Takaoka
0351b81632 Hide voice input key from URI, Email, Number, and Phone layout
Bug: 15709298
Change-Id: I05d9433d4e1c2cc475a2136cc97bc32bde6fc745
2014-06-18 18:44:27 -07:00
Tadashi G. Takaoka
3ff72dd0da Consolidate 3 public methods of key preview into one
Change-Id: I0ac92c56bdb636998f7f5e20fba6830b4ac435fa
2014-06-18 10:05:59 -07:00
Keisuke Kuroyanagi
162f529e93 Move variables for I/O of a jni method to traverse session.
Bug: 15008504
Change-Id: I3e59bc856c1df0e1afe3b42d024620ca1745837b
2014-06-17 17:50:32 +09:00
Keisuke Kuroyanagi
4c45fff240 Merge "Fix: NPE when initializing AOSP keyboard." 2014-06-16 23:18:50 +00:00
Keisuke Kuroyanagi
34ed5b0742 Fix: NPE when initializing AOSP keyboard.
Bug: 15677822
Change-Id: Ibebb215a08795482c0f1eef965db06af57558906
2014-06-17 09:33:37 +09:00
Keisuke Kuroyanagi
37c49f63df Update suggestion strip when the contextual dict is updated.
Bug: 14161647
Change-Id: Ic7d53464bd051bffc8c7f8d097325321fe0aaee7
2014-06-16 18:30:59 +09:00
Keisuke Kuroyanagi
cb368a6dac Fix: Probability used for one word contextual phrase.
Bug: 14161647
Change-Id: Ia5f985ea467145fb381e3ad2c1f67f3b013f19e8
2014-06-16 18:20:33 +09:00
Jean Chalard
ccfc824a88 Merge "[CM2] Update beginning-of-sentence suggestions" 2014-06-10 22:31:57 +00:00
Jean Chalard
c715d95f17 [CM2] Update beginning-of-sentence suggestions
We need to update them after separator-space, and also when
the user presses shift and they are displayed.

Bug: 15554503
Change-Id: I5596163d5cd94d3cc5f6af10a1ab2cc74b6d4279
2014-06-16 18:44:43 +09:00
Jean Chalard
deccc23564 [CM1] Let predictions be aware of capitalize mode.
Bug: 15554503
Change-Id: If5e8c0d94ed26d929400ccbb0d45ac23dd98d180
2014-06-16 18:44:39 +09:00
Tadashi G. Takaoka
ad4f964a70 am 4f28b227: Update SDK version check due to I4716e71d72
* commit '4f28b22766e06b8c62636527393945114ea78002':
  Update SDK version check due to I4716e71d72
2014-06-13 19:20:40 +00:00
Tadashi G. Takaoka
a2e365da0a Stop announcing suggestions strip content while more keys keyboard is showing
This CL also supports announcing dismissing of a more keys keyboard.

Bug: 15582905
Change-Id: Ia9e5d6c7e3e23dac39ee570b20d32f0141ae6184
2014-06-14 01:29:45 +09:00
Tadashi G. Takaoka
4f28b22766 Update SDK version check due to I4716e71d72
Bug: 15603590
Change-Id: Ia2ac28a2dbf3e07678661d59e0aa6b4e6a536a02
2014-06-13 18:53:27 +09:00
Tadashi G. Takaoka
fd0d104fa7 Merge "Fix forwarding event only when sending view is visible" 2014-06-10 22:36:02 +00:00
Tadashi G. Takaoka
28593b5325 Fix forwarding event only when sending view is visible
Bug: 15579941
Change-Id: I25c19068ae4ad26b1ff64ffccf36ef8dd58ed295
2014-06-13 15:12:02 +09:00
Tadashi G. Takaoka
dc0c1e40be Merge "Add EmojiPageKeyboardAccessibilityDelegate" 2014-06-10 22:36:02 +00:00
Tadashi G. Takaoka
e9d9b37b5a Add EmojiPageKeyboardAccessibilityDelegate
Because EmojiPageKeyboardView doesn't use PointerTracker to handle
MotionEvent, a dedicated accessibility delegate is needed. Then the
recent tab can be updated even with accessibility mode on.

Bug: 15582599
Change-Id: I63d75b9aca21ec44f1f77d2eaaf2ba7813992183
2014-06-13 13:35:35 +09:00
Jean Chalard
8a23703763 Merge "[CM1] Let predictions be aware of capitalize mode." 2014-06-10 22:31:57 +00:00
Tadashi G. Takaoka
163f318545 Merge "Return an empty accessibility node info for a keyboard" 2014-06-10 22:31:57 +00:00
Tadashi G. Takaoka
9934740a5f Return an empty accessibility node info for a keyboard
Because a keyboard handling hover events and determining a virtual
node by itself, there is no need to supply whole virtual nodes info
for the keyboard. Just returning an empty accessibility node info
supresses annoucements of all keys.

This CL also fixes the undefined virtual id value.

Bug: 15582251
Change-Id: Ie033d21ef878d272417cf2b20f8eec1e516587f6
2014-06-13 16:44:59 +09:00
Tadashi G. Takaoka
1dbeb251b2 Use MoreKeysDetector for accessibility
A more keys keyboard may have a divider on it. The MoreKeysDetector
should be used even with accessibility mode on to be able to handle a
divider.

Bug: 15583354
Change-Id: Ife2cf8304496c4c330127fde8ca1f34c2f0838e2
2014-06-13 12:49:49 +09:00
Keisuke Kuroyanagi
6aa64e91ed Merge "Add clearContextualDictionary()." 2014-06-10 22:29:12 +00:00
Keisuke Kuroyanagi
60dad15f12 Add clearContextualDictionary().
Change-Id: Ia2f8d5640cde816cca23b26ee261acf44f3cdcdc
2014-06-16 17:01:14 +09:00
Keisuke Kuroyanagi
356539699a Add a method to update contextual dictionary.
Bug: 14161647
Change-Id: I2111f841c94e31d62b670da4236fc738df03a708
2014-06-16 17:00:12 +09:00
Keisuke Kuroyanagi
1a4d815b0b Contextual dictionary updater.
Bug: 14161647
Change-Id: I8106419678d5d26a4debec7bbef43af079c1ab18
2014-06-13 18:39:29 +09:00
Keisuke Kuroyanagi
d7a22c8439 Personalization dictionary updater.
Bug: 14161647
Change-Id: I7ab3d701525e9a19bc100aa577527e332bb2ad95
2014-06-13 16:31:12 +09:00
Keisuke Kuroyanagi
ec59371ff8 Merge "Block offensive words in native code." 2014-06-10 22:36:02 +00:00
Keisuke Kuroyanagi
59ed0c2db2 Block offensive words in native code.
Bug: 15300452

Change-Id: Ic6c91c47453e19fb5db2c62b66659619e72b1ecf
2014-06-12 11:36:00 +09:00
Keisuke Kuroyanagi
17f03583c8 Merge "Add a method to update contextual dictionary." 2014-06-10 22:31:57 +00:00
Keisuke Kuroyanagi
a4f2e8eee0 Merge "Contextual dictionary updater." 2014-06-10 22:31:57 +00:00
Yohei Yukawa
c1cb930dde Merge "Revert "Check OS codename for shouldOfferSwitchingToNextInputMethod"" 2014-06-10 22:29:12 +00:00
Yohei Yukawa
58e248ebda Revert "Check OS codename for shouldOfferSwitchingToNextInputMethod"
This reverts commit 1690992d1b.

Build.VERSION.SDK_INT is bumped with I4716e71d72b2526fe635079d1b.                                                                                     
We no longer need this workaround.

Change-Id: I75a1c2a7055af17a7d40291aadd62ae9bb42e056
2014-06-13 03:12:17 +00:00
Tadashi G. Takaoka
a68e0dd437 Fix NPE by disabling key preview popup of Emoji palette
Bug: 15579928
Change-Id: I6bcf885f2c1aa37b337a85978409ccf41e459c2a
2014-06-13 11:04:56 +09:00
Keisuke Kuroyanagi
da0ea7603b Merge "Add jni method for removeUnigramEntry()." 2014-06-10 22:31:57 +00:00
Keisuke Kuroyanagi
b4d77eca55 Add jni method for removeUnigramEntry().
Bug: 15552347
Change-Id: Iadcdc73d3335d561a27b9314d3fcdab0b0c96e49
2014-06-12 12:21:44 +09:00
Keisuke Kuroyanagi
81bd7e2007 Merge "Personalization dictionary updater." 2014-06-10 22:29:12 +00:00
Tadashi G. Takaoka
08199ec859 Clear PointerTracker state when more keys keyboard is dismissed
With accessibility mode on, hover events for a more keys keyboard are
handled among MoreKeysKeyboardAccessibilityDelegate and
MoreKeysKeyboardView. But the more keys keyboard is shown by
MainKeyboardAccessibilityDelegate that uses PointerTracker to handle
hover events. Thus we need to clear PointerTracker state when the more
keys keyboard is dismissed.

This is a workaround to resolve the issue. We should reconsider the
structure of those views and accessibility delegates in the future.

Bug: 15583751
Change-Id: Ida8c3e55194c59bdaa5bc4ff06068e699b888ced
2014-06-13 15:54:25 +09:00
Keisuke Kuroyanagi
4715baf93b Merge "Fix: Wrong name for ContextualDictionary." 2014-06-10 22:29:12 +00:00
Keisuke Kuroyanagi
3bedb9b3e6 Fix: Wrong name for ContextualDictionary.
Bug: 15557070
Change-Id: I5796df54a74c111d361da8c548e5597aba8e24d0
2014-06-11 19:58:22 +09:00
Tadashi G. Takaoka
6a96c508fd Fix logic to show suggestions
Bug: 15531465
Change-Id: Ic7fe5743ad3767cdaed699e5e2d1ebcaa75e22c2
2014-06-11 11:51:58 +09:00
Keisuke Kuroyanagi
447c19364a Merge "Enable Beginning-of-Sentence prediction for contextual dict." 2014-06-10 22:31:57 +00:00
Keisuke Kuroyanagi
22931cd941 Enable Beginning-of-Sentence prediction for contextual dict.
Bug: 14161647
Bug: 14119293
Change-Id: I0c00f13966db88e4de85e245e7bced43c9d474b2
2014-06-12 12:26:18 +09:00
Jean Chalard
d979d416c1 Merge "Special case periods in the spell checker" 2014-06-10 11:57:21 +00:00
Keisuke Kuroyanagi
cdfd2ce5a3 Merge "Add prefix to the arguments of getDictionary()." 2014-06-10 11:41:34 +00:00
Keisuke Kuroyanagi
f36da2fdba Merge "Make dump dictionary settings easily extensible." 2014-06-10 11:08:38 +00:00
Keisuke Kuroyanagi
a20432479d Make dump dictionary settings easily extensible.
This adds "Dump contextual dictionary".

Bug: 14161647
Change-Id: I41a6d6e131d9d8c300ac0120d903d46d88bb3346
2014-06-10 19:59:19 +09:00
Jean Chalard
4863a06544 Special case periods in the spell checker
Special case <valid word>.<valid word> to send as a suggestion
the same string where the periods is replaced by a space.

Bug: 10780091
Change-Id: I43c94675977f9ab5d7ee5671486cb742b39f3974
2014-06-10 19:52:58 +09:00
Keisuke Kuroyanagi
48b0074349 Merge "Purge dict reading code for 401 and create for 402." 2014-06-10 10:31:05 +00:00
Keisuke Kuroyanagi
07e1412631 Purge dict reading code for 401 and create for 402.
Change-Id: Ib0150b3306bb2db8aff443d1158fecc8464cbbdb
2014-06-10 19:22:40 +09:00
Keisuke Kuroyanagi
18df192535 Add prefix to the arguments of getDictionary().
Bug: 13630847
Change-Id: Ib4513b8cb6981e01dd33fd9703cc01646a2c7ccc
2014-06-10 18:05:10 +09:00
Jean Chalard
2d7feb5ad0 Merge "Split the sentences into words ourselves" 2014-06-10 08:18:36 +00:00
Keisuke Kuroyanagi
1ffb7cd448 Merge "Debug log when failed to add/remove n-gram entry." 2014-06-10 05:14:23 +00:00
Keisuke Kuroyanagi
354a59dfa4 Debug log when failed to add/remove n-gram entry.
Change-Id: Ibf0a4e01e1abc81b09aec104ba39d2ec18f4db8b
2014-06-10 13:04:57 +09:00
Jean Chalard
e689d37f72 Remove a useless method
Change-Id: I21a4219f682f43f4a84b1ab12d00dd930b35caa1
2014-06-10 12:47:55 +09:00
Jean Chalard
264afb10bd Merge "Remove mPrevWordsInfo" 2014-06-10 03:21:47 +00:00
Jean Chalard
367c199de1 Remove mPrevWordsInfo
This member has outlived its usefulness. It's not clear now that it
makes things really faster, but it does bring a lot of complexity
that we can avoid by removing it.

Change-Id: Ifbc8094a45b56b958fe165b1930f4cc358a97721
2014-06-10 12:07:51 +09:00
Tadashi G. Takaoka
874a600dc8 Add audio and haptic feedback for Emoji and Suggestions
Bug: 15378862
Change-Id: Ia14929bd9eb63ad5735cae0ad98ad0e2ad301128
2014-06-10 09:15:59 +09:00
Tadashi G. Takaoka
d022df49bd Merge "Set content descrition of words in suggestions strip" 2014-06-09 13:01:44 +00:00
Tadashi G. Takaoka
f3c852efad Set content descrition of words in suggestions strip
Bug: 14849593
Change-Id: If020e2352c8e950ce87dc4711c39b8a6a41f66fc
2014-06-09 21:40:36 +09:00
Jean Chalard
43ea8f6e77 Merge "Use RichInputConnection to get the previous word." 2014-06-09 10:47:28 +00:00
Jean Chalard
453711abe2 Use RichInputConnection to get the previous word.
We don't need the optimization of storing the old words now
that the RichInputConnection can supply it without IPC.

Bug: 13703802
Change-Id: I37ccb8d5fba879fb04b4f23d33571849736d897c
2014-06-09 19:43:20 +09:00
Jean Chalard
7a6bc607ca Split the sentences into words ourselves
The framework's default split is not suitable for all
languages. Also it does not perform very well when space
is mistyped as period.

Bug: 9063355
Bug: 10780091
Change-Id: I400d790ff1c29f221697fd94d79bbf67c61c7b8a
2014-06-09 19:38:03 +09:00
Tadashi G. Takaoka
48b96a6a52 Fix TalkBack descriptions of keyboard shift mode transition
Bug: 14846348
Change-Id: I32435a31f919974a506e598d1f3cc1b55a0866ae
2014-06-09 17:28:49 +09:00
Tadashi G. Takaoka
402e847477 Merge "Use rectangle region to ignore hover events after long press" 2014-06-09 07:56:41 +00:00
Tadashi G. Takaoka
862d7ec32e Merge "Refactor KeyCodeDescriptionMapper class a bit" 2014-06-09 07:56:28 +00:00
Tadashi G. Takaoka
176f803176 Use rectangle region to ignore hover events after long press
Bug: 15500282
Bug: 15501718
Change-Id: Ia4771198c3120a980b0a2cdd210928a4f47f5b83
2014-06-09 16:32:19 +09:00
Tadashi G. Takaoka
24fab555f9 Refactor KeyCodeDescriptionMapper class a bit
This CL adds getDescriptionForCode() method.

Bug: 15500282
Change-Id: I3bb92c8f356ea623fc992c924506b11e09256e98
2014-06-09 16:28:30 +09:00
Keisuke Kuroyanagi
7f0316c27e Merge "Add distracter cache to optimize the distracter test." 2014-06-09 05:35:46 +00:00
Keisuke Kuroyanagi
9f02a67c77 Merge "Fix: NPE after turning on personalized suggestion." 2014-06-09 05:35:32 +00:00
Keisuke Kuroyanagi
104b582c35 Add distracter cache to optimize the distracter test.
Bug: 13142176
Bug: 15428247
Change-Id: Ia390b148ffb36ace6c2010daf0f14838492413e8
2014-06-09 12:39:06 +09:00
Keisuke Kuroyanagi
65cf23eb38 Fix: NPE after turning on personalized suggestion.
Bug: 13142176
Bug: 15428247
Change-Id: I236202e3c1b70a11d512c946798035087945c0ac
2014-06-09 12:26:59 +09:00
Keisuke Kuroyanagi
a2a4ee2765 Merge "Check isInDictionary() before the distracter test." 2014-06-09 02:53:33 +00:00