Commit graph

7228 commits

Author SHA1 Message Date
Keisuke Kuroyanagi
67f863f4cb Merge "Extend jni method to use multiple previous words." 2014-06-24 01:52:26 +00:00
Jean Chalard
c0748a1990 Fix the build
That was a merge not well resolved by git >.>

Change-Id: I3cd042d6a5206daf1e9942358405d647c67423dd
2014-06-26 18:44:54 +09:00
Keisuke Kuroyanagi
d58a07666e Merge "Rename jni method for n-gram supporting." 2014-06-24 01:52:26 +00:00
Keisuke Kuroyanagi
6c7cebdefb Fix build.
Change-Id: I5c6c0a9098c5a228ed82b208aa6f237a41f2f6cc
2014-06-26 14:42:40 +09:00
Keisuke Kuroyanagi
83b6ee2538 Rename jni method for n-gram supporting.
Bug: 14425059
Change-Id: I242d1de5d9db37344f02d8fba9035829794a56c8
2014-06-25 14:14:40 +09:00
Keisuke Kuroyanagi
e708b1bc2e Make PrevWordsInfo have multiple words' information.
Bug: 14425059
Change-Id: I2bd6a872904a44b80f638a13d91a97559217cc1a
2014-06-25 14:14:37 +09:00
Jean Chalard
310bb2c76f Merge "[HW1] Fix some bugs with event handling" 2014-06-24 01:52:26 +00:00
Jean Chalard
09291050a0 [HW1] Fix some bugs with event handling
With hardware events, we do have some events that
have both a keycode and a code point, so we need
a better way of distinguishing between auto-insert
keystrokes and others.

Change-Id: Ia23042989b4dca9d3a7d4a4c06bcebdabe324a7a
2014-06-26 18:27:53 +09:00
Jean Chalard
90759f2ab7 Merge "[CS4] Remove useless tests and processing" 2014-06-24 01:59:00 +00:00
Jean Chalard
b740886aeb [CS4] Remove useless tests and processing
Since we have a de-duped and transformed collection, we
can just read from it instead of computing it separately.

Bug: 13238601
Change-Id: I0aa4b0d91d3b350f9449e13658bfb587fc538764
2014-06-26 18:26:08 +09:00
Keisuke Kuroyanagi
92827b0712 Merge "Make PrevWordsInfo have multiple words' information." 2014-06-24 01:52:26 +00:00
Keisuke Kuroyanagi
0aef59746c Make Beginning-of-Sentence prediction require two exposures.
Bug: 15868192
Change-Id: I4b577ad11c992d872d6f902fd50527d9ca5cc1ba
2014-06-25 20:20:44 +09:00
Jean Chalard
53f23234e3 Merge "[CS3.5] Small correction" 2014-06-24 01:46:27 +00:00
Jean Chalard
c82257ba6e [CS3.5] Small correction
Bug: 13238601
Change-Id: I7bd82a4678d8bf88f16bf271f20be8d37f9b97d7
2014-06-24 18:26:51 +09:00
Jean Chalard
d700e59700 Merge "Some cleanup to accommodate a fix" 2014-06-24 01:59:00 +00:00
Jean Chalard
132bdd079c Merge "[CS3] Move transformation of words to earlier" 2014-06-24 01:52:26 +00:00
Jean Chalard
8d3d0f3b84 Merge "[SD1] Move script-related methods to a new utils class." 2014-06-24 01:46:27 +00:00
Jean Chalard
289299bf66 [SD1] Move script-related methods to a new utils class.
Bug: 15840116
Change-Id: I3a2a9c41e40590c0116c7885a49c6fa308ed8f44
2014-06-26 18:24:11 +09:00
Jean Chalard
a3f7a5840a Don't commit a space before it's actually needed
Bug: 15740318
Change-Id: Idad06cb2c18335a981d5e9dea7eccf5e7ea8f701
2014-06-25 10:37:06 +09:00
Keisuke Kuroyanagi
dc6ee3a63f Merge "Enable beginning-of-sentence prediction." 2014-06-24 01:46:27 +00:00
Keisuke Kuroyanagi
2725cc17d7 Enable beginning-of-sentence prediction.
Bug: 14119293
Change-Id: I23c407f0afed0ae4af290a1195b0e3bbcd5af8d7
2014-06-24 12:37:09 +09:00
Keisuke Kuroyanagi
88fa47a27d Support migration/dump of Beginning-of-Sentence entries.
Bug: 14119293
Change-Id: Ie975138f819794d5c34a7a547be5a6117050e084
2014-06-24 12:37:07 +09:00
Keisuke Kuroyanagi
702e153fbc Merge "Support migration/dump of Beginning-of-Sentence entries." 2014-06-24 01:59:00 +00:00
Jean Chalard
a1d518ca88 Merge "[CS2] Refactor a bit removeDups" 2014-06-24 01:46:27 +00:00
Tadashi G. Takaoka
d92204b56a Merge "Reorganize Keyboard settings screen" 2014-06-23 21:50:10 +00:00
Tadashi G. Takaoka
058c6c6491 Reorganize Keyboard settings screen
This CL must be checked in together with Ie45df15b18.

Bug: 11866784
Change-Id: I44d6ceb45108be135e3eaa361f4ee2c83f04fb57
2014-06-23 18:46:09 -07:00
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