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
satok
6f8ff3b971
Merge "Update delete key" into gingerbread
2010-09-02 23:30:40 -07:00
satok
ec8c4f0d37
am 66546535
: am c5841994
: Merge "Change symbol on space bar when autocompletion is activated" into gingerbread
...
Merge commit '6654653562d0ec5d46a74f8c49eab2488e273cf2'
* commit '6654653562d0ec5d46a74f8c49eab2488e273cf2':
Change symbol on space bar when autocompletion is activated
2010-09-02 23:30:24 -07:00
satok
cf41bd392f
Update delete key
...
Change-Id: I0348e4846131f9913b4ab6c2c2a9427a9a53c74e
2010-09-03 15:27:07 +09:00
satok
c5841994af
Merge "Change symbol on space bar when autocompletion is activated" into gingerbread
2010-09-02 23:26:06 -07:00
satok
41feaaadb7
Change symbol on space bar when autocompletion is activated
...
bug: 2959279
Change-Id: Icc70b7cce0c245ae2451d324debd346f226b8769
2010-09-03 15:17:26 +09:00
Tadashi G. Takaoka
7d4833a8bf
am 22776af8
: am c5d33b16
: Fix NPE in LatinKeyboardBaseView
...
Merge commit '22776af828c69db22d90b42d196f487095905c70'
* commit '22776af828c69db22d90b42d196f487095905c70':
Fix NPE in LatinKeyboardBaseView
2010-09-02 22:23:09 -07:00
Tadashi G. Takaoka
c5d33b1652
Fix NPE in LatinKeyboardBaseView
...
This change also refactors some mini-keyboard related methods in
LatinKeyboardBaseView and PointerTracker class.
Bug: 2973236
Change-Id: I3190fe89ea3ac3c6d351ed4b6d77de98a0aa65db
2010-09-03 13:03:08 +09:00
Tadashi G. Takaoka
efabc4eb52
am 2fb112f1
: am 7083b748
: Propagate preview enable attribute to mini-keyboard
...
Merge commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7'
* commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7':
Propagate preview enable attribute to mini-keyboard
2010-09-02 13:35:17 -07:00
Tadashi G. Takaoka
7083b7486e
Propagate preview enable attribute to mini-keyboard
...
Bug: 2959169
Change-Id: Iea1bec44baf3344d9f91280bd2b8f28476cbcf51
2010-09-03 05:28:43 +09:00
Tadashi G. Takaoka
539fb1bc67
am 20052f34
: am fe72f135
: Remove close button from mini keyboard
...
Merge commit '20052f34f987ab946d54cc405fa42cd0510fb94f'
* commit '20052f34f987ab946d54cc405fa42cd0510fb94f':
Remove close button from mini keyboard
2010-09-02 13:15:20 -07:00
Tadashi G. Takaoka
e46f44714d
am cea6a25b
: am 07221a4a
: Support sliding pop-up mini-keyboard input
...
Merge commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4'
* commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4':
Support sliding pop-up mini-keyboard input
2010-09-02 13:01:25 -07:00
Tadashi G. Takaoka
fe72f135b8
Remove close button from mini keyboard
...
Bug: 2959169
Change-Id: I9c78f9417aaa448b8b23596bc3e748fe99085393
2010-09-03 04:56:12 +09:00
Tadashi G. Takaoka
6c8109dc15
am a723409a
: am f0fd5065
: Merge "Add a number alternation to English popup mini keyboard" into gingerbread
...
Merge commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00'
* commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00':
Add a number alternation to English popup mini keyboard
2010-09-02 12:56:00 -07:00
Tadashi G. Takaoka
a18e956f7a
am 23eb4711
: am 6bfb234f
: Refactor KeyDetector to share more methods
...
Merge commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe'
* commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe':
Refactor KeyDetector to share more methods
2010-09-02 12:54:02 -07:00