Commit Graph

5589 Commits (3ee7d97587ccbbeb8003d2142478337e8d60b2b7)

Author SHA1 Message Date
Jean Chalard cd2286fff1 Fix a bug where last candidate would not be reset
Bug: 5851148
Change-Id: Ic270318842d8e16bc62d78d5fe0d6be0ca1fb532
2012-01-12 11:16:51 +09:00
The Android Automerger 294d519cf1 merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:29:54 -08:00
Ken Wakasa 062168b625 am 8c111043: am ed043c61: (-s ours) am 4b23789e: Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1
* commit '8c111043b8e08d3b058f7508d23b5e6c078c7534':
  DO NOT MERGE.  Fix more keys for fr_CA and fr_CH.  Also tidy up more keys for de_ZZ as well.
2012-01-11 16:07:20 -08:00
Tadashi G. Takaoka 910655de0b am e895db8f: am e7fecbc5: (-s ours) am 3e405f3a: DO NOT MERGE. Save keyboard layout only when it is shown
* commit 'e895db8ff636c6c32671f07d04b81b0663ed2cf1':
  DO NOT MERGE. Save keyboard layout only when it is shown
2012-01-11 16:07:19 -08:00
Ken Wakasa 8c111043b8 am ed043c61: (-s ours) am 4b23789e: Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1
* commit 'ed043c61eae95a9476a233d88f058ea0c163cfcb':
  DO NOT MERGE.  Fix more keys for fr_CA and fr_CH.  Also tidy up more keys for de_ZZ as well.
2012-01-11 16:04:56 -08:00
Tadashi G. Takaoka e895db8ff6 am e7fecbc5: (-s ours) am 3e405f3a: DO NOT MERGE. Save keyboard layout only when it is shown
* commit 'e7fecbc5631490e5ae05897cfc29dfecf4bc73b3':
  DO NOT MERGE. Save keyboard layout only when it is shown
2012-01-11 16:04:56 -08:00
Ken Wakasa ed043c61ea am 4b23789e: Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1
* commit '4b23789ecbc3108808c26fee35936d719df2bf73':
  DO NOT MERGE.  Fix more keys for fr_CA and fr_CH.  Also tidy up more keys for de_ZZ as well.
2012-01-11 14:52:23 -08:00
Tadashi G. Takaoka e7fecbc563 am 3e405f3a: DO NOT MERGE. Save keyboard layout only when it is shown
* commit '3e405f3afd9bf5c5978d05c07dc186e862885f78':
  DO NOT MERGE. Save keyboard layout only when it is shown
2012-01-11 14:50:33 -08:00
Ken Wakasa 4b23789ecb Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1 2012-01-11 14:49:45 -08:00
satok 791b5540ff am 0f925efb: Merge "Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtype"
* commit '0f925efb5caf5a8bdb9aa5c030c0d6ee66ac753b':
  Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtype
2012-01-11 01:55:00 -08:00
satok 0f925efb5c Merge "Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtype" 2012-01-11 01:52:56 -08:00
Jean Chalard 338a3ab724 am 903e5888: Add internal structure support for isShortcutOnly (B8)
* commit '903e58886e480d79b37c0f9347771042324e71a9':
  Add internal structure support for isShortcutOnly (B8)
2012-01-11 01:23:48 -08:00
Jean Chalard 903e58886e Add internal structure support for isShortcutOnly (B8)
Change-Id: Iaac80937540a45849c347f80400762032b27c82c
2012-01-11 18:18:51 +09:00
Jean Chalard 0a15f84628 am b751dbb6: Add shortcuts to XML output of makedict (B7)
* commit 'b751dbb6c8505e717db9b0db223bed24dc06d2f7':
  Add shortcuts to XML output of makedict (B7)
2012-01-10 23:50:31 -08:00
satok 6d3b422f97 Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtype
Bug: 5806103

Change-Id: Iffdc68565f4a8b5af98247a4dff9dc4e76b4056a
2012-01-11 14:06:06 +09:00
Jean Chalard b751dbb6c8 Add shortcuts to XML output of makedict (B7)
Change-Id: I579e43cd147c4323c390cf1c9bf5e94ae79f9d86
2012-01-11 12:39:33 +09:00
Tadashi G. Takaoka 88132ff5bd am 2611d3d7: Merge "Get rid of Keyboard.CODE_DUMMY"
* commit '2611d3d75188ca61be314337612d185ae65be7d3':
  Get rid of Keyboard.CODE_DUMMY
