satok
3053c2ef91
Merge "Make the boolean for re-correction false" into froyo-ub-latinimegoogle
2010-09-07 08:33:02 -07:00
satok
b5dceb8d99
Make the boolean for re-correction false
...
Change-Id: I883f8b6bc9337d1a08254f74ffbac32d1e8492cf
2010-09-08 00:27:01 +09:00
satok
eca9637390
Merge remote branch 'goog/master' into merge4
...
Conflicts:
java/res/values/strings.xml
Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90
2010-09-07 22:37:39 +09:00
satok
c7e1642610
am 663bc844
: am 1e51430e
: Merge "Update assets for LatinIME" into gingerbread
...
Merge commit '663bc8440e02318718b9175c7da7700c6a434623'
* commit '663bc8440e02318718b9175c7da7700c6a434623':
Update assets for LatinIME
2010-09-07 06:25:38 -07:00
satok
1e51430e66
Merge "Update assets for LatinIME" into gingerbread
2010-09-07 06:21:41 -07:00
satok
6627b95dde
Update assets for LatinIME
...
bug: 2974998
Change-Id: Ie98a023b65d34f08c9c66d04017e8877b31edb84
2010-09-07 22:11:02 +09:00
Ken Wakasa
fa12d86cb5
am dacc927a
: am c1ff2846
: Update strings for the settings access - based on the latest GB IME spec (ver 03). Please refer to bug: 2979069 for the latest mock.
...
Merge commit 'dacc927a57b0c7adfbdf244441b9b2495c959980'
* commit 'dacc927a57b0c7adfbdf244441b9b2495c959980':
Update strings for the settings access - based on the latest GB IME spec (ver 03).
2010-09-07 05:35:02 -07:00
Ken Wakasa
c1ff28462e
Update strings for the settings access - based on the latest GB IME spec (ver 03).
...
Please refer to bug: 2979069 for the latest mock.
Got rid of obsolete string too.
Change-Id: Ic02d1651b288f24f9c3a9da5d0dcf09055256ab0
2010-09-07 21:28:44 +09:00
Tadashi G. Takaoka
ca43ce0588
am e5abf25d
: am 83e63ace
: Dismiss mini keyboard when finger is released outside mini keyboard
...
Merge commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea'
* commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea':
Dismiss mini keyboard when finger is released outside mini keyboard
2010-09-07 01:49:04 -07:00
Tadashi G. Takaoka
83e63ace2a
Dismiss mini keyboard when finger is released outside mini keyboard
...
Bug: 2978975
Change-Id: Ie634e8ae827fe093c5c673b75d85835050b03794
2010-09-07 17:44:31 +09:00
satok
73540126a8
Merge remote branch 'goog/master' into merge3
2010-09-07 17:37:15 +09:00
Tadashi G. Takaoka
0415ddde59
am bc1a0354
: am 26aff8c6
: Merge "Fixed extra periods when chording with shift and space" into gingerbread
...
Merge commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24'
* commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24':
Fixed extra periods when chording with shift and space
2010-09-07 01:34:06 -07:00
Tadashi G. Takaoka
26aff8c62f
Merge "Fixed extra periods when chording with shift and space" into gingerbread
2010-09-07 01:31:04 -07:00
Tadashi G. Takaoka
6252f468bc
Fixed extra periods when chording with shift and space
...
Actually it was caused by canceling repeat key (space and delete) when
multiple pointer are touching.
Bug: 2975041
Change-Id: If82183b9225efdace7b5418860b9664f1705b7ec
2010-09-07 17:29:09 +09:00
satok
41aa565480
Merge remote branch 'goog/master' into merge
2010-09-07 15:48:43 +09:00
satok
e1cb2e4977
resolved conflicts for merge of 36d2d0e7
to master
...
Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
2010-09-07 15:37:32 +09:00
satok
0723056043
Merge "Add shared preference for re-correction" into gingerbread
2010-09-06 23:23:40 -07:00
satok
66b42a1c2d
Add shared preference for re-correction
...
Change-Id: Ie5b2e0d2f9739dd33524c2688e172e77aac1f243
2010-09-07 15:23:10 +09:00
satok
6a454a9fa0
am ed34cd19
: am d27c7aea
: Add isModifier to the buttons in the lowest line
...
Merge commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f'
* commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f':
Add isModifier to the buttons in the lowest line
2010-09-06 23:08:23 -07:00
satok
d27c7aea7c
Add isModifier to the buttons in the lowest line
...
Change-Id: I2d5c9e753f0f6fa21fdcfa7b55e81e6a3e3ea64f
2010-09-07 14:57:49 +09:00
Tadashi G. Takaoka
623818a8db
am 7bbea0dd
: am 8d7ffcb2
: Disable pop-up preview on mini keyboard
...
Merge commit '7bbea0dd8fe04b378a9a7a161c2995998f4a8dcf'
* commit '7bbea0dd8fe04b378a9a7a161c2995998f4a8dcf':
Disable pop-up preview on mini keyboard
2010-09-06 06:49:01 -07:00
Tadashi G. Takaoka
920c507cd3
am efe7abe0
: am 12659d4c
: Fix ALT key light behavior
...
Merge commit 'efe7abe03dce1779ce76e175d0fe9422d2f8eaad'
* commit 'efe7abe03dce1779ce76e175d0fe9422d2f8eaad':
Fix ALT key light behavior
2010-09-06 06:47:03 -07:00
Tadashi G. Takaoka
8d7ffcb2ac
Disable pop-up preview on mini keyboard
...
This change also disable the special behavior of long press a key that
has only one digit alternate. If the visual design of both the pop-up
preview and the mini keyboard will look like same, I think that
showing mini keyboard is enough for the key that has one digit
alternate.
Bug: 2973546
Change-Id: I04f138c120aa58526fe054626dac856171fb7a58
2010-09-06 22:42:17 +09:00
Tadashi G. Takaoka
12659d4c0c
Fix ALT key light behavior
...
This change also cleanups some imports, unnecessary cast and null check.
Bug: 2977256
Change-Id: I81b9e539ff8a13ae0cc1eb5c4fb2246732cca3e9
2010-09-06 22:25:49 +09:00
satok
470a0c9e71
am ef40dd52
: am f02e4208
: Merge "Fix an asset for the feedback of delete key" into gingerbread
...
Merge commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2'
* commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2':
Fix an asset for the feedback of delete key
2010-09-06 04:10:34 -07:00
satok
f02e42080b
Merge "Fix an asset for the feedback of delete key" into gingerbread
2010-09-06 04:07:04 -07:00
satok
532471e357
Fix an asset for the feedback of delete key
...
bug: 2977026
Change-Id: I4cdaaf49644d214b03a514a9104144250a024574
2010-09-06 19:20:49 +09:00
Tadashi G. Takaoka
cba7b0b6ab
am d5bcbf81
: am c8b9afe0
: Support multi-touch only when device has distinct multi-touch panel
...
Merge commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31'
* commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31':
Support multi-touch only when device has distinct multi-touch panel
2010-09-06 02:19:13 -07:00
Tadashi G. Takaoka
c8b9afe037
Support multi-touch only when device has distinct multi-touch panel
...
Bug: 2973373
Change-Id: I9871c09ec8c1c2aa945d97392e61ee1ec585baef
2010-09-06 17:57:13 +09:00
Ken Wakasa
7ec731a7ee
am b6e3cb8f
: am a8d9702f
: Fix layout issue of the bottom row in web entry mode
...
Merge commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791'
* commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791':
Fix layout issue of the bottom row in web entry mode
2010-09-05 06:46:35 -07:00
Ken Wakasa
a8d9702fc4
Fix layout issue of the bottom row in web entry mode
...
bug: 2977061
Change-Id: I76e0f4a21480d10f79fd5dcbe58c63cc3516d5d7
2010-09-05 22:26:55 +09:00
satok
7086f726c7
Re-add debug mode preference
...
Change-Id: Ie7fbe53bd3e74ab0cd44954ab21e60b723e3ef60
2010-09-03 23:48:24 +09:00
satok
b899be6b51
Enable theme switcher
...
Change-Id: I8d20d7802ebfab61bb01eb399e10ec775536ef85
2010-09-03 23:24:38 +09:00
satok
1e5e14f18b
Replace variables which are not exist in froyo-framework to strings
...
Change-Id: Ic11dec2ea1f5c5474085c50dddd1b73666480d1a
2010-09-03 23:14:34 +09:00
satok
4d67480fe2
Merge remote branch 'goog/master' into mastermerge
...
Conflicts:
java/src/com/android/inputmethod/latin/LatinIME.java
Change-Id: I8fe443f434ced0cf18b1aa86e38fb8913a5b75c2
2010-09-03 22:57:28 +09:00
satok
ac021708ae
am 34830114
: am 0a498cf8
: Merge "Extend space LED for autocompletion" into gingerbread
...
Merge commit '34830114e66882bf30505f1e538764c9abd3025b'
* commit '34830114e66882bf30505f1e538764c9abd3025b':
Extend space LED for autocompletion
2010-09-03 04:27:20 -07:00
satok
0a498cf8d8
Merge "Extend space LED for autocompletion" into gingerbread
2010-09-03 04:24:01 -07:00
satok
1bf265d185
Extend space LED for autocompletion
...
Change-Id: If59ea7c871ffc2af6fe2bfde72303f2612e43c3b
2010-09-03 20:20:10 +09:00
Tadashi G. Takaoka
ab5653dce0
am 232b0394
: am e8f45ab5
: One alternate is treated as key action, not open mini keyboard
...
Merge commit '232b039496ef95c543bac5128e6378b38760de21'
* commit '232b039496ef95c543bac5128e6378b38760de21':
One alternate is treated as key action, not open mini keyboard
2010-09-03 04:13:20 -07:00
Tadashi G. Takaoka
e8f45ab56f
One alternate is treated as key action, not open mini keyboard
...
This change also fixes bug#2973683.
Bug: 2973546
Bug: 2973683
Change-Id: I67573e5b7cad4af261591a4a608d0596dd7901f2
2010-09-03 20:09:21 +09:00
Tadashi G. Takaoka
bf669e4379
am c93ac9db
: am ffa88f0e
: Merge "Move inflating mini keyboard code into separate method" into gingerbread
...
Merge commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22'
* commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22':
Move inflating mini keyboard code into separate method
2010-09-03 02:59:42 -07:00
Tadashi G. Takaoka
ffa88f0ef5
Merge "Move inflating mini keyboard code into separate method" into gingerbread
2010-09-03 02:54:44 -07:00
satok
6a36764a8d
am e5ae8c62
: am 1b09ac4f
: Merge "Add a showing input method picker option by longpressing setting key" into gingerbread
...
Merge commit 'e5ae8c62c83ad29d623562a74355bc619c216742'
* commit 'e5ae8c62c83ad29d623562a74355bc619c216742':
Add a showing input method picker option by longpressing setting key
2010-09-03 01:55:37 -07:00
satok
1b09ac4f93
Merge "Add a showing input method picker option by longpressing setting key" into gingerbread
2010-09-03 01:51:38 -07:00
satok
9a6a4d3d5f
Add a showing input method picker option by longpressing setting key
...
Bug: 2959271
Change-Id: I4b7e9a2de3cbe17b168ed8d0541a9b1cd9a9e107
2010-09-03 17:48:44 +09:00
Tadashi G. Takaoka
0b4734396f
Move inflating mini keyboard code into separate method
...
Change-Id: Iba8e43ba6125e559d4c7d9cadb6bcb13b8eefc83
2010-09-03 17:35:54 +09:00
Tadashi G. Takaoka
80e518d36b
am 1274cd16
: am 5583cb0a
: Merge "Followup TBR in I87060049" into gingerbread
...
Merge commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544'
* commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544':
Followup TBR in I87060049
2010-09-03 00:41:48 -07:00
Tadashi G. Takaoka
5583cb0afc
Merge "Followup TBR in I87060049" into gingerbread
2010-09-03 00:37:59 -07:00
Tadashi G. Takaoka
0529a04b6a
Followup TBR in I87060049
...
This change is followup TBR in I87060049cad6f9d6432b6c4a246c15587ae0d837
Change-Id: I02ee33da269162f5e95ce5b985dbf5094ba14c0d
2010-09-03 15:55:18 +09:00
satok
133bad6b85
am 025bafb5
: am 6f8ff3b9
: Merge "Update delete key" into gingerbread
...
Merge commit '025bafb5d4272323491eb90a845ead44de4d80b7'
* commit '025bafb5d4272323491eb90a845ead44de4d80b7':
Update delete key
2010-09-02 23:34:16 -07:00