Commit graph

1309 commits

Author SHA1 Message Date
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
Tadashi G. Takaoka
f156f30614 am 491bb105: (-s ours) am cb004628: Merge "Make keyboard vertical correction configurable (DO NOT MERGE)" into gingerbread
Merge commit '491bb105ff07568a6bc4335b6c83de108086ec87'

* commit '491bb105ff07568a6bc4335b6c83de108086ec87':
  Make keyboard vertical correction configurable (DO NOT MERGE)
2010-10-10 16:05:17 -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
fd64e47c2b am c2d7ac79: Tweak key width for \'o\'-popup chars.
Merge commit 'c2d7ac79bdadb4335ed69a4e9631e0ec2e3058f6' into gingerbread-plus-aosp

* commit 'c2d7ac79bdadb4335ed69a4e9631e0ec2e3058f6':
  Tweak key width for 'o'-popup chars.
2010-10-10 12:47:23 -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
938c0a3722 am 364da8c6: Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.
Merge commit '364da8c618303a7764595d2c15ee034a7671365d' into gingerbread-plus-aosp

* commit '364da8c618303a7764595d2c15ee034a7671365d':
  Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.
2010-10-10 11:39:43 -07: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
Eric Fischer
e3b34081d6 am e0cb8284: (-s ours) am e13a3013: Import revised translations. DO NOT MERGE
Merge commit 'e0cb828472ca680eba7371dfb042fe783baae8c7'

* commit 'e0cb828472ca680eba7371dfb042fe783baae8c7':
  Import revised translations.  DO NOT MERGE
2010-10-10 09:07:39 -07:00
Tadashi G. Takaoka
4ee2a56f07 Make keyboard vertical correction configurable
cherry-pick: I72c2448894a1084c582c2f1fb942b5fa8353f028

Before this change, the verticalCorrection value was defined by "dpi"
that is relative to device screen.  This change defines the
verticalCorrection by absolute unit "in".

Bug: 3066107
Change-Id: If71419dcfc18be3e5e87afea078fa15d3c31d908
2010-10-09 13:03:00 +09:00
Tadashi G. Takaoka
4d3a4dc211 Add phone keyboard layout
Change-Id: I97d146ef2756ffe5adb17fcbf04f5e91a0587aa5
2010-10-09 12:35:37 +09:00
Ken Wakasa
ad289ae49b am 2fd1de46: am 47a9c3f3: Additional string update for LatinIME\'s re-correction preference item.
Merge commit '2fd1de46010c9c7836fcae94180d067c50677bab'

* commit '2fd1de46010c9c7836fcae94180d067c50677bab':
  Additional string update for LatinIME's re-correction preference item.
2010-10-08 14:36:47 -07: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
a7fda868d9 am 57108c2f: am 3425026d: Follow-up to Ia135eb92 . Shorten overflowed string.
Merge commit '57108c2f1c5b811a8b207ac53f4e3b4ef7ddcba4'

* commit '57108c2f1c5b811a8b207ac53f4e3b4ef7ddcba4':
  Follow-up to Ia135eb92 .  Shorten overflowed string.
2010-10-08 14:36:25 -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
02b8d91b2d am 7e1f5a2d: Make sure to set symbol keyboard shifted
Merge commit '7e1f5a2d5a96c74691b3b09fa986efb7161e5a12' into gingerbread-plus-aosp

* commit '7e1f5a2d5a96c74691b3b09fa986efb7161e5a12':
  Make sure to set symbol keyboard shifted
2010-10-08 10:51:09 -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
491bb105ff am cb004628: Merge "Make keyboard vertical correction configurable (DO NOT MERGE)" into gingerbread
Merge commit 'cb0046288d58648dbc2a3100e4e8aa483a62a353' into gingerbread-plus-aosp

* commit 'cb0046288d58648dbc2a3100e4e8aa483a62a353':
  Make keyboard vertical correction configurable (DO NOT MERGE)
2010-10-08 03:26:00 -07:00
Tadashi G. Takaoka
cb0046288d Merge "Make keyboard vertical correction configurable (DO NOT MERGE)" into gingerbread 2010-10-08 03:23:53 -07:00
Tadashi G. Takaoka
23d50bfb13 am 5e02930a: Reduce delay before mini popup keyboard is shown
Merge commit '5e02930a7f40b704f357f127d3d38fbdc193ffa1' into gingerbread-plus-aosp

* commit '5e02930a7f40b704f357f127d3d38fbdc193ffa1':
  Reduce delay before mini popup keyboard is shown
2010-10-08 03:21:09 -07:00
Tadashi G. Takaoka
ff49b79dfb Make keyboard vertical correction configurable (DO NOT MERGE)
Before this change, the verticalCorrection value was defined by "dpi"
that is relative to device screen.  This change defines the
verticalCorrection by absolute unit "in".

