Jean Chalard
781d75126b
am ee8ebeec
: Merge "Fix unit tests"
...
* commit 'ee8ebeecbf80b9cccc5569570112634b49c45b53':
Fix unit tests
2014-08-25 09:34:30 +00:00
Jean Chalard
ee8ebeecbf
Merge "Fix unit tests"
2014-08-25 09:26:17 +00:00
Jean Chalard
dc110b2a6a
Fix unit tests
...
Change-Id: I48bfa4e4dd80f36d2fe0a1e9d2a2706533cc722e
2014-08-25 18:19:00 +09:00
Tadashi G. Takaoka
ca9e970c7c
am 7defe926
: am 4a782da3
: am f145fff0
: Merge "Fix NPE when pressing ALT key" into lmp-dev
...
* commit '7defe926ca0eed2a18665cd0e4bf2ec305a03879':
Fix NPE when pressing ALT key
2014-08-25 09:10:40 +00:00
Yohei Yukawa
8787d7f154
am 4587b135
: am 2d508203
: am 8681287c
: Fix build due to an illegal character
...
* commit '4587b135be7f184bdf60f8e4113e81070ce2d825':
Fix build due to an illegal character
2014-08-25 09:10:38 +00:00
Yohei Yukawa
34439d70e2
am 8c7daa82
: am 02716083
: am 5eebaddc
: Merge "Dismiss "Add to dictionary" hint with non-special char event" into lmp-dev
...
* commit '8c7daa829a3a81b3a803048d7af82383a8b48aed':
Dismiss "Add to dictionary" hint with non-special char event
2014-08-25 09:10:37 +00:00
Yohei Yukawa
aa19b7d304
am a5687ee9
: am b65a1e46
: am 2c4cce8d
: Merge "Introduce #shouldShowAddToDictionaryHint" into lmp-dev
...
* commit 'a5687ee9f7c3eff7eb8b97ebfb12fc1d93b9e41c':
Introduce #shouldShowAddToDictionaryHint
2014-08-25 09:10:35 +00:00
Tadashi G. Takaoka
4cc44f9f62
am ef7c701e
: am 129af927
: am 5e7a6fe0
: Merge "Fix the bottom row of tablet keyboard layout" into lmp-dev
...
* commit 'ef7c701e72d9ccc735ce77829cb55cf46ed25339':
Fix the bottom row of tablet keyboard layout
2014-08-25 09:10:34 +00:00
Yohei Yukawa
9a0b9aba64
am f6f55add
: am e0d00803
: am 4a71d2c4
: Allow to add/remove background color to/from the committed text
...
* commit 'f6f55add175bcd37710764afd05052974167bd1d':
Allow to add/remove background color to/from the committed text
2014-08-25 09:10:32 +00:00
Yohei Yukawa
3d057b402d
am c06c6e42
: am 7d146cdb
: am cd6ef9a8
: Indroduce SuggestedWords#getTypedWordInfoOrNull
...
* commit 'c06c6e42ad24e02a5433dcb44dba452d1cfb3f4f':
Indroduce SuggestedWords#getTypedWordInfoOrNull
2014-08-25 09:10:31 +00:00
Tadashi G. Takaoka
7defe926ca
am 4a782da3
: am f145fff0
: Merge "Fix NPE when pressing ALT key" into lmp-dev
...
* commit '4a782da382b83164ea5c23c771b771e73bbe31b3':
Fix NPE when pressing ALT key
2014-08-25 08:25:42 +00:00
Yohei Yukawa
4587b135be
am 2d508203
: am 8681287c
: Fix build due to an illegal character
...
* commit '2d508203c64f50ed47fb87c24ae5ebbfb0610a36':
Fix build due to an illegal character
2014-08-25 08:25:35 +00:00
Yohei Yukawa
8c7daa829a
am 02716083
: am 5eebaddc
: Merge "Dismiss "Add to dictionary" hint with non-special char event" into lmp-dev
...
* commit '02716083158c3affbcfc719ff6471112d7397578':
Dismiss "Add to dictionary" hint with non-special char event
2014-08-25 08:25:34 +00:00
Yohei Yukawa
a5687ee9f7
am b65a1e46
: am 2c4cce8d
: Merge "Introduce #shouldShowAddToDictionaryHint" into lmp-dev
...
* commit 'b65a1e46ce06adc462dfc4cbde302ac27a79b695':
Introduce #shouldShowAddToDictionaryHint
2014-08-25 08:25:33 +00:00
Tadashi G. Takaoka
ef7c701e72
am 129af927
: am 5e7a6fe0
: Merge "Fix the bottom row of tablet keyboard layout" into lmp-dev
...
* commit '129af92713c59016d13b957e55ce089984ccc4e8':
Fix the bottom row of tablet keyboard layout
2014-08-25 08:25:32 +00:00
Yohei Yukawa
f6f55add17
am e0d00803
: am 4a71d2c4
: Allow to add/remove background color to/from the committed text
...
* commit 'e0d00803087ac2f873332d43a78453c068633545':
Allow to add/remove background color to/from the committed text
2014-08-25 08:25:31 +00:00
Yohei Yukawa
c06c6e42ad
am 7d146cdb
: am cd6ef9a8
: Indroduce SuggestedWords#getTypedWordInfoOrNull
...
* commit '7d146cdbe86692f153fb5b7f781f701a8c04050d':
Indroduce SuggestedWords#getTypedWordInfoOrNull
2014-08-25 08:25:24 +00:00
Tadashi G. Takaoka
f145fff085
Merge "Fix NPE when pressing ALT key" into lmp-dev
2014-08-25 06:52:36 +00:00
Tadashi G. Takaoka
ad1f880811
Fix NPE when pressing ALT key
...
Bug: 17203708
Change-Id: I4f203603496e9401dacba4db21372e3353916418
2014-08-25 15:08:27 +09:00
Jean Chalard
adfb74a41e
am dc442604
: Merge "Revert "Revert "[ML1] Introduce RichInputMethodSubtype"""
...
* commit 'dc44260484a27d360c48daa069e7f3b7c07d12a2':
Revert "Revert "[ML1] Introduce RichInputMethodSubtype""
2014-08-25 05:30:53 +00:00
Jean Chalard
dc44260484
Merge "Revert "Revert "[ML1] Introduce RichInputMethodSubtype"""
2014-08-25 05:24:28 +00:00
Jean Chalard
85ddfe1317
Revert "Revert "[ML1] Introduce RichInputMethodSubtype""
...
This reverts commit a63d0a8ee6
.
This patch seems to be fine after all, but was submitted without its companion [ML1.1] patch causing a build breakage. Reverting the revert and submitting both at the same time seems like the right thing to do.
Change-Id: Ib8fefa40b74dcee0edb025a52dac9b35c82d49df
2014-08-25 04:42:15 +00:00
Yohei Yukawa
8681287cd6
Fix build due to an illegal character
...
Change-Id: I597ab26db70387b80ddcd7d51de6ae751380030d
2014-08-24 21:14:41 -07:00
Yohei Yukawa
5eebaddccb
Merge "Dismiss "Add to dictionary" hint with non-special char event" into lmp-dev
2014-08-25 04:08:56 +00:00
Yohei Yukawa
2c4cce8d6c
Merge "Introduce #shouldShowAddToDictionaryHint" into lmp-dev
2014-08-25 04:05:56 +00:00
Yohei Yukawa
ebc1509039
Introduce #shouldShowAddToDictionaryHint
...
This is a groundwork for subsequent CLs where we need to
call this method from multiple places. This CL does not
change any existing behaviors.
Change-Id: Id8fa0360305d7383571edffab6752b2240367cf9
2014-08-24 20:59:30 -07:00
Tadashi G. Takaoka
5e7a6fe098
Merge "Fix the bottom row of tablet keyboard layout" into lmp-dev
2014-08-25 03:45:35 +00:00
Tadashi G. Takaoka
c9aa1beb6d
Fix the bottom row of tablet keyboard layout
...
This CL eliminates "_" and "/" keys from the bottom row of tablet
keyboard. This CL also reorganizes the bottom row of tablet Dvorak
keyboard.
Bug: 16603887
Change-Id: Ic1570836dea1a475bed5d43aeb6a351507bf5428
2014-08-25 12:34:58 +09:00
Yohei Yukawa
034c326078
Dismiss "Add to dictionary" hint with non-special char event
...
This CL slightly extends the condition when "Add to dictionary"
hint is dismissed.
With this CL, "Add to dictionary hint" will be dismissed by any
non-special char event. This is more comfortable especially if
we start using more intrusive UIs such as indicator and/or
background color with the text hint in the suggestion strip.
Change-Id: I2ea0fa40d9c6663ebf5d5439be3eca2a2cbd5166
2014-08-24 20:32:22 -07:00
Yohei Yukawa
4a71d2c480
Allow to add/remove background color to/from the committed text
...
This is a groundwork for subsequent CLs where we need to
add/remove background color to/from the commited text.
In this CL, we use Spanned#SPAN_COMPOSING so that we can easily
remove such a background color by calling
InputConnection#finishComposingText. To make this operation easy
and realiable, we need to track whether we have specified the
background color to the commited text or not at one place. Here
we use RichInputConnection for this purpose.
Change-Id: I5f9bc4425c5d1b80a719a20e5baf336729ec08d2
2014-08-24 20:28:24 -07:00
Yohei Yukawa
cd6ef9a8b1
Indroduce SuggestedWords#getTypedWordInfoOrNull
...
This is a groundwork for subsequent CLs whith need to
do certain things for and only for the typed word.
Change-Id: I374b79cbc79470f57f523c996010301ea5701a61
2014-08-24 16:32:17 -07:00
Baligh Uddin
19a7012db5
Merge "Import translations. DO NOT MERGE"
2014-08-22 18:29:52 +00:00
Baligh Uddin
bf32c26578
Merge "Import translations. DO NOT MERGE"
2014-08-22 18:29:52 +00:00
Baligh Uddin
dafd54f055
Merge "Import translations. DO NOT MERGE"
2014-08-22 18:29:48 +00:00
Baligh Uddin
f1d070eae2
Merge "Import translations. DO NOT MERGE"
2014-08-22 18:29:48 +00:00
Baligh Uddin
e11effa538
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2014-08-22 18:29:46 +00:00
Baligh Uddin
7bf6d900b9
Merge "Import translations. DO NOT MERGE"
2014-08-22 18:29:42 +00:00
Tadashi G. Takaoka
4c09217b31
am 56087650
: am cc4d21df
: am 2637be27
: Support Accept typed word UI
...
* commit '560876508f7ad9ea618697268a8e8cb70ddf5e82':
Support Accept typed word UI
2014-08-22 14:36:41 +00:00
Tadashi G. Takaoka
560876508f
am cc4d21df
: am 2637be27
: Support Accept typed word UI
...
* commit 'cc4d21df7b08c3143dd1c4af786609a279a0bb79':
Support Accept typed word UI
2014-08-22 14:27:26 +00:00
Tadashi G. Takaoka
2637be27c5
Support Accept typed word UI
...
Change-Id: I58e95b2791a45afdc7dae8e26dcfc200b3b4b854
2014-08-22 21:25:35 +09:00
Jean Chalard
9df7e3b8e9
am 6c638d1b
: Merge "Revert "[ML1] Introduce RichInputMethodSubtype""
...
* commit '6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32':
Revert "[ML1] Introduce RichInputMethodSubtype"
2014-08-22 09:48:39 +00:00
Jean Chalard
6c638d1bbd
Merge "Revert "[ML1] Introduce RichInputMethodSubtype""
2014-08-22 09:41:46 +00:00
Jean Chalard
a63d0a8ee6
Revert "[ML1] Introduce RichInputMethodSubtype"
...
This reverts commit 8ffe4bc932
.
Change-Id: I9d4c98b0adfdb78b0f4d376f7691e50d1bd2228f
2014-08-22 09:40:27 +00:00
Yohei Yukawa
bf55d9f0e6
am eb99b461
: am 96db9222
: am cabb66e9
: follow-up to API change in I4a577bfd02b37b
...
* commit 'eb99b461f03a48317598289ab12ea30a617c537c':
follow-up to API change in I4a577bfd02b37b
2014-08-22 09:35:57 +00:00
Yohei Yukawa
eb99b461f0
am 96db9222
: am cabb66e9
: follow-up to API change in I4a577bfd02b37b
...
* commit '96db9222c2c8c728498751221cc92664676dd4f0':
follow-up to API change in I4a577bfd02b37b
2014-08-22 09:26:22 +00:00
Keisuke Kuroyanagi
901964eb81
am e2ebd5d6
: Merge "Add ExpandableBinaryDictionary#getDictionaryStats()."
...
* commit 'e2ebd5d6211d9eecfc6a18505a5041f3c374bab7':
Add ExpandableBinaryDictionary#getDictionaryStats().
2014-08-22 09:11:43 +00:00
Jean Chalard
32abc692a5
am 395d7787
: Merge "Revert "[HW17] Straighten the dead char implementation.""
...
* commit '395d7787396d80dd56934d0f4f85062b1a391e02':
Revert "[HW17] Straighten the dead char implementation."
2014-08-22 09:05:45 +00:00
Keisuke Kuroyanagi
e2ebd5d621
Merge "Add ExpandableBinaryDictionary#getDictionaryStats()."
2014-08-22 09:05:18 +00:00
Jean Chalard
395d778739
Merge "Revert "[HW17] Straighten the dead char implementation.""
2014-08-22 08:20:28 +00:00
Jean Chalard
5bfd661b38
Revert "[HW17] Straighten the dead char implementation."
...
This reverts commit c6612ff051
.
Change-Id: I750d9bff9cb89a6ab13af7a33567c3a0fe2af381
2014-08-22 08:16:28 +00:00