Tadashi G. Takaoka
8f8581e5c0
am aada63bd: am 12b6fef3: Merge "Extract alternates_for_X from strings.xml into altchars.xml" into gingerbread
...
Merge commit 'aada63bd751b061a03b7d9e8e9af7920e4ab3a90'
* commit 'aada63bd751b061a03b7d9e8e9af7920e4ab3a90':
Extract alternates_for_X from strings.xml into altchars.xml
2010-09-08 10:37:59 -07:00
Tadashi G. Takaoka
cb8a8d327d
am aabd5cdd: am 7372a977: Re-formatting \'de\' locale keyboard definition xml files
...
Merge commit 'aabd5cddfb0a2252411b9ecd69c7407ab70ce365'
* commit 'aabd5cddfb0a2252411b9ecd69c7407ab70ce365':
Re-formatting 'de' locale keyboard definition xml files
2010-09-08 10:37:56 -07:00
satok
938ba36710
am 6ee4e439: am 31e2a94a: Merge "Fix the bacground color for "/" in URL mode" into gingerbread
...
Merge commit '6ee4e43929bd18b7d617d921f3ec259ff2b81592'
* commit '6ee4e43929bd18b7d617d921f3ec259ff2b81592':
Fix the bacground color for "/" in URL mode
2010-09-08 10:37:53 -07:00
Tadashi G. Takaoka
163a5557ec
am 2d5e34b7: am 3625c973: Remove unused azerty.xml keyboard layout
...
Merge commit '2d5e34b73095b724dab3ae8d1ef432c0779ca347'
* commit '2d5e34b73095b724dab3ae8d1ef432c0779ca347':
Remove unused azerty.xml keyboard layout
2010-09-08 10:37:50 -07:00
Tadashi G. Takaoka
716fb24a67
am c20193cc: am 232863ac: Re-formatting keyboard definition xml files
...
Merge commit 'c20193cc8471ab8c772aed2cf5f36da47c13ad7a'
* commit 'c20193cc8471ab8c772aed2cf5f36da47c13ad7a':
Re-formatting keyboard definition xml files
2010-09-08 10:34:52 -07:00
Tadashi G. Takaoka
47385b0ca5
am 2dd905b3: Move alternate chars from keyboard layout to altchars.xml
...
Merge commit '2dd905b3c7fef25fe6f1fede4491400263489bbf' into gingerbread-plus-aosp
* commit '2dd905b3c7fef25fe6f1fede4491400263489bbf':
Move alternate chars from keyboard layout to altchars.xml
2010-09-08 10:32:16 -07:00
Tadashi G. Takaoka
42921b85d3
am c29ef3ec: Remove unnecessary android:codes attribute
...
Merge commit 'c29ef3ec1553b30f5e6ad4ba21e505c09e019421' into gingerbread-plus-aosp
* commit 'c29ef3ec1553b30f5e6ad4ba21e505c09e019421':
Remove unnecessary android:codes attribute
2010-09-08 10:32:06 -07:00
Tadashi G. Takaoka
aada63bd75
am 12b6fef3: Merge "Extract alternates_for_X from strings.xml into altchars.xml" into gingerbread
...
Merge commit '12b6fef349fde1396be3949c2ae48f876c0a93f7' into gingerbread-plus-aosp
* commit '12b6fef349fde1396be3949c2ae48f876c0a93f7':
Extract alternates_for_X from strings.xml into altchars.xml
2010-09-08 10:31:57 -07:00
Tadashi G. Takaoka
aabd5cddfb
am 7372a977: Re-formatting \'de\' locale keyboard definition xml files
...
Merge commit '7372a9771ff1918798a3e6a7fbed44cc09de4d77' into gingerbread-plus-aosp
* commit '7372a9771ff1918798a3e6a7fbed44cc09de4d77':
Re-formatting 'de' locale keyboard definition xml files
2010-09-08 10:31:53 -07:00
satok
6ee4e43929
am 31e2a94a: Merge "Fix the bacground color for "/" in URL mode" into gingerbread
...
Merge commit '31e2a94a09b1e054e5fab041876596f24c9cd279' into gingerbread-plus-aosp
* commit '31e2a94a09b1e054e5fab041876596f24c9cd279':
Fix the bacground color for "/" in URL mode
2010-09-08 10:31:50 -07:00
Tadashi G. Takaoka
2d5e34b730
am 3625c973: Remove unused azerty.xml keyboard layout
...
Merge commit '3625c973380524a164ba8453fcb117e7cbeb1d23' into gingerbread-plus-aosp
* commit '3625c973380524a164ba8453fcb117e7cbeb1d23':
Remove unused azerty.xml keyboard layout
2010-09-08 10:31:47 -07:00
Tadashi G. Takaoka
c20193cc84
am 232863ac: Re-formatting keyboard definition xml files
...
Merge commit '232863ac1d0d75fffe72827fedfc0f53d4bc0aba' into gingerbread-plus-aosp
* commit '232863ac1d0d75fffe72827fedfc0f53d4bc0aba':
Re-formatting keyboard definition xml files
2010-09-08 10:28:27 -07:00
Tadashi G. Takaoka
012075a711
Add digit alternates
...
This also re-orders keyboard layout attribute and adds some
android:popupCharacters.
Bug: 2973749
Change-Id: I300fb4029a1844947731cb98a464d8d754cb03ef
2010-09-09 01:06:58 +09:00
Tadashi G. Takaoka
2dd905b3c7
Move alternate chars from keyboard layout to altchars.xml
...
Bug: 2973749
Change-Id: Ic6e5f986c32be07c1e1038594a0e420ba6902351
2010-09-08 19:47:09 +09:00
Tadashi G. Takaoka
c29ef3ec15
Remove unnecessary android:codes attribute
...
If there is no android:codes specified, the first character of
keyLabel's code point will be used instead.
Also introduce readable codes as @integer/key_XXX resources
Bug: 2973749
Change-Id: If9021ca35f9a7b922817e2099186fce0cd993652
2010-09-08 18:16:30 +09:00
Tadashi G. Takaoka
12b6fef349
Merge "Extract alternates_for_X from strings.xml into altchars.xml" into gingerbread
2010-09-08 02:15:54 -07:00
Tadashi G. Takaoka
5555f900b1
Extract alternates_for_X from strings.xml into altchars.xml
...
For some locales, donottranslate.xml were split or renamed.
Bug: 2973749
Change-Id: Ic7f9cebe70a116b735bebc988778104bb1a40954
2010-09-08 18:08:48 +09:00
Tadashi G. Takaoka
7372a9771f
Re-formatting 'de' locale keyboard definition xml files
...
Just re-formating with eclipse editor. This is supplement for
I18bc682c68df6239e54dd71ed3797d55fd5a1552.
Bug: 2973749
Change-Id: I4b03fa6d41808ce99ce4944ae742255bffc660b9
2010-09-08 17:47:24 +09:00
satok
31e2a94a09
Merge "Fix the bacground color for "/" in URL mode" into gingerbread
2010-09-08 01:36:24 -07:00
satok
007803c390
Fix the bacground color for "/" in URL mode
...
Change-Id: I832274244a9677ac98256ddfc4a25fdca517e228
2010-09-08 17:28:21 +09:00
Tadashi G. Takaoka
3625c97338
Remove unused azerty.xml keyboard layout
...
Change-Id: Ie94ee27bbfc0b894243063fced1e537aec3ed7ec
2010-09-08 16:02:07 +09:00
Tadashi G. Takaoka
232863ac1d
Re-formatting keyboard definition xml files
...
Just re-formating with eclipse editor.
Bug: 2973749
Change-Id: I18bc682c68df6239e54dd71ed3797d55fd5a1552
2010-09-08 15:14:53 +09:00
satok
7ac3de4f59
am b1babb79: (-s ours) am 85d85c20: DO NOT MERGE. Fix a string for the sharedpreference for re-correction
...
Merge commit 'b1babb799b30db6e3d275d6c103bb77dbfa560ec'
* commit 'b1babb799b30db6e3d275d6c103bb77dbfa560ec':
DO NOT MERGE. Fix a string for the sharedpreference for re-correction
2010-09-07 08:49:39 -07:00
satok
b1babb799b
am 85d85c20: DO NOT MERGE. Fix a string for the sharedpreference for re-correction
...
Merge commit '85d85c2026ff95d3c9cd272e00757a6c50eeb708' into gingerbread-plus-aosp
* commit '85d85c2026ff95d3c9cd272e00757a6c50eeb708':
DO NOT MERGE. Fix a string for the sharedpreference for re-correction
2010-09-07 08:47:43 -07:00
satok
3dbc3a0afa
Merge remote branch 'goog/master' into merge6
2010-09-08 00:47:05 +09:00
satok
85d85c2026
DO NOT MERGE. Fix a string for the sharedpreference for re-correction
...
Change-Id: I0f8b45cf4604aeed31ecb53f60ff52e0f337bbdd
2010-09-08 00:45:32 +09:00
satok
3053c2ef91
Merge "Make the boolean for re-correction false" into froyo-ub-latinimegoogle
2010-09-07 08:33:02 -07:00
satok
b5dceb8d99
Make the boolean for re-correction false
...
Change-Id: I883f8b6bc9337d1a08254f74ffbac32d1e8492cf
2010-09-08 00:27:01 +09:00
satok
7385b4af91
Fix a string for the preference for re-correction
...
Change-Id: I1d0adcf72450441c3657995cc17550a078845f0e
2010-09-08 00:24:09 +09:00
satok
eca9637390
Merge remote branch 'goog/master' into merge4
...
Conflicts:
java/res/values/strings.xml
Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90
2010-09-07 22:37:39 +09:00
satok
c7e1642610
am 663bc844: am 1e51430e: Merge "Update assets for LatinIME" into gingerbread
...
Merge commit '663bc8440e02318718b9175c7da7700c6a434623'
* commit '663bc8440e02318718b9175c7da7700c6a434623':
Update assets for LatinIME
2010-09-07 06:25:38 -07:00
satok
663bc8440e
am 1e51430e: Merge "Update assets for LatinIME" into gingerbread
...
Merge commit '1e51430e667927da30ecd1b5d929da4e8a1fa15c' into gingerbread-plus-aosp
* commit '1e51430e667927da30ecd1b5d929da4e8a1fa15c':
Update assets for LatinIME
2010-09-07 06:24:12 -07:00
satok
1e51430e66
Merge "Update assets for LatinIME" into gingerbread
2010-09-07 06:21:41 -07:00
satok
6627b95dde
Update assets for LatinIME
...
bug: 2974998
Change-Id: Ie98a023b65d34f08c9c66d04017e8877b31edb84
2010-09-07 22:11:02 +09:00
Ken Wakasa
fa12d86cb5
am dacc927a: am c1ff2846: Update strings for the settings access - based on the latest GB IME spec (ver 03). Please refer to bug: 2979069 for the latest mock.
...
Merge commit 'dacc927a57b0c7adfbdf244441b9b2495c959980'
* commit 'dacc927a57b0c7adfbdf244441b9b2495c959980':
Update strings for the settings access - based on the latest GB IME spec (ver 03).
2010-09-07 05:35:02 -07:00
Ken Wakasa
dacc927a57
am c1ff2846: Update strings for the settings access - based on the latest GB IME spec (ver 03). Please refer to bug: 2979069 for the latest mock.
...
Merge commit 'c1ff28462eee5880267fd2eae4da389b25f6f3da' into gingerbread-plus-aosp
* commit 'c1ff28462eee5880267fd2eae4da389b25f6f3da':
Update strings for the settings access - based on the latest GB IME spec (ver 03).
2010-09-07 05:33:06 -07:00
Ken Wakasa
c1ff28462e
Update strings for the settings access - based on the latest GB IME spec (ver 03).
...
Please refer to bug: 2979069 for the latest mock.
Got rid of obsolete string too.
Change-Id: Ic02d1651b288f24f9c3a9da5d0dcf09055256ab0
2010-09-07 21:28:44 +09:00
Tadashi G. Takaoka
ca43ce0588
am e5abf25d: am 83e63ace: Dismiss mini keyboard when finger is released outside mini keyboard
...
Merge commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea'
* commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea':
Dismiss mini keyboard when finger is released outside mini keyboard
2010-09-07 01:49:04 -07:00
Tadashi G. Takaoka
e5abf25d4b
am 83e63ace: Dismiss mini keyboard when finger is released outside mini keyboard
...
Merge commit '83e63ace2a1bd5b3c27d26d914456c2b0def17c5' into gingerbread-plus-aosp
* commit '83e63ace2a1bd5b3c27d26d914456c2b0def17c5':
Dismiss mini keyboard when finger is released outside mini keyboard
2010-09-07 01:47:22 -07:00
Tadashi G. Takaoka
83e63ace2a
Dismiss mini keyboard when finger is released outside mini keyboard
...
Bug: 2978975
Change-Id: Ie634e8ae827fe093c5c673b75d85835050b03794
2010-09-07 17:44:31 +09:00
satok
73540126a8
Merge remote branch 'goog/master' into merge3
2010-09-07 17:37:15 +09:00
Tadashi G. Takaoka
0415ddde59
am bc1a0354: am 26aff8c6: Merge "Fixed extra periods when chording with shift and space" into gingerbread
...
Merge commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24'
* commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24':
Fixed extra periods when chording with shift and space
2010-09-07 01:34:06 -07:00
Tadashi G. Takaoka
bc1a0354ef
am 26aff8c6: Merge "Fixed extra periods when chording with shift and space" into gingerbread
...
Merge commit '26aff8c62f61f18b1b9a40ce647984284a41c895' into gingerbread-plus-aosp
* commit '26aff8c62f61f18b1b9a40ce647984284a41c895':
Fixed extra periods when chording with shift and space
2010-09-07 01:32:22 -07:00
Tadashi G. Takaoka
26aff8c62f
Merge "Fixed extra periods when chording with shift and space" into gingerbread
2010-09-07 01:31:04 -07:00
Tadashi G. Takaoka
6252f468bc
Fixed extra periods when chording with shift and space
...
Actually it was caused by canceling repeat key (space and delete) when
multiple pointer are touching.
Bug: 2975041
Change-Id: If82183b9225efdace7b5418860b9664f1705b7ec
2010-09-07 17:29:09 +09:00
satok
41aa565480
Merge remote branch 'goog/master' into merge
2010-09-07 15:48:43 +09:00
satok
e1cb2e4977
resolved conflicts for merge of 36d2d0e7 to master
...
Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
2010-09-07 15:37:32 +09:00
satok
36d2d0e736
am 07230560: Merge "Add shared preference for re-correction" into gingerbread
...
Merge commit '0723056043adee17bc9b49b06a5ca7a81a804d16' into gingerbread-plus-aosp
* commit '0723056043adee17bc9b49b06a5ca7a81a804d16':
Add shared preference for re-correction
2010-09-06 23:25:54 -07:00
satok
0723056043
Merge "Add shared preference for re-correction" into gingerbread
2010-09-06 23:23:40 -07:00
satok
66b42a1c2d
Add shared preference for re-correction
...
Change-Id: Ie5b2e0d2f9739dd33524c2688e172e77aac1f243
2010-09-07 15:23:10 +09:00
