293 Commits

Author SHA1 Message Date
Tadashi G. Takaoka
323971b51e Merge "Follow up change of I4c6df819" 2010-10-12 08:03:11 -07:00
Tadashi G. Takaoka
ed3443ebd7 Follow up change of I4c6df819
This change is follow up of I4c6df8197b734feb998da78478a4d9a41f6d92b2

Change-Id: I3b8a82dd71305f34afb2e8b6a705efabdc2bc0cf
2010-10-13 00:02:28 +09:00
Tadashi G. Takaoka
adf24e2eb4 Follow up change of If9472a2a
This change is follow up of If9472a2acb029e56790dc4d19ab62e608c970175

Change-Id: I0a474a130f49e2acccbb5a164bdf2984a5bd9042
2010-10-13 00:00:59 +09:00
Tadashi G. Takaoka
50a61083d3 Add text variation keyboard layout
Change-Id: I4c6df8197b734feb998da78478a4d9a41f6d92b2
2010-10-12 14:01:28 +09:00
Ken Wakasa
39004972b1 resolved conflicts for merge of fd64e47c to master
Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085
2010-10-12 03:15:36 +09:00
Ken Wakasa
3de6ba6ab9 am 938c0a37: am 364da8c6: Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.
Merge commit '938c0a3722a9c597931e6f75408dc7ab636d7052'

* commit '938c0a3722a9c597931e6f75408dc7ab636d7052':
  Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.
2010-10-11 10:42:25 -07:00
Kenny Root
ef38215fa4 Merge "Fix merge that should have been manually merged" 2010-10-10 17:16:51 -07:00
Kenny Root
c4b93e8d90 Fix merge that should have been manually merged
master was still using the deleted constants in different places and
Java 6 didn't like the imports.

Change-Id: If9472a2acb029e56790dc4d19ab62e608c970175
2010-10-10 17:15:21 -07:00
Tadashi G. Takaoka
e56e2d85df am 02b8d91b: am 7e1f5a2d: Make sure to set symbol keyboard shifted
Merge commit '02b8d91b2dbe4290d4b09d93a22efbc5552326db'

* commit '02b8d91b2dbe4290d4b09d93a22efbc5552326db':
  Make sure to set symbol keyboard shifted
2010-10-10 17:14:19 -07:00
Kenny Root
6f6dd71862 resolved conflicts for merge of 23d50bfb to master
Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6
2010-10-10 15:19:53 -07:00
Ken Wakasa
c2d7ac79bd Tweak key width for 'o'-popup chars.
We'll merge this to master for now, but we should have new attr (such as popupCharWidth) to handle this reasonably in the newly created BaseKeyboard class.

bug: 3082178
Change-Id: I024b946aafbbeb07b865a09f489dacb56f0478d0
2010-10-11 04:32:54 +09:00
Ken Wakasa
364da8c618 Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.
bug: 3082806
Change-Id: I64e652b0ad1d496e102a7cc2cf9a5615df423192
2010-10-11 02:55:05 +09:00
Ken Wakasa
9c50d2ea36 am 018afe8c: am 6495bfc7: Follow-up to I36faf679 Cancel pending messages related to suggestion updates.
Merge commit '018afe8c7e90b8dd0fde4f22873ecdf38086358e'

* commit '018afe8c7e90b8dd0fde4f22873ecdf38086358e':
  Follow-up to I36faf679  Cancel pending messages related to suggestion updates.
2010-10-08 14:36:31 -07:00
Ken Wakasa
9870638da7 am 64444586: am 55b10796: Addressed bug: 3058217 "-" key not working at beginning of line
Merge commit '644445868f1023b3263a149f2faf617b88341d20'

* commit '644445868f1023b3263a149f2faf617b88341d20':
  Addressed bug: 3058217  "-" key not working at beginning of line
2010-10-08 13:17:45 -07:00
Tadashi G. Takaoka
7e1f5a2d5a Make sure to set symbol keyboard shifted
To avoid a corner case of bug#3070963, in toggleShift() method of
KeyboardSwitcher, the shifted symbol keyboard will be set if current
keyboard is symbol keyboard or is not shifted symbol keyboard.

This change also implements mini keyboard cache with WeakHashMap.

Bug: 3070963
Change-Id: I868fc072e2f21bddded1622b800a53b9a6a43e91
2010-10-09 02:39:39 +09:00
Tadashi G. Takaoka
5e02930a7f Reduce delay before mini popup keyboard is shown
Before this change, the delay was 500 ms that came from
ViewConfiguration.getLongPressTimeout().  This change reduces the
delay to 400 ms.

Bug: 3074984
Change-Id: Ia5af5e877a3c4bb29211ef4040c728ac09a9fe85
2010-10-08 19:05:16 +09:00
satok
7af745e6f6 Call InputMethodSubtypePicker instead of InputMethodPicker
Change-Id: I7c29285f4fd304d08bfd8f5f72df3fc421090681
2010-10-08 15:56:25 +09:00
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
Ken Wakasa
6495bfc7a6 Follow-up to I36faf679 Cancel pending messages related to suggestion updates.
bug: 3058217
Change-Id: I54e29bf051b76ad27e6d653adbf14892083ad7eb
2010-10-06 18:39:47 +09:00
Ken Wakasa
55b1079652 Addressed bug: 3058217 "-" key not working at beginning of line
Also fixed related issues below:
* Punc suggestions list was sometimes not displayed after cursor move which follows re-correction
* Punc suggestions list was disappearing with words which contains certain punc chars (but not word separator) such as ' and -

Change-Id: I36faf679321782fa8eaf318411308a4a6b89cc25
2010-10-06 17:13:27 +09: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
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
4fa67efc79 Dismiss orange highlight after suggestion has been selected
Bug: 3051311
Change-Id: Ia32cd8748a0afade07a9896ad77400cf42aed0f5
2010-10-01 12:55:34 +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
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
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
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
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
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
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
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