Commit graph

6361 commits

Author SHA1 Message Date
Tadashi G. Takaoka
36b8962a9a Merge "Fix UserHistoryDictionaryTests" 2014-02-13 07:49:51 +00:00
Tadashi G. Takaoka
32c8d58cef Merge "Fix showing all suggestions when the top suggestion is long" 2014-02-13 07:17:31 +00:00
Tadashi G. Takaoka
0cda0e8a9c Fix UserHistoryDictionaryTests
Change-Id: I5f2f555f9c3f471545921ef80e4cf528976be837
2014-02-13 16:16:44 +09:00
Tadashi G. Takaoka
4f8a8f125e Fix showing all suggestions when the top suggestion is long
This change also fixes Bug#12982404; displays the suggestion word
using entire suggestions strip if there is only one suggestion.

Bug: 12564279
Bug: 12982404
Change-Id: I51806b90c3ee34a2072880245d4e33f7be273c8f
2014-02-13 15:22:36 +09:00
Jean Chalard
e0a425681c Merge "Fix a test." 2014-02-13 05:20:58 +00:00
Jean Chalard
cf03ff02b1 Fix a test.
This fixes two separate problems:
- The word finds itself with two separate suggestion spans.
This is fine for LatinIME, but it's hard to predict whether it's
fine for other interested parties (other keyboards).
- The test for the blue underline was incorrect.

Change-Id: I3ecc849676851bf25a25238d694adaa956521a26
2014-02-13 14:01:37 +09:00
Tadashi G. Takaoka
8dd47029f1 Merge "Refactor dictionary constructor" 2014-02-13 04:55:16 +00:00
Jean Chalard
c3cfabd0eb Merge "Dump settings." 2014-02-13 04:26:52 +00:00
Tadashi G. Takaoka
870d89b1a8 Refactor dictionary constructor
This change must be checked in together with I3923d5af2a.

Bug: 12994268
Change-Id: I19de6efbdfa3b6c6c69a20a836e53962fd5737de
2014-02-13 13:23:55 +09:00
Yohei Yukawa
cfe26bbcde Fix indent.
This is a follow up for the previous commit to fix indent.

BUG: 12964092
Change-Id: I0530b1c0dae26ac736ddcc6d426ec6ce57bce4d1
2014-02-13 01:58:58 +09:00
Jean Chalard
367a35d377 Dump settings.
Bug: 10315296
Change-Id: Ieb020a23886514b3ba97611d8a6001f32b322f63
2014-02-12 22:53:15 +09:00
Yohei Yukawa
50fbe4cc09 Merge "Cancel keydown events immediately once the view starts scrolling" 2014-02-12 10:21:08 +00:00
Yohei Yukawa
4c259866c4 Cancel keydown events immediately once the view starts scrolling
The motivation of this patch is to make sure a user never feel
haptic feedback when scrolling the Emoji palette. In order to
achieve it, EmojiPageKeyboardView#releaseCurrentKey() should
be called whenever (delayed) keydown events should be canceled.

This patch wires up ViewPager.OnPageChangeListener#onPageScrolled
with EmojiPageKeyboardView#releaseCurrentKey() so that delayed
keydown events will be canceled immediately once the ViewParger
starts scrolling.