2012-01-10 09:04:45 -08:00
Tadashi G. Takaoka e09f2f6def am 82b3727c: Fix proguard.flags to keep method for testing
* commit '82b3727c8327c18cf8584b4afcd3e16164be4f3a':
  Fix proguard.flags to keep method for testing
2012-01-10 09:04:28 -08:00
Tadashi G. Takaoka 6890f897eb am 33e2813d: Merge "Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal letter"
* commit '33e2813d0964a0c7accfbef1bbca957d083cba1b':
  Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal letter
2012-01-10 09:04:06 -08:00
Tadashi G. Takaoka eed904b3a1 am cc39125e: Merge "Fix Slavic layout on phone device"
* commit 'cc39125e8e79a374cd626399120eb4f5f75e22b3':
  Fix Slavic layout on phone device
2012-01-10 09:04:00 -08:00
Jean Chalard 41dbae9ea6 am 342d5d5d: Wire the Xml-read shortcuts into the dict creation code (B6)
* commit '342d5d5dd095a5f73413a630b5de9db334ca45e4':
  Wire the Xml-read shortcuts into the dict creation code (B6)
2012-01-10 09:03:59 -08:00
Tadashi G. Takaoka 2611d3d751 Merge "Get rid of Keyboard.CODE_DUMMY" 2012-01-10 01:52:53 -08:00
Tadashi G. Takaoka 8cab0b56eb Get rid of Keyboard.CODE_DUMMY
Change-Id: Id2320f4d9b5f22f0ac844ab20ce42b0c4e7c6880
2012-01-10 18:19:36 +09:00
Tadashi G. Takaoka 82b3727c83 Fix proguard.flags to keep method for testing
Change-Id: Iab6c9a4104e8eec3eeb55fdb063d4368338ac74d
2012-01-10 17:19:01 +09:00
Tadashi G. Takaoka 33e2813d09 Merge "Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal letter" 2012-01-09 22:25:37 -08:00
Tadashi G. Takaoka cc39125e8e Merge "Fix Slavic layout on phone device" 2012-01-09 22:25:31 -08:00
Tadashi G. Takaoka ee4be6e3c6 Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal letter
This will be helpful to write unit test code.

Change-Id: Ib61cc46ac547084e0dc9ecd3a50814fecf08ace2
2012-01-10 15:13:05 +09:00
Jean Chalard 342d5d5dd0 Wire the Xml-read shortcuts into the dict creation code (B6)
Change-Id: I352064835abb62c294b48e080d9709ff013c7bb0
2012-01-10 12:58:53 +09:00
Tadashi G. Takaoka 0723b94ec2 Fix Slavic layout on phone device
Change-Id: I7da35502072e336ba2c32fc78827f5dff1bedddc
2012-01-10 12:52:55 +09:00
Jean Chalard 606206cfd7 am 8edd3067: Add methods to read and write shortcut to binary files (B5)
* commit '8edd3067181a425ce1383bb950184f9742af7557':
  Add methods to read and write shortcut to binary files (B5)
2012-01-06 02:13:45 -08:00
Jean Chalard 8edd306718 Add methods to read and write shortcut to binary files (B5)
Change-Id: I8e6a4242a73b2ec95ce9e8b4739e16dfeb9f1204
2012-01-06 19:03:30 +09:00
Jean Chalard 4c37e7162d am b0c49b76: Actually add shortcut targets to the suggestions (A4)
* commit 'b0c49b768485a92f6208630b8cef830b63c90513':
  Actually add shortcut targets to the suggestions (A4)
2012-01-05 23:17:48 -08:00
Jean Chalard b0c49b7684 Actually add shortcut targets to the suggestions (A4)
Change-Id: Ia6f551d36b2897863e7faf5143bc319522b0668e
2012-01-06 15:21:11 +09:00
Jean Chalard 88fbaa132c am 69f94e19: Merge "Make the dictionary iterator shortcut-aware (B4)"
* commit '69f94e1983f5b0d7b982d806afd9b937c8222b3d':
  Make the dictionary iterator shortcut-aware (B4)
