Jean Chalard
a05a0f2077
Allow Latin IME to cancel smiley-auto-correct consistenly
...
This change makes Latin IME behave consistently with regards
to other auto-correction cancellations in cases of auto-correction
cancellation after smiley-triggered auto-correction. That is,
pressing the smiley key when the keyboard signals it's about to
auto-correct will get the auto-correction there plus a smiley,
and pressing backspace will cancel the auto-correction, and
pressing backspace again will delete the smiley.
Bug: 7067593
Change-Id: Ia7eef70a5d06b8b9afa1f1fbb0ed1dbc21a3059f
2012-08-29 16:49:39 +09:00
Tadashi G. Takaoka
bc7ddcd2cd
am 5efc9250: am 95c486cd: Merge "Move some methods from Utils to LocaleUtils class" into jb-mr1-dev
...
* commit '5efc925037e6469f4e9f552d61fa1862fac1926a':
Move some methods from Utils to LocaleUtils class
2012-08-29 00:39:38 -07:00
Tadashi G. Takaoka
5efc925037
am 95c486cd: Merge "Move some methods from Utils to LocaleUtils class" into jb-mr1-dev
...
* commit '95c486cdf39ffbda72e6696057d27623c60e8ac2':
Move some methods from Utils to LocaleUtils class
2012-08-29 00:38:11 -07:00
Tadashi G. Takaoka
9879f65651
Add ResourceUtils
...
Change-Id: Ia198f8d95eae8c007623cd52d73cc1528d22fee9
2012-08-29 16:36:00 +09:00
Tadashi G. Takaoka
95c486cdf3
Merge "Move some methods from Utils to LocaleUtils class" into jb-mr1-dev
2012-08-29 00:35:27 -07:00
Tadashi G. Takaoka
90be82400b
am b4605a3e: am 237f5e4f: Remove unused methods from Utils class
...
* commit 'b4605a3ee47f202b92ed28bd2f3b4d2d48a075fd':
Remove unused methods from Utils class
2012-08-29 00:25:23 -07:00
Tadashi G. Takaoka
0023a57eea
Move some methods from Utils to LocaleUtils class
...
Change-Id: I4a834549c2ea96ac30d7e2cb692d69af219cab1a
2012-08-29 16:24:53 +09:00
Tadashi G. Takaoka
b4605a3ee4
am 237f5e4f: Remove unused methods from Utils class
...
* commit '237f5e4f9b984d58199916396ba68dc9958235de':
Remove unused methods from Utils class
2012-08-29 00:22:44 -07:00
Tadashi G. Takaoka
237f5e4f9b
Remove unused methods from Utils class
...
Change-Id: I209b75f1cca381610f25cd219f35ea62b9762be2
2012-08-29 16:10:16 +09:00
Charles Chen
3fd79fc069
am 0afcdc1f: am 78527e4d: Merge "Adjust accessibility edge slop." into jb-mr1-dev
...
* commit '0afcdc1fd59f7c8f0bd70f0a7881ac0377130f79':
Adjust accessibility edge slop.
2012-08-28 13:02:09 -07:00
Charles Chen
0afcdc1fd5
am 78527e4d: Merge "Adjust accessibility edge slop." into jb-mr1-dev
...
* commit '78527e4dbbac36235e1d2f03a461d25bee8059d5':
Adjust accessibility edge slop.
2012-08-28 10:30:15 -07:00
Charles Chen
78527e4dbb
Merge "Adjust accessibility edge slop." into jb-mr1-dev
2012-08-28 10:28:55 -07:00
The Android Automerger
646e684a96
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-28 06:34:31 -07:00
Tadashi G. Takaoka
39e8e49d68
am 5d309b35: am 263caae3: Merge "Support bimanual gesture input" into jb-mr1-dev
...
* commit '5d309b35d2c179950db7806f1472ccbdf8448479':
Support bimanual gesture input
2012-08-28 02:33:55 -07:00
Tadashi G. Takaoka
5d309b35d2
am 263caae3: Merge "Support bimanual gesture input" into jb-mr1-dev
...
* commit '263caae3c91314883b37c2db314342fab5c7903f':
Support bimanual gesture input
2012-08-28 02:31:56 -07:00
Tadashi G. Takaoka
263caae3c9
Merge "Support bimanual gesture input" into jb-mr1-dev
2012-08-28 02:30:22 -07:00
Tadashi G. Takaoka
6c3304ea96
Support bimanual gesture input
...
Change-Id: Id86dc93fb7115ab4a6d05b3c05652df35ad08c12
2012-08-28 18:26:07 +09:00
Jean Chalard
e62d66b593
am 4a02e84f: am 43d3f0fa: Merge "Auto-correct after smileys and gestures." into jb-mr1-dev
...
* commit '4a02e84f76bdad417792d527fd323b61534d8c8e':
Auto-correct after smileys and gestures.
2012-08-28 02:03:11 -07:00
Jean Chalard
4a02e84f76
am 43d3f0fa: Merge "Auto-correct after smileys and gestures." into jb-mr1-dev
...
* commit '43d3f0fa3bd804e9795d31025b78a4696d46f0a2':
Auto-correct after smileys and gestures.
2012-08-28 02:01:13 -07:00
Jean Chalard
43d3f0fa3b
Merge "Auto-correct after smileys and gestures." into jb-mr1-dev
2012-08-28 01:59:20 -07:00
Tadashi G. Takaoka
701cb39bd0
am 2133ca27: am 9fa0736d: Consolidate KeyboardView.keyLetterSize and keyLetterRatio
...
* commit '2133ca2759fcd89bbc7292757c17dfd3db760c1a':
Consolidate KeyboardView.keyLetterSize and keyLetterRatio
2012-08-28 01:45:41 -07:00
Tadashi G. Takaoka
2133ca2759
am 9fa0736d: Consolidate KeyboardView.keyLetterSize and keyLetterRatio
...
* commit '9fa0736d6ac8a171a5f9620a5d0980dc01dc65a2':
Consolidate KeyboardView.keyLetterSize and keyLetterRatio
2012-08-28 01:43:27 -07:00
Tadashi G. Takaoka
5ae1d3593e
am 585b610b: am ef2bfad5: Use TypedArray.getFraction to read percentile values in resource
...
* commit '585b610b959b38e538fbf79126ecce2cb9ac358d':
Use TypedArray.getFraction to read percentile values in resource
2012-08-28 00:06:57 -07:00
Tadashi G. Takaoka
9fa0736d6a
Consolidate KeyboardView.keyLetterSize and keyLetterRatio
...
This change also consolidates keyboardView.keyLabelSize and
keyLabelRatio.
Change-Id: I4a45bcb6e7fc104ae4a9ae3ecdae9842d813840e
2012-08-28 16:04:59 +09:00
Tadashi G. Takaoka
585b610b95
am ef2bfad5: Use TypedArray.getFraction to read percentile values in resource
...
* commit 'ef2bfad5903fb55adca61dbea51984fbc7e4375f':
Use TypedArray.getFraction to read percentile values in resource
2012-08-28 00:04:20 -07:00
Tadashi G. Takaoka
ef2bfad590
Use TypedArray.getFraction to read percentile values in resource
...
Change-Id: Ifc8b024d190efba4cd536fd639621e841eb9970e
2012-08-28 15:18:40 +09:00
alanv
e76a9b36ca
Adjust accessibility edge slop.
...
Bug: 6969558
Change-Id: Ie33f444e085e5c01326bdf9396eabee5c04ee81e
2012-08-27 18:05:21 -07:00
The Android Automerger
2a6b6d2eef
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-27 06:34:55 -07:00
Jean Chalard
6c70b92003
Auto-correct after smileys and gestures.
...
Bug: 6936790
Bug: 6965241
Change-Id: I1f61327eb5591960c280e425df9cd86b9c52f5d6
2012-08-27 18:54:05 +09:00
Satoshi Kataoka
0825604c26
am d262b846: am 95c27259: Merge "Step 40-A Cleanup touch path" into jb-mr1-dev
...
* commit 'd262b846fac59f89276a234095d11f07f2d74d4f':
Step 40-A Cleanup touch path
2012-08-27 01:06:48 -07:00
Satoshi Kataoka
d262b846fa
am 95c27259: Merge "Step 40-A Cleanup touch path" into jb-mr1-dev
...
* commit '95c272596d92e67afd5610cf8311e2e82ae5dec2':
Step 40-A Cleanup touch path
2012-08-27 01:04:32 -07:00
Satoshi Kataoka
95c272596d
Merge "Step 40-A Cleanup touch path" into jb-mr1-dev
2012-08-27 01:02:25 -07:00
Satoshi Kataoka
6dfaf1d1a7
am a229886e: am 923a6a31: Merge "Revert "Change the definition of NOT_A_CHARACTER"" into jb-mr1-dev
...
* commit 'a229886ef2689941c032de0dee878058eaf88299':
Revert "Change the definition of NOT_A_CHARACTER"
2012-08-27 01:02:16 -07:00
Satoshi Kataoka
a229886ef2
am 923a6a31: Merge "Revert "Change the definition of NOT_A_CHARACTER"" into jb-mr1-dev
...
* commit '923a6a31ae84b8084dccf905abb3fc93b9e45a6f':
Revert "Change the definition of NOT_A_CHARACTER"
2012-08-27 00:59:58 -07:00
Satoshi Kataoka
923a6a31ae
Merge "Revert "Change the definition of NOT_A_CHARACTER"" into jb-mr1-dev
2012-08-27 00:58:25 -07:00
Satoshi Kataoka
fba0019ee2
Revert "Change the definition of NOT_A_CHARACTER"
...
This reverts commit a31d180cc3
2012-08-27 00:53:48 -07:00
Tadashi G. Takaoka
a4862f3cf5
am fe49ca61: am 1451a0fb: Merge "Optimize gesture preview trail drawing a bit" into jb-mr1-dev
...
* commit 'fe49ca61f949aedc4492c42f213ae650df8ae938':
Optimize gesture preview trail drawing a bit
2012-08-27 00:33:52 -07:00
Tadashi G. Takaoka
fe49ca61f9
am 1451a0fb: Merge "Optimize gesture preview trail drawing a bit" into jb-mr1-dev
...
* commit '1451a0fb1fbe7b86fe12742a28c759d5cbade5dd':
Optimize gesture preview trail drawing a bit
2012-08-27 00:31:31 -07:00
Satoshi Kataoka
37b153e205
Step 40-A Cleanup touch path
...
Change-Id: Id22c5ae6afbf040227dc47153b0849bbe38ff66f
2012-08-27 16:30:59 +09:00
Tadashi G. Takaoka
1451a0fb1f
Merge "Optimize gesture preview trail drawing a bit" into jb-mr1-dev
2012-08-27 00:29:48 -07:00
Tadashi G. Takaoka
1c2f332239
Optimize gesture preview trail drawing a bit
...
This change also change the fading out duration of the gesture
preview trail to 800msec from 1,000msec
Change-Id: Icfd5b1ecad66db4f978249486f5fe362a3ae9640
2012-08-27 14:43:39 +09:00
Satoshi Kataoka
ca5d58da4f
am 84809905: am 76951d8e: Merge "Change the definition of NOT_A_CHARACTER" into jb-mr1-dev
...
* commit '8480990577b48b742ee67a94d30855c68975c59d':
Change the definition of NOT_A_CHARACTER
2012-08-26 20:36:56 -07:00
Satoshi Kataoka
8480990577
am 76951d8e: Merge "Change the definition of NOT_A_CHARACTER" into jb-mr1-dev
...
* commit '76951d8e5a573233aba855a0fa5ba501217a3371':
Change the definition of NOT_A_CHARACTER
2012-08-26 20:35:03 -07:00
Satoshi Kataoka
76951d8e5a
Merge "Change the definition of NOT_A_CHARACTER" into jb-mr1-dev
2012-08-26 20:32:28 -07:00
Satoshi Kataoka
a31d180cc3
Change the definition of NOT_A_CHARACTER
...
Change-Id: I519b1e5478abefb1c18cb6e3ab2862be045583de
2012-08-27 12:27:53 +09:00
Ken Wakasa
0bd83093bb
am b487f1d1: am 297f2391: Try using hash_map
...
* commit 'b487f1d1d8b6db89803ce860bc48753f54594b7c':
Try using hash_map
2012-08-26 20:04:42 -07:00
Ken Wakasa
b487f1d1d8
am 297f2391: Try using hash_map
...
* commit '297f239196d78cf3bd8aca8adb86331a3f8d2139':
Try using hash_map
2012-08-26 20:03:01 -07:00
Ken Wakasa
297f239196
Try using hash_map
...
Change-Id: Icac47d03e1355e83b4dd3b0e3d7739f1dd5a3b98
2012-08-26 18:39:15 +09:00
The Android Open Source Project
74e193719a
am 0ca4d191: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0ca4d19117fc79026acc42115f21f4c02df9d902':
2012-08-25 07:21:33 -07:00
The Android Open Source Project
0ca4d19117
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I106a8572e01093f4593978e2967b5f65bb2598c5
2012-08-25 07:17:38 -07:00