BUG: 12964092
Change-Id: Iea8c3e090bb16a8622e6b4a850af2bf963aa77d0
2014-02-12 18:56:08 +09:00
Tadashi G. Takaoka
5a885e85c2 Merge "Keep showing key preview even when keyboard has been changed" 2014-02-12 09:40:55 +00:00
Tadashi G. Takaoka
dd6ba4b184 Merge "Fix bug in KeyPreviewChoreographer.dismissKeyPreview" 2014-02-12 09:13:37 +00:00
Jean Chalard
8adedbf47c Show the suggestion strip for the important notice
Bug: 10587358
Change-Id: Ia060a9ca9dfc2e7fe0750536a9fea3b9cc5900c4
2014-02-12 17:30:04 +09:00
Tadashi G. Takaoka
075158ccd0 Keep showing key preview even when keyboard has been changed
Bug: 12979147
Change-Id: I7e1f60686d6a8a0fca463174abb0a45f1f62ca43
2014-02-12 15:09:03 +09:00
Tadashi G. Takaoka
7e9b0b42bf Fix bug in KeyPreviewChoreographer.dismissKeyPreview
Bug: 12979147
Change-Id: Ibc60b4565badaebe760194f27984b02f9f966996
2014-02-12 14:50:56 +09:00
Tadashi G. Takaoka
7ffac033ac Make importance notice dialog cancel able
Bug: 10587358
Change-Id: I7415a6f33e6b5542718164fea1555095d23233e5
2014-02-12 11:59:43 +09:00
Tadashi G. Takaoka
6e1710f0d4 Merge "Optimize text resources' ordering a bit" 2014-02-11 13:33:42 +00:00
Tadashi G. Takaoka
d495cc36b7 Merge "Get nicer output of make-keyboard-text" 2014-02-11 12:43:32 +00:00
Tadashi G. Takaoka
8bfd6100d9 Optimize text resources' ordering a bit
Change-Id: I19382f1d9a4b6be173d1e9f62edd727ea987fa20
2014-02-11 21:41:55 +09:00
Tadashi G. Takaoka
ed509695a4 Get nicer output of make-keyboard-text
Change-Id: I6d30127aac2198d55b1335002f7a66b4aaebf82d
2014-02-11 21:41:21 +09:00
Jean Chalard
3df8bcb7a9 Revert "Display predictions when the cursor is moved after a word."
This change is lacking some comments and break some unit tests.
It needs more work.

This reverts commit 38d31a5e79.

Change-Id: I675854fd0729f2d01b7751e35c6d0117f4f88993
2014-02-10 14:24:30 +00:00
Jean Chalard
38d31a5e79 Display predictions when the cursor is moved after a word.
Bug: 12951777
Change-Id: I744b98df6679edd34ca3c1392e38597325935932
2014-02-10 23:07:00 +09:00
Jean Chalard
f9e5b1ee4f Merge "Show important notice strip" 2014-02-10 12:18:10 +00:00
Tadashi G. Takaoka
8dda9e480b Show important notice strip
Bug: 10587358
Change-Id: I1af3faa59afb2fc4cb90176acff1c2b0b1ba369c
2014-02-10 21:15:35 +09:00
Keisuke Kuroyanagi
ea24abf878 Merge "Remove unused code." 2014-02-10 07:19:53 +00:00
Keisuke Kuroyanagi
2ef87aee3e Merge "Make PtNode have ProbabilityInfo instead of raw value." 2014-02-10 06:10:51 +00:00
Keisuke Kuroyanagi
69ccac6e51 Remove unused code.
Bug: 12810574
Change-Id: If0ef02a984469a3b6e0c00b1c3c8d98d0d2b5466
2014-02-10 15:05:11 +09:00
Keisuke Kuroyanagi
8ffc631826 Make PtNode have ProbabilityInfo instead of raw value.
Bug: 11281877
Bug: 12810574
Change-Id: Id1cda0afc74c4e30633c735729143491b2274a7b
2014-02-10 15:05:08 +09:00
Tadashi G. Takaoka
cbb0a6de3b Merge "Fix possible NPE while finding device override value from resource" 2014-02-10 05:51:44 +00:00
Tadashi G. Takaoka
bd9887a574 Fix possible NPE while finding device override value from resource
Bug: 12949735
Change-Id: Iffda08db413b3b3d338ab9bf625bb0968c2e48dd
2014-02-10 14:38:53 +09:00
Tadashi G. Takaoka
f70bcf3d32 Refactor Key constructors
This is a followup of I76432556ca.