2012-01-05 21:37:44 -08:00
Jean Chalard bfe8ed28cd am 3a1a94c3: Merge "Add shortcut support to the in-memory format of makedict (B3)"
* commit '3a1a94c3cb4801dfe3985ab2b171e9a54b2d2ad2':
  Add shortcut support to the in-memory format of makedict (B3)
2012-01-05 21:37:43 -08:00
Jean Chalard 5f650f7b4f am e1e5a3fa: Merge "Fill in the format-specific shortcut reading methods (A3)"
* commit 'e1e5a3fa2f01d5fa01e529f2bda19234bb096aa1':
  Fill in the format-specific shortcut reading methods (A3)
2012-01-05 21:37:42 -08:00
Jean Chalard 69f94e1983 Merge "Make the dictionary iterator shortcut-aware (B4)" 2012-01-05 21:36:46 -08:00
Jean Chalard 3a1a94c3cb Merge "Add shortcut support to the in-memory format of makedict (B3)" 2012-01-05 21:36:31 -08:00
Jean Chalard e1e5a3fa2f Merge "Fill in the format-specific shortcut reading methods (A3)" 2012-01-05 21:36:20 -08:00
Jean Chalard 8e464d41cc Fill in the format-specific shortcut reading methods (A3)
Change-Id: Ie5d8b344ed46873c92f3ef878a1e45017eb699c6
2012-01-06 14:09:54 +09:00
Ken Wakasa 91a97fa83c am ecbf3f2c: Merge "Fix indentations."
* commit 'ecbf3f2cbc517b175fcf5252db61a815ea578978':
  Fix indentations.
2012-01-05 19:30:46 -08:00
Ken Wakasa ecbf3f2cbc Merge "Fix indentations." 2012-01-05 19:29:22 -08:00
Jean Chalard f6e4fe19f5 am cf9dbbdd: Add methods to read shortcuts from the binary dict (A2)
* commit 'cf9dbbdd1ade7cf1d05f3cb080018931aa540e61':
  Add methods to read shortcuts from the binary dict (A2)
2012-01-05 19:28:50 -08:00
Ken Wakasa e12e9b5b69 Fix indentations.
Change-Id: I25c26e2fe50427d11d97b6204174a4f651963d24
2012-01-06 12:24:38 +09:00
Jean Chalard cf9dbbdd1a Add methods to read shortcuts from the binary dict (A2)
This contains stubs only, it does not work yet, however it
doesn't break anything.

Change-Id: If912ae84ff3ccd7a2d6588ffd6fbb9974f87ef3d
2012-01-06 12:24:30 +09:00
Jean Chalard aa91871030 Make the dictionary iterator shortcut-aware (B4)
Change-Id: I529dff4a50276d1a4f4896c66d1aa35296b21000
2012-01-05 19:11:02 +09:00
Jean Chalard eec2e51e2c Add shortcut support to the in-memory format of makedict (B3)
Change-Id: Icb8427c82694e24c8d08a5376157c7d1444af979
2012-01-05 19:11:02 +09:00
Jean Chalard 8dc3a544bd am 3b161b25: Parse the shortcuts list file. (B2)
* commit '3b161b2526ee7f867c887462dc826d2edc118f3d':
  Parse the shortcuts list file. (B2)
2012-01-05 00:29:35 -08:00
Tadashi G. Takaoka 3e405f3afd DO NOT MERGE. Save keyboard layout only when it is shown
This is a cherrypick of I150b4a05 from master to ics-mr1.

Bug: 5130446
Bug: 5787394
Change-Id: Ie0d58283042166537ff161344564c3c51b0d1296
2012-01-05 17:28:19 +09:00
Jean Chalard 3b161b2526 Parse the shortcuts list file. (B2)
This does not use the shortcuts yet, it only reads up the file
in memory.

Change-Id: Ib9b8594c2dd6a38b1209b01c80e8894696312998
2012-01-05 16:29:52 +09:00