Commit Graph

11780 Commits (b2230d9073211e6d460cc5c3a5245bff4ca1cfa6)

Author SHA1 Message Date
satok e1cb2e4977 resolved conflicts for merge of 36d2d0e7 to master
Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
2010-09-07 15:37:32 +09:00
satok 36d2d0e736 am 07230560: Merge "Add shared preference for re-correction" into gingerbread
Merge commit '0723056043adee17bc9b49b06a5ca7a81a804d16' into gingerbread-plus-aosp

* commit '0723056043adee17bc9b49b06a5ca7a81a804d16':
  Add shared preference for re-correction
2010-09-06 23:25:54 -07: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 ed34cd19a9 am d27c7aea: Add isModifier to the buttons in the lowest line
Merge commit 'd27c7aea7c0bd82dddd25c2ccf46cb2a14aa385d' into gingerbread-plus-aosp

* commit 'd27c7aea7c0bd82dddd25c2ccf46cb2a14aa385d':
  Add isModifier to the buttons in the lowest line
2010-09-06 23:06:45 -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 7bbea0dd8f am 8d7ffcb2: Disable pop-up preview on mini keyboard
Merge commit '8d7ffcb2ac3a8cdd051c7e493ff17b6bf1ded9c0' into gingerbread-plus-aosp

* commit '8d7ffcb2ac3a8cdd051c7e493ff17b6bf1ded9c0':
  Disable pop-up preview on mini keyboard
2010-09-06 06:45:10 -07:00
Tadashi G. Takaoka efe7abe03d am 12659d4c: Fix ALT key light behavior
Merge commit '12659d4c0ce04aaf3d8479e44f9230881b964000' into gingerbread-plus-aosp

* commit '12659d4c0ce04aaf3d8479e44f9230881b964000':
  Fix ALT key light behavior
2010-09-06 06:43:25 -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 ef40dd52aa am f02e4208: Merge "Fix an asset for the feedback of delete key" into gingerbread
Merge commit 'f02e42080bba22201077f6582a48d38e564f053e' into gingerbread-plus-aosp

* commit 'f02e42080bba22201077f6582a48d38e564f053e':
  Fix an asset for the feedback of delete key
2010-09-06 04:08:36 -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 d5bcbf8156 am c8b9afe0: Support multi-touch only when device has distinct multi-touch panel
Merge commit 'c8b9afe0378e3f33c3f83271bd1df9678a70c2a2' into gingerbread-plus-aosp

* commit 'c8b9afe0378e3f33c3f83271bd1df9678a70c2a2':
  Support multi-touch only when device has distinct multi-touch panel
2010-09-06 02:17:09 -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 b6e3cb8f8d am a8d9702f: Fix layout issue of the bottom row in web entry mode
Merge commit 'a8d9702fc4782206ea45c53109132138f9e04c18' into gingerbread-plus-aosp

* commit 'a8d9702fc4782206ea45c53109132138f9e04c18':
  Fix layout issue of the bottom row in web entry mode
2010-09-05 06:39:18 -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
Ken Wakasa 48206a62c9 am ae511451: am 9b195dda: Revert https://android-git.corp.google.com/g/#change,63791 as library loading issue seems to have been fixed now.
Merge commit 'ae511451000240ddde36d5568b393f0769286f62'

* commit 'ae511451000240ddde36d5568b393f0769286f62':
  Revert https://android-git.corp.google.com/g/#change,63791 as library loading issue seems to have been fixed now.
2010-09-03 06:51:50 -07:00
Ken Wakasa ae51145100 am 9b195dda: Revert https://android-git.corp.google.com/g/#change,63791 as library loading issue seems to have been fixed now.
Merge commit '9b195dda60bb2a072fcdc477206e223d60f8776c' into gingerbread-plus-aosp

* commit '9b195dda60bb2a072fcdc477206e223d60f8776c':
  Revert https://android-git.corp.google.com/g/#change,63791 as library loading issue seems to have been fixed now.
2010-09-03 06:49:30 -07:00
Ken Wakasa 9b195dda60 Revert https://android-git.corp.google.com/g/#change,63791 as library loading issue seems to have been fixed now.
bug: 2963855

Change-Id: Iafdfda801083f85126c443508755e3cc711fbf52
2010-09-03 22:44:52 +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 34830114e6 am 0a498cf8: Merge "Extend space LED for autocompletion" into gingerbread
Merge commit '0a498cf8d89ce33f7deceebcfb74a9f5fbb10f68' into gingerbread-plus-aosp

* commit '0a498cf8d89ce33f7deceebcfb74a9f5fbb10f68':
  Extend space LED for autocompletion
2010-09-03 04:25:32 -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 232b039496 am e8f45ab5: One alternate is treated as key action, not open mini keyboard
Merge commit 'e8f45ab56f3e6f358953dede794a63fc5901961d' into gingerbread-plus-aosp

* commit 'e8f45ab56f3e6f358953dede794a63fc5901961d':
  One alternate is treated as key action, not open mini keyboard
2010-09-03 04:11:26 -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 c93ac9db71 am ffa88f0e: Merge "Move inflating mini keyboard code into separate method" into gingerbread
Merge commit 'ffa88f0ef546d6393ecf4cec1ccb68229124f208' into gingerbread-plus-aosp

* commit 'ffa88f0ef546d6393ecf4cec1ccb68229124f208':
  Move inflating mini keyboard code into separate method
2010-09-03 02:56: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 e5ae8c62c8 am 1b09ac4f: Merge "Add a showing input method picker option by longpressing setting key" into gingerbread
Merge commit '1b09ac4f93a0138a414094c374fa2ff12e39c71a' into gingerbread-plus-aosp

* commit '1b09ac4f93a0138a414094c374fa2ff12e39c71a':
  Add a showing input method picker option by longpressing setting key
2010-09-03 01:54:13 -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 1274cd160f am 5583cb0a: Merge "Followup TBR in I87060049" into gingerbread
Merge commit '5583cb0afcb2104a10689a1c60c051a99e98678b' into gingerbread-plus-aosp

* commit '5583cb0afcb2104a10689a1c60c051a99e98678b':
  Followup TBR in I87060049
2010-09-03 00:40:20 -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