Change-Id: Ie2c8f7c23352a33db28e89ee8e6ebaba9eb760a3
2014-02-10 11:14:35 +09:00
Tadashi G. Takaoka
541a3d394c Remove unused import
Change-Id: I3f934de281eefb387026585e678d783a95729720
2014-02-10 10:22:29 +09:00
Tadashi G. Takaoka
45eb5d924d Allow an empty keySpec for Spacer
Bug: 12933248
Change-Id: I76432556caf319ce23c1fb7fa3d6b94118e64cf8
2014-02-09 23:45:23 +09:00
Tadashi G. Takaoka
e5320c1d1f Generate KeyboardTextsTable.java instead of KeyboardTextsSet.java
Change-Id: Ic48b093dc64b514822cc9daa1ac3d79deb7af089
2014-02-07 18:56:23 +09:00
Tadashi G. Takaoka
4f72923fa2 Merge "Rename Key.keyLabel attribute to KeySpec" 2014-02-07 09:53:43 +00:00
Tadashi G. Takaoka
4e85476740 Merge "Consolidate keyIcon and code with keyLabel attribute" 2014-02-07 09:53:35 +00:00
Tadashi G. Takaoka
9684b33b69 Rename Key.keyLabel attribute to KeySpec
Change-Id: Ida48cd9bdbc01fefad651a005084262c0f46c41c
2014-02-07 18:47:45 +09:00
Tadashi G. Takaoka
a83a1feb62 Consolidate keyIcon and code with keyLabel attribute
Change-Id: I75fbd348fab5022606ca14552eb03b15af6684c8
2014-02-07 18:47:22 +09:00
Tadashi G. Takaoka
a9e1db6636 Merge "Decimal number is treated as outputText" 2014-02-07 09:26:04 +00:00
Tadashi G. Takaoka
276b1a2ebc Add debug settings for keypress popup animations
Bug: 12928125
Change-Id: I49faab754c7d1dcf4a791dfc535d3a78b62ce67a
2014-02-07 18:09:41 +09:00
Keisuke Kuroyanagi
6422f77e94 Merge "Use native logic to read Ver4 dict." 2014-02-06 13:00:09 +00:00
Keisuke Kuroyanagi
ab6a93773b Use native logic to read Ver4 dict.
Bug: 11281877
Bug: 12810574
Change-Id: Ief371d3ef61818e4e031de4659aee3c9584c7379
2014-02-06 21:55:37 +09:00
Keisuke Kuroyanagi
fc6d0f8738 Merge "Implement getHeaderInfoNative." 2014-02-06 11:26:49 +00:00
Keisuke Kuroyanagi
fc9ca59cc1 Implement getHeaderInfoNative.
Bug: 11281877
Bug: 12810574
Change-Id: Ia3d85ae2cfdb486e74b8636a62431eae883c85da
2014-02-06 18:19:42 +09:00
Tadashi G. Takaoka
3bbd50c36b Use SubtypeLocaleUtils.isRtlLanguage
Change-Id: Ic0208412cd9c02975641cb5c448d092f28786746
2014-02-06 18:15:32 +09:00
Tadashi G. Takaoka
48ea52800a Merge "Consolidate keyOutputText with keyLabel attribute" 2014-02-06 09:14:09 +00:00
Tadashi G. Takaoka
d645db1e37 Merge "Move INCLUDE_RAW_SUGGESTIONS flag to ProductionFlag" 2014-02-06 09:01:41 +00:00
Tadashi G. Takaoka
a9b67135bd Merge "Parse keyLabel for icon, code, and outputText as well" 2014-02-06 08:38:54 +00:00
Tadashi G. Takaoka
df75444239 Move INCLUDE_RAW_SUGGESTIONS flag to ProductionFlag
This change must be checked in together with Iac93eb79fc.

Bug: 12913520
Bug: 12179576
Change-Id: Ic9a40fb0529202893be8ccb6f5abfbbe6d78508c
2014-02-06 17:28:08 +09:00
Tadashi G. Takaoka
0df462730b Remove unused smiley key definitions
Change-Id: Icbdfb360abab2964869898949774f47197f6d000
2014-02-06 16:56:42 +09:00
Tadashi G. Takaoka
d6f147e142 Consolidate keyOutputText with keyLabel attribute
Change-Id: I90ea2c9d5ce42fabc79599995a2fae1f5f652a6b
2014-02-06 16:42:57 +09:00
Tadashi G. Takaoka
6193217f5c Parse keyLabel for icon, code, and outputText as well
Change-Id: I023915b68b4aabd056c2c1eb745876471556e15e
2014-02-06 16:42:17 +09:00
Jean Chalard
a9e1930a6a Merge "Conditionally store the raw suggestions." 2014-02-06 07:31:22 +00:00
Tadashi G. Takaoka
4a64ad9538 Decimal number is treated as outputText
Change-Id: I9d4a8ac5dd26a7c41fcfbe1842a40f347a2f2aab
2014-02-06 16:30:12 +09:00
Keisuke Kuroyanagi
fd018c1588 Merge "Use CombinedFormatUtils to convert dict elements to strings." 2014-02-06 07:29:30 +00:00
Jean Chalard
a49f61f8a7 Conditionally store the raw suggestions.
Bug: 12913520
Change-Id: Ie15f97d90c142c51089280252b35b5ad1d226e19
2014-02-06 16:14:41 +09:00
Keisuke Kuroyanagi
b24de426fc Use CombinedFormatUtils to convert dict elements to strings.
Bug: 11281877
Bug: 12810574
Change-Id: Ib631f75eab73abc9877a7698171c45e8f2fc7600
2014-02-06 16:09:25 +09:00
Keisuke Kuroyanagi
337dce8074 Merge "Consolidate WordProperty and Word." 2014-02-06 07:02:07 +00:00
Keisuke Kuroyanagi
0c088e2d74 Merge "Unregister DictionaryDumpBroadcastReceiver in onDestroy()." 2014-02-06 06:55:42 +00:00
Keisuke Kuroyanagi
f2d15d6956 Unregister DictionaryDumpBroadcastReceiver in onDestroy().
Change-Id: I83a05a8369c2fe2fa7522f18eb00983a0b10dc19
2014-02-06 15:37:41 +09:00
Keisuke Kuroyanagi
5f5feeba13 Consolidate WordProperty and Word.
Bug: 11281877
Bug: 12810574
Change-Id: I9dc99188f80f25a8780c1860dab46e4aa80a23e5
2014-02-06 15:13:33 +09:00
Jean Chalard
058d615121 Remove a redundant comment.
No need to say this twice.