Bug: 3066107
Change-Id: I72c2448894a1084c582c2f1fb942b5fa8353f028
2010-10-08 19:15:54 +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
ff4d21bd29 Share 4th row of non-xlarge qwerty keyboard using <include>
Change-Id: Iff337e1c6ef3a17fd96a5e5f1c3c4a21190aac1c
2010-10-08 01:24:28 +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
Eric Fischer
e0cb828472 am e13a3013: Import revised translations. DO NOT MERGE
Merge commit 'e13a301328b7104624db5b37a9b043fd7a6825b7' into gingerbread-plus-aosp

* commit 'e13a301328b7104624db5b37a9b043fd7a6825b7':
  Import revised translations.  DO NOT MERGE
2010-10-07 07:17:19 -07:00
Ken Wakasa
2fd1de4601 am 47a9c3f3: Additional string update for LatinIME\'s re-correction preference item.
Merge commit '47a9c3f3d9f53bbafc0d23f122079ae63f1e9dfe' into gingerbread-plus-aosp

* commit '47a9c3f3d9f53bbafc0d23f122079ae63f1e9dfe':
  Additional string update for LatinIME's re-correction preference item.
2010-10-07 07:09:31 -07:00
Eric Fischer
e13a301328 Import revised translations. DO NOT MERGE
Change-Id: Icf8fa9146cc4cbfb70d5069be5359d04c5ec2432
2010-10-06 17:15:27 -07: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
Ken Wakasa
47a9c3f3d9 Additional string update for LatinIME's re-correction preference item.
Follow-up to I703054c9

bug: 3063598

Change-Id: Ic9d752b8588a620b3e256fe38f3a6a0c9c093053
2010-10-07 01:02:06 +09:00
Ken Wakasa
018afe8c7e am 6495bfc7: Follow-up to I36faf679 Cancel pending messages related to suggestion updates.
Merge commit '6495bfc7a6f6bfa6ab82e7f062ee80f4b6b33368' into gingerbread-plus-aosp

* commit '6495bfc7a6f6bfa6ab82e7f062ee80f4b6b33368':
  Follow-up to I36faf679  Cancel pending messages related to suggestion updates.
2010-10-06 02:46:03 -07: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
57108c2f1c am 3425026d: Follow-up to Ia135eb92 . Shorten overflowed string.
Merge commit '3425026d51dbbcc579ceecd59f578a512d4a853e' into gingerbread-plus-aosp

* commit '3425026d51dbbcc579ceecd59f578a512d4a853e':
  Follow-up to Ia135eb92 .  Shorten overflowed string.
2010-10-06 02:00:13 -07:00
Ken Wakasa
3425026d51 Follow-up to Ia135eb92 . Shorten overflowed string.
bug: 3063598
Change-Id: I703054c930590ef62579183731935ec3362406cd
2010-10-06 17:40:40 +09:00
Ken Wakasa
644445868f am 55b10796: Addressed bug: 3058217 "-" key not working at beginning of line
Merge commit '55b10796522b871c1e04d6f2254fdff5dc7aced4' into gingerbread-plus-aosp

* commit '55b10796522b871c1e04d6f2254fdff5dc7aced4':
  Addressed bug: 3058217  "-" key not working at beginning of line
2010-10-06 01:23:46 -07: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
Roy West
2501d7363c am 47383758: Fix bug 3063598, change "tap" to "touch" thrice.
Merge commit '47383758fc3137a8e2b88ae596adf2685bd818bc' into gingerbread-plus-aosp

* commit '47383758fc3137a8e2b88ae596adf2685bd818bc':
  Fix bug 3063598, change "tap" to "touch" thrice.
2010-10-05 07:00:25 -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
c0fc4bf993 am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings
Merge commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718' into gingerbread-plus-aosp

* commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718':
  Long press mic/comma key bring mini keyboard with settings
2010-10-01 04:02:12 -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
bd67788049 am 88a04563: Make the background of keypopup transparent
Merge commit '88a045637a8aa812ec09e2fa6ad0b75dd401e1f9' into gingerbread-plus-aosp

* commit '88a045637a8aa812ec09e2fa6ad0b75dd401e1f9':
  Make the background of keypopup transparent
2010-10-01 02:19:37 -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
8e6a92703d am 18d536f6: Merge "Dismiss orange highlight after suggestion has been selected" into gingerbread
Merge commit '18d536f66b2a063a462b2d28410da80b7788e5da' into gingerbread-plus-aosp

* commit '18d536f66b2a063a462b2d28410da80b7788e5da':
  Dismiss orange highlight after suggestion has been selected
2010-09-30 21:01:10 -07:00