Commit Graph

661 Commits

Author SHA1 Message Date
Tadashi G. Takaoka
d663555c9f Keyboard XML file supports include and merge tag
Keyboard XML file can include other keyboard XML file using directive
<include keyboardLayout="@xml/...">.  The keyboard XML file which is
included must have <merge> tag as root element.

Change-Id: I06c35fe7b3db5232acdb33f73a79f38d31261b32
2010-10-07 23:51:38 +09:00
Roy West
4d9add5482 am 2501d736: am 47383758: Fix bug 3063598, change "tap" to "touch" thrice.
Merge commit '2501d7363c3fec777956dd57a558c8bfe75e002c'

* commit '2501d7363c3fec777956dd57a558c8bfe75e002c':
  Fix bug 3063598, change "tap" to "touch" thrice.
2010-10-06 17:09:06 -07:00
Roy West
47383758fc Fix bug 3063598, change "tap" to "touch" thrice.
Change-Id: Ia135eb926a5f2896a480cd478d40925d46041d42
2010-10-05 06:39:15 -07:00
Tadashi G. Takaoka
66e306d01c Add keyHintIcon attribute to BaseKeyboard.Key class
This keyHintIcon attribute is used to specify hint icon drawable at
top right corner of Key.

Change-Id: Icaa91e63c4473b2513396bd3fbeb8ed6fd73586c
2010-10-05 20:28:04 +09:00
Mitsuhiro Shimoda
b1abda8d62 Add an auto complete's threshold option.
Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8
2010-10-05 14:44:00 +09:00
Tadashi G. Takaoka
6614ac9f7b Modify BaseKeyboard to be able to handle multiple shift keys
Change-Id: Ie840ae113ee6bd5b629a90959d7f955a5ceba95a
2010-10-02 21:37:34 +09:00
satok
4fc510a789 Unbundle Keyboard.java to BaseKeyboard.java
Change-Id: I8b310c2c0cae1a151e53c22001c586697346982c
2010-10-02 00:02:00 +09:00
Tadashi G. Takaoka
932a1b756d am c0fc4bf9: am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings
Merge commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99'

* commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99':
  Long press mic/comma key bring mini keyboard with settings
2010-10-01 04:04:38 -07:00
Tadashi G. Takaoka
8e1f1be0f3 Long press mic/comma key bring mini keyboard with settings
Bug: 3050703

Change-Id: I090b2bfebfb48e5ec461615d4c911024ea6d130a
2010-10-01 19:27:37 +09:00
satok
d778ff20e7 am bd677880: am 88a04563: Make the background of keypopup transparent
Merge commit 'bd677880494f30d58913f1bac612a32410e6465b'

* commit 'bd677880494f30d58913f1bac612a32410e6465b':
  Make the background of keypopup transparent
2010-10-01 02:29:58 -07:00
satok
88a045637a Make the background of keypopup transparent
Change-Id: I5240ffdd8e48bcb99c2edf878d8efaba2cafeb07
2010-10-01 18:08:38 +09:00
Tadashi G. Takaoka
3750d56d73 am 8e6a9270: am 18d536f6: Merge "Dismiss orange highlight after suggestion has been selected" into gingerbread
Merge commit '8e6a92703d1bdf530d32c8cdf90deefc6bc3a878'

* commit '8e6a92703d1bdf530d32c8cdf90deefc6bc3a878':
  Dismiss orange highlight after suggestion has been selected
2010-09-30 23:24:11 -07:00
Tadashi G. Takaoka
18d536f66b Merge "Dismiss orange highlight after suggestion has been selected" into gingerbread 2010-09-30 20:59:28 -07:00
Tadashi G. Takaoka
4fa67efc79 Dismiss orange highlight after suggestion has been selected
Bug: 3051311
Change-Id: Ia32cd8748a0afade07a9896ad77400cf42aed0f5
2010-10-01 12:55:34 +09:00
Ken Wakasa
3d9d2b1b3c am 7ed6b88c: am a0a60b37: Revert changes to keyboard_popup.xml for now.
Merge commit '7ed6b88cf6f090512953e3665e4ff5072c98560b'

* commit '7ed6b88cf6f090512953e3665e4ff5072c98560b':
  Revert changes to keyboard_popup.xml for now.
2010-09-30 19:48:16 -07:00
Ken Wakasa
a0a60b37b2 Revert changes to keyboard_popup.xml for now.
This unexpectedly bloated keys in mini popup keyboard.