Change-Id: Ief7ac425037aa2767ee8f21c9552138a9c46afc8
2014-02-05 22:42:38 +09:00
Jean Chalard
58eed6360d Merge "Stop considering personalization dicts outputs as words" 2014-02-05 13:33:12 +00:00
Jean Chalard
5095fabdd0 Stop considering personalization dicts outputs as words
Bug: 12800726
Bug: 12798403
Change-Id: I6d60f9ad39761757f8a64533f40d6441f3a36410
2014-02-05 21:57:37 +09:00
Keisuke Kuroyanagi
239f7daf4a Merge "Make WeightedString have ProbabilityInfo." 2014-02-05 12:53:14 +00:00
Keisuke Kuroyanagi
df1d3e733e Make WeightedString have ProbabilityInfo.
Bug: 11281877
Bug: 12810574
Change-Id: I265e3d8654c75766cd0e0d09d67ef62b4566298a
2014-02-05 21:44:55 +09:00
Keisuke Kuroyanagi
e42380a471 Merge "Separate ProbabilityInfo form WordProperty." 2014-02-05 12:37:49 +00:00
Keisuke Kuroyanagi
75a3df30f6 Separate ProbabilityInfo form WordProperty.
Bug: 11281877
Bug: 12810574
Change-Id: I0c77d976c915bdf2a2cddabd0cbedc2fb6691c7b
2014-02-05 21:31:35 +09:00
Jean Chalard
8fb2f6a441 Merge "Fix a flash in the wrong place" 2014-02-05 09:46:44 +00:00
Jean Chalard
9e9e948a70 Fix a flash in the wrong place
Bug: 7226099
Change-Id: I8f74802b3ae24018fc4176fb2fff2c777ae170b0
2014-02-05 18:44:24 +09:00
Tadashi G. Takaoka
02a534d13f Merge "Treat a sole "|" as a special case of key label" 2014-02-05 09:32:12 +00:00
Tadashi G. Takaoka
6e5dbdd501 Merge "Add null check to KeySpecParser" 2014-02-05 09:32:04 +00:00
Tadashi G. Takaoka
6a16fa1f10 Merge "Refactor KeySpecParser a bit" 2014-02-05 09:17:01 +00:00
Jean Chalard
b162911fa4 Merge "[HD04] Make the locale mandatory." 2014-02-05 09:16:17 +00:00
Tadashi G. Takaoka
f7d8b8fcbc Treat a sole "|" as a special case of key label
Change-Id: Ia72c31d15c891fa522935ba9792e88fd5d8ce7f7
2014-02-05 17:57:44 +09:00
Jean Chalard
bbb6e8f10f Merge "[IL109] Move more code to InputLogic" 2014-02-05 08:50:28 +00:00
Jean Chalard
a6ea33b4d7 Merge "[IL108] Remove some uses of LatinIME in input logic." 2014-02-05 08:49:44 +00:00
Tadashi G. Takaoka
d9c6b33209 Add null check to KeySpecParser
Change-Id: Ic37db8cbf8f83f753d7381e1edba8eac1ef1ceb1
2014-02-05 17:49:26 +09:00
Tadashi G. Takaoka
bc9514032a Refactor KeySpecParser a bit
Change-Id: I1208746f42eb92f937812149033398d8318f9c4e
2014-02-05 17:43:53 +09:00
Jean Chalard
43cf9076b2 [HD04] Make the locale mandatory.
Bug: 11281748
Change-Id: I69281b0053bec404c3e3c713ade3f65a140f51b1
2014-02-05 17:35:25 +09:00
Tadashi G. Takaoka
bb476be4e6 Move key preview related methods to KeyPreviewChoreographer
Change-Id: Ia8d6b7fa922a4da233bf851b2e94bbd2573a65a3
2014-02-05 15:41:39 +09:00
Tadashi G. Takaoka
f2749e41e4 Merge "Revert "Move key preview related methods to KeyPreviewChoreographer"" 2014-02-05 06:28:45 +00:00
Tadashi G. Takaoka
32d6c6a400 Revert "Move key preview related methods to KeyPreviewChoreographer"
This reverts commit 38806940b9.

