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
|
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
|
0f925efb5c
|
Merge "Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtype"
|
2012-01-11 01:52:56 -08:00 |
|
Jean Chalard
|
903e58886e
|
Add internal structure support for isShortcutOnly (B8)
Change-Id: Iaac80937540a45849c347f80400762032b27c82c
|
2012-01-11 18:18:51 +09: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
|
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
|
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
|
b0c49b7684
|
Actually add shortcut targets to the suggestions (A4)
Change-Id: Ia6f551d36b2897863e7faf5143bc319522b0668e
|
2012-01-06 15:21:11 +09: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
|
ecbf3f2cbc
|
Merge "Fix indentations."
|
2012-01-05 19:29:22 -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 |
|
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 |
|
Eric Fischer
|
07af2249bb
|
Import revised translations.
Change-Id: Ie6d481360e801a67f4bc0309a7151b1640bd3c40
|
2011-12-29 13:37:16 -08:00 |
|
Jean Chalard
|
3a4f6b53c4
|
Merge "Error out when given an unknown argument"
|
2011-12-27 23:48:19 -08:00 |
|
Jean Chalard
|
003b8cf9e6
|
Error out when given an unknown argument
Bug: 5802658
Change-Id: I3a3871f17a5001dc61e835111944d35540aa5bcd
|
2011-12-28 16:04:19 +09:00 |
|
Jean Chalard
|
4c34454a70
|
Make bigram handler a son of a more generic class (B1)
Change-Id: I71aa109d3e67ff139e4f385344882d906f687c77
|
2011-12-28 16:01:04 +09:00 |
|
Jean Chalard
|
8b6f788e18
|
Merge "Add a forgotten constant"
|
2011-12-26 20:33:55 -08:00 |
|
Jean Chalard
|
c8c6585f21
|
Add a forgotten constant
This fixes the build.
A constant was used before it was declared in another file.
Change-Id: I72dfca2f76f0c3b7dd64072d062cd48c9bfcbd56
|
2011-12-27 12:58:49 +09:00 |
|
Jean Chalard
|
0236c892e6
|
Merge "Fix a bug where attributes would have the wrong freq (B0)"
|
2011-12-26 19:55:41 -08:00 |
|
Jean Chalard
|
e85b5bed57
|
Merge "Skip shortcut targets if any. (A1)"
|
2011-12-26 19:49:37 -08:00 |
|
Jean Chalard
|
d8120ff72e
|
Fix a bug where attributes would have the wrong freq (B0)
The reading code is accepting 0..15 and this outputs
0..31.
Change-Id: Ia638950dc2ce0b8743cbb6a71fbad866e9208786
|
2011-12-27 12:28:13 +09:00 |
|
Jean Chalard
|
e0e339699a
|
Skip shortcut targets if any. (A1)
Change-Id: I1e83bba2b36bdc0429debb22425ce75001e61c81
|
2011-12-27 12:22:20 +09:00 |
|
Tadashi G. Takaoka
|
0fe45eac18
|
Merge "Optimize KeybaordView.invalidateAllKeys a bit"
|
2011-12-26 06:50:31 -08:00 |
|
Tadashi G. Takaoka
|
9f6485a448
|
Optimize KeybaordView.invalidateAllKeys a bit
Change-Id: I118c792219f649b7297477c78fa725c678650159
|
2011-12-26 23:43:53 +09:00 |
|
Tadashi G. Takaoka
|
07145a3706
|
Fix automatic temporary upper case mode shift key graphics
Bug: 5802387
Change-Id: I4f59fb2f971c543748ed32b37af528767a0549e4
|
2011-12-26 21:05:33 +09:00 |
|
Tadashi G. Takaoka
|
77e7532dab
|
Merge "Make Estonian keyboard Scandinavian variant"
|
2011-12-25 21:09:49 -08:00 |
|
Ken Wakasa
|
2168795ea6
|
DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
This is a cherry pick of http://android-git.corp.google.com/g/156427 from master.
bug: 5800592
Change-Id: Ifb249e8b6d432bbd1a5faf1a8731deea02962d39
|
2011-12-26 12:55:32 +09:00 |
|
Tadashi G. Takaoka
|
6aa7fc0984
|
Make Estonian keyboard Scandinavian variant
This change also fixes Scandinavian keyboard layout around "a" key.
Bug: 5627326
Change-Id: I65da7a56a28d90eabcffcd616164d8e8c1111c96
|
2011-12-26 12:51:20 +09:00 |
|
Ken Wakasa
|
10862aa4d0
|
Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
bug: 5800592
Change-Id: I0c9abc807ab0100b3839fc7f0f40c6c1a66e0a6e
|
2011-12-24 17:29:02 +09:00 |
|
Ken Wakasa
|
0d0f01da67
|
Fix a typo. A follow up to I68dd6b8d
Change-Id: I16fa4099c75faac35344b0e4d3c2b866ddac896a
|
2011-12-21 22:34:08 +09:00 |
|
Jean Chalard
|
0fd625bcfd
|
Fix a bug with wrong auto-correct cancellation
Auto-correct cancellation would sometimes kick in at
wrong times, causing crashes.
Bug: 5784542
Change-Id: I68dd6b8d9237ce9b66af2dc63e77ba6dd5fd69dd
|
2011-12-21 19:28:02 +09:00 |
|