bug: 3048638
Change-Id: I2b717c9007ce7717bac514f1d8bcae1280130cf4
2010-10-01 09:46:04 +09:00
Tadashi G. Takaoka
c29d565428 am 105f7c36: am 3297ee80: Merge "Long pressing mic/comma key will show settings menue" into gingerbread
Merge commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6'

* commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6':
  Long pressing mic/comma key will show settings menue
2010-09-30 13:37:40 -07:00
Tadashi G. Takaoka
f06cab73ec am 93176d86: am 77c9f2d3: Merge "Display feedback popup for saving word while the word is pressing." into gingerbread
Merge commit '93176d869a496051344d80ef03573bc6bb99035a'

* commit '93176d869a496051344d80ef03573bc6bb99035a':
  Display feedback popup for saving word while the word is pressing.
2010-09-30 13:37:38 -07:00
satok
41ffeb88ca am b97d1777: am 36f97dd6: Fixed assets - Make the background of popup key a full transparent color - Updated the background mdpi asset of keyboard
Merge commit 'b97d17777ef2d8550770a48c84e51e4548820812'

* commit 'b97d17777ef2d8550770a48c84e51e4548820812':
  Fixed assets
2010-09-30 13:37:35 -07:00
Tadashi G. Takaoka
b050829609 am e6e45510: am 11a578f4: Disable suggestion bar before invoke Voice input
Merge commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a'

* commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a':
  Disable suggestion bar before invoke Voice input
2010-09-30 13:37:30 -07:00
Tadashi G. Takaoka
e909d4f12e am 48ef72ac: am 8ff96805: Merge "Eliminate compiler warning" into gingerbread
Merge commit '48ef72acef92bb774bad84d647427eaab0acc83b'

* commit '48ef72acef92bb774bad84d647427eaab0acc83b':
  Eliminate compiler warning
2010-09-30 13:37:27 -07:00
Tadashi G. Takaoka
2e7ce8ec50 am 259778c3: am eebe37e8: Merge "Disable suggestion selection preview popup" into gingerbread
Merge commit '259778c3a18246b3117c2874b87f1adaf2d9fb81'

* commit '259778c3a18246b3117c2874b87f1adaf2d9fb81':
  Disable suggestion selection preview popup
2010-09-30 13:37:23 -07:00
Ying Wang
4852f1a72e am 7d849f8a: am 2d6a0c68: Merge "Fix proguard flag file dependency." into gingerbread
Merge commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126'

* commit '7d849f8a2aeadb5b8a97b42fe5748dced3051126':
  Fix proguard flag file dependency.
2010-09-30 11:28:06 -07:00
Amith Yamasani
d2a74e9f16 am 4d158dc2: am 15b840cd: Merge "Check recorrection on focusing into a text field that has text already." into gingerbread
Merge commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3'

* commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3':
  Check recorrection on focusing into a text field that has text already.
2010-09-30 11:26:57 -07:00
Tadashi G. Takaoka
3297ee80f0 Merge "Long pressing mic/comma key will show settings menue" into gingerbread 2010-09-30 04:57:40 -07:00
Tadashi G. Takaoka
a1cc4f0a8d Long pressing mic/comma key will show settings menue
Bug: 3050703
Change-Id: I62773c10f435d13174f6ff6574912cb99303e83c
2010-09-30 20:18:10 +09:00
Tadashi G. Takaoka
77c9f2d314 Merge "Display feedback popup for saving word while the word is pressing." into gingerbread 2010-09-30 01:58:41 -07:00
satok
36f97dd689 Fixed assets
- Make the background of popup key a full transparent color
- Updated the background mdpi asset of keyboard

Bug: 2975027
Bug: 3048638

Change-Id: I8709a1ca403e5c3f862a8be9be1668d30c7687f8
2010-09-30 17:54:21 +09:00
Tadashi G. Takaoka
fcba53ef7c Display feedback popup for saving word while the word is pressing.
Bug: 3004696
Change-Id: Icc5bdd6945f3bf79f7234a0227d8036d6f6d4c1d
2010-09-30 17:32:29 +09:00
Tadashi G. Takaoka
11a578f4f1 Disable suggestion bar before invoke Voice input
Bug: 3002817
Change-Id: I099dd63e58d5159a609c1d934dbb6f5aab914305
2010-09-30 16:04:09 +09:00
Tadashi G. Takaoka
8ff9680522 Merge "Eliminate compiler warning" into gingerbread 2010-09-29 20:51:34 -07:00
Tadashi G. Takaoka
eebe37e836 Merge "Disable suggestion selection preview popup" into gingerbread 2010-09-29 20:46:21 -07:00
Tadashi G. Takaoka
e7cfc8ab88 Eliminate compiler warning
Change-Id: Ib3effaa6f4e8cfc3951ab5d5d099335fd3856a2f
2010-09-30 12:43:43 +09:00
Tadashi G. Takaoka
c9716b28ce Disable suggestion selection preview popup
Bug: 3048642
Bug: 3004920
Change-Id: Ibfb495a246c9e2da6ebf3c03d10ed8acff00f54b
2010-09-30 12:41:03 +09:00
Tadashi G. Takaoka
8bae0829d2 resolved conflicts for merge of ab1348e8 to master
Change-Id: Ica94a5f9ac4feae477297f14fc1bc21d02efb6a4
2010-09-30 09:01:04 +09:00
Ying Wang
2d6a0c68c2 Merge "Fix proguard flag file dependency." into gingerbread 2010-09-29 16:12:41 -07:00
Amith Yamasani
15b840cd48 Merge "Check recorrection on focusing into a text field that has text already." into gingerbread 2010-09-29 16:08:49 -07:00
Ying Wang
bdfcb664f4 Fix proguard flag file dependency.
Change-Id: I26a639aea0e0b11ba65d621696c42e861847498e
2010-09-29 15:21:28 -07:00
Amith Yamasani
b8fa10080d Check recorrection on focusing into a text field that has text already.
Bug: 3004827
Change-Id: I00e9d925fcf17fa9f7a9aefe6572a648e023be11
2010-09-29 11:37:43 -07:00
Tadashi G. Takaoka
179ada958b Refactor CandidateView touch event handling
This change also fixes tha the touch slop value is applyed only for
initial movement of scrolling suggestion bar.

Bug: 3004920
Change-Id: I62afdedc210156e41e8c84c48cade442f9d5a1aa
2010-09-29 19:45:03 +09:00
Tadashi G. Takaoka
e3da18803d am fcd5f2b9: am c2c9cd82: Merge "Mini keyboard works even while shift is being pressed" into gingerbread
Merge commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343'

* commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343':
  Mini keyboard works even while shift is being pressed
2010-09-28 21:55:19 -07:00
Tadashi G. Takaoka
f48637a5b2 resolved conflicts for merge of 0325360d to master
Change-Id: I5926c8d75dbffda20001fa9487fae2e5f723c755
2010-09-29 13:51:06 +09:00
Tadashi G. Takaoka
c2c9cd82da Merge "Mini keyboard works even while shift is being pressed" into gingerbread 2010-09-28 21:01:46 -07:00
Tadashi G. Takaoka
afb3532779 Mini keyboard works even while shift is being pressed
Bug: 3038861
Change-Id: I94011ca80710ff6eb24e940104f7d9d3bb86840a
2010-09-29 12:36:13 +09:00
Tadashi G. Takaoka
46941882b2 Tune mini keyboard vertical correction to match with key height
Bug: 3040529
Change-Id: I8e3cc635737224537a019e66c38e1e2ea7a8bb8b
2010-09-29 12:23:57 +09:00
Tadashi G. Takaoka
819e05f5fe am 0ea7e504: am 6e5a3986: Fixed key code and key coordinates when move debounce has been in action
Merge commit '0ea7e504887702bace7b2e765704d08e737ab1b5'

* commit '0ea7e504887702bace7b2e765704d08e737ab1b5':
  Fixed key code and key coordinates when move debounce has been in action
2010-09-28 13:19:45 -07:00
satok
ed85235bee am ad090ac3: am 008e9b3e: Fix Null pointer exception on closing and update assets
Merge commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070'

* commit 'ad090ac3f4cee327adf74e8b35bbc446a8d64070':
  Fix Null pointer exception on closing and update assets
2010-09-28 12:48:46 -07:00
Tadashi G. Takaoka
6e5a398685 Fixed key code and key coordinates when move debounce has been in action
This change refactors a key index and pointer position variables into
a separate static inner class KeyState . This change also disables
time debouncing.

Bug: 3033737
Change-Id: Ie4fc37316c260330d8f0861e0771ea903a99cfce
2010-09-28 20:57:30 +09:00
satok
008e9b3e1a Fix Null pointer exception on closing and update assets
Change-Id: I30fdac74685beae06b5c61140452b26b29ae4c39
2010-09-28 16:52:54 +09:00
Tadashi G. Takaoka
2b4cc0db61 Fix xlarge min-keyboard layout
Change-Id: Ia4d6cffa0c6cf710da577b75f6337836352959a0
2010-09-28 16:12:51 +09:00