Change-Id: I185c4d5f5d92dd269f678206ef3ff8316cbce6ed
2014-02-05 06:27:41 +00:00
Jean Chalard
2bb1c6add9 [IL109] Move more code to InputLogic
Bug: 8636060
Change-Id: Ib12eacc836e8d39c4165c97a2a287f32f6bf5405
2014-02-05 14:49:59 +09:00
Jean Chalard
2c01dd00f2 [IL108] Remove some uses of LatinIME in input logic.
Access the suggestion strip through the interface instead.

Bug: 8636060
Change-Id: Ia8bd705c230f943e309d677ef683b1a2cbe68036
2014-02-05 14:49:59 +09:00
Jean Chalard
ade1aa55b6 [IL107] Add an interface to access the suggestion view.
Bug: 8636060
Change-Id: I603af6bcdaa31f64aaaf916784720a133388c737
2014-02-05 14:49:57 +09:00
Tadashi G. Takaoka
aac53dd7f5 Merge "Move key preview related methods to KeyPreviewChoreographer" 2014-02-05 03:45:08 +00:00
Keisuke Kuroyanagi
c488048634 Merge "Check isEligibleForAutoCommit when batch input is ended." 2014-02-05 03:34:46 +00:00
Tadashi G. Takaoka
38806940b9 Move key preview related methods to KeyPreviewChoreographer
Change-Id: I18cbbd287313826bc72437c6ebab2915c1d7bc50
2014-02-05 12:34:06 +09:00
Keisuke Kuroyanagi
8c5c01e981 Check isEligibleForAutoCommit when batch input is ended.
Bug: 11951198
Change-Id: Ibbe09fa38eaa3ebf8f9b69f744a29db7ac598975
2014-02-05 11:40:17 +09:00
Tadashi G. Takaoka
66b2fcf2bf Merge "Move some XML attributes to KeyPreviewDrawParams" 2014-02-05 00:51:23 +00:00
Keisuke Kuroyanagi
ad37cddd79 Merge "Add jni interface to get header information from native." 2014-02-04 12:52:50 +00:00
Keisuke Kuroyanagi
f32b2d5c5e Merge "Add a utility method to StringUtils." 2014-02-04 12:47:21 +00:00
Keisuke Kuroyanagi
aaf864db7b Merge "Separate header class from FormatSpec." 2014-02-04 12:42:44 +00:00
Keisuke Kuroyanagi
927aff72bc Add jni interface to get header information from native.
Bug: 12810574
Change-Id: I2508483bcb3157f04cc1fe13f24f864d301f1f28
2014-02-04 21:42:09 +09:00
Keisuke Kuroyanagi
53fb86c447 Add a utility method to StringUtils.
Bug: 12810574
Change-Id: I607803e924b9e99855df7690e67488b2861c120e
2014-02-04 21:42:06 +09:00
Keisuke Kuroyanagi
b986f78ba8 Separate header class from FormatSpec.
Bug: 12810574
Change-Id: Iacf1cd05a268bf690ab864b5e32a18a4b0ccc693
2014-02-04 21:36:04 +09:00