Tadashi G. Takaoka
0d22fc4532
Import 7 inch keyboard from Honeycomb-MR2
...
Unfortunately current Master seems have bugs in resource
selection. The xml-en/kbd_qwerty.xml is added to avoide those issue as
work around, and must be removed if the issue is fixed.
Bug: 4442045
Change-Id: Ic43d66e8669fb63e2c3f0b8b9aae9178ca3c32b5
2011-06-06 19:31:13 +09:00
Tadashi G. Takaoka
ddb61ea461
Separate candidate divider from candidate view
...
This change is one of the preparations for suggestion strip redesign.
Bug: 4175031
Change-Id: Ia0dc487c11c3005ef19b87ec0efcc18e48411f76
2011-06-06 18:21:08 +09:00
Eric Fischer
760247f9a5
Merge "Import revised translations."
2011-06-03 10:20:19 -07:00
Tadashi G. Takaoka
abd7392d66
Keep tablet keyboard in sync with Honeycomb-MR2
...
This change removes Russian keyboard layout exceptions and make it
compatible with other Latin's.
Also tweaks some locales' keyboard layout to match with standard PC's
keyboard layout at most.
Change-Id: I305201fb850b4f94ae7e746ab4c039473d09da70
2011-06-03 21:44:57 +09:00
Tadashi G. Takaoka
5859205139
Implement logical or to Keyboard switch-case matching
...
Change-Id: Iab615459c21fa5799a7b30b8649d75347e46c804
2011-06-03 21:03:26 +09:00
Tadashi G. Takaoka
4f7cb70d22
Remove tab key from symbol and symbol shift layout
...
Bug: 4521421
Change-Id: I26c31c6b1a71de3366ca39e64f49bb911f0ef1a0
2011-06-03 15:30:12 +09:00
Eric Fischer
1b1b294c21
Import revised translations.
...
Change-Id: I465699895743a90144e24f5b95267012f72bb0cd
2011-06-02 16:59:02 -07:00
Tadashi G. Takaoka
044f000389
Update drawables
...
Keep in sync with Honeycomb-MR2
Change-Id: I2ecc0a945bd202e83b8c13879b3d22abc4287918
2011-06-02 17:23:32 +09:00
Tadashi G. Takaoka
48a00c409d
Fix key label of switching alphabet and symbols key (DO NOT MERGE)
...
Bug: 4499754
Change-Id: I8048b5d7e0ec90a545dac0827b699d37698bebb5
2011-06-02 10:07:57 +09:00
Tadashi G. Takaoka
cf93043d13
Update drawables (DO NOT MERGE)
...
Bug: 4442045
Change-Id: I97068cdd50cc24a72610aa087dd624484862fa06
2011-06-01 19:51:49 +09:00
Tadashi G. Takaoka
2f894882a8
Revised phone/number layout for 7 inch tablet
...
Bug: 4442045
Change-Id: I562d75436aec2057863f6a8252275a5e47ecea6e
2011-06-01 18:45:28 +09:00
Tadashi G. Takaoka
fd2f1a1677
Remove number hint from 7 inch layout
...
Bug: 4442045
Change-Id: I55ad5ea45bc2a089486e69ca38a0e174dd7957d6
2011-05-31 20:31:00 +09:00
Tadashi G. Takaoka
9b4e897e98
Fix "." key code of number layout on 7 inch tablet (DO NOT MERGE)
...
Bug: 4442045
Change-Id: Ib3e4ac7f2fab84134e0c9c3fdbf107a91acad301
2011-05-31 18:30:37 +09:00
Tadashi G. Takaoka
75f812aff9
Updated IME drawables to support 7 inch devices
...
This change syncs all drawables from Honeycomb-MR2 into Master.
Bug: 4442045
Change-Id: Ia539aa62bfc355ccc742cf5aa600463c7b604187
Cherry-pick: I98664b0c954be82eeda00c69e712da2e20ca606a
2011-05-31 18:19:19 +09:00
Tadashi G. Takaoka
327763e518
Adaptive keyboard width/position parser
...
This change introduces the following features to Keyboard XML format.
* "keyXPos" can specify the key X coordinate directly.
* "keyXPos" can be negative. The X coordinate will be calcluated from
the right edge of the keyboard toward left.
* "keyWidth" can be zero to be filled up to the right side.
* "keyWidth can be negative. The key will be filled up to both sides.
* Spacer's horizontalGap is renamed as keyWidth, and can be inherited
from key-style.
* Spacer can have keyXPos attribute.
Using these syntax, all keyboard layouts have been re-written.
Cherry-Pick: I314b2e8ca2aa145ff9506cbf927140a15685af42
Bug: 4442045
Change-Id: I048fe5eaef020d8472ab577e9d326042bae2f3fa
2011-05-31 17:52:32 +09:00
Tadashi G. Takaoka
2c187a7662
Remove voice key option from 7 inch tablet setting.
...
Bug: 4442045
Change-Id: I5e75e9e61a3be81295d4271d6302233c97e9ea5a
2011-05-31 10:55:00 +09:00
Tadashi G. Takaoka
6b38a5fd4c
Adaptive keyboard width/position parser (DO NOT MERGE)
...
This change introduces the following features to Keyboard XML format.
* "keyXPos" can specify the key X coordinate directly.
* "keyXPos" can be negative. The X coordinate will be calcluated from
the right edge of the keyboard toward left.
* "keyWidth" can be zero to be filled up to the right side.
* "keyWidth can be negative. The key will be filled up to both sides.
* Spacer's horizontalGap is renamed as keyWidth, and can be inherited
from key-style.
* Spacer can have keyXPos attribute.
Using these syntax, all keyboard layouts have been re-written.
Bug: 4442045
Change-Id: I314b2e8ca2aa145ff9506cbf927140a15685af42
2011-05-28 10:01:00 +09:00
Tadashi G. Takaoka
88251a9555
Rename resource folder according to new naming scheme
...
Change-Id: I45a29d753103d82b625e55e78f1075497e94396f
2011-05-28 01:17:13 +09:00
Tadashi G. Takaoka
fd8245b3f2
Merge "Add number password keyboard layout to phone"
2011-05-27 09:09:41 -07:00
Tadashi G. Takaoka
a8fd3af67a
Merge "Remove web mode and add webInput boolean"
2011-05-27 09:09:30 -07:00
Tadashi G. Takaoka
c2a37c7392
Merge "Rename filename of hint icons for numbers"
2011-05-27 09:09:18 -07:00
Tadashi G. Takaoka
fa847fe9b5
Add number password keyboard layout to phone
...
Bug: 4479212
Change-Id: I230371632d5ba0d940e576a9b8b6668079990004
Cherry-pick: Ia0a284a3
2011-05-27 22:13:06 +09:00
Tadashi G. Takaoka
9e2d810dc5
Remove web mode and add webInput boolean
...
Bug: 4490948
Change-Id: I6fe23c9ab4918eab6806cc621c4d6821c2e1baf9
Cherry-Pick: I4cd1af0b
2011-05-27 21:47:14 +09:00
Tadashi G. Takaoka
c29c69a372
Rename filename of hint icons for numbers
...
Change-Id: Ibd844167199f5d884d97b8fe9f536f47fbe5bdcd
Cherry-Pick: I1f3bc846
2011-05-27 21:14:52 +09:00
Tadashi G. Takaoka
ec8cb2eb53
Merge "Remove web mode and add webInput boolean (DO NOT MERGE)" into honeycomb-mr2
2011-05-27 00:06:46 -07:00
Tadashi G. Takaoka
38515ae577
Remove web mode and add webInput boolean (DO NOT MERGE)
...
Bug: 4490948
Change-Id: I4cd1af0b48d7ebcf8f4bd939e0e363e34dbfe8b7
2011-05-27 15:20:08 +09:00
satok
375f45cd19
Merge "Fix whitelist"
2011-05-26 20:26:13 -07:00
Eric Fischer
144e97f154
Import revised translations.
...
Change-Id: I03c7133e46f6067f1912e778b498bf1915f42441
2011-05-26 15:47:59 -07:00
Eric Fischer
01a12eb1d8
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-26 11:38:04 -07:00
Eric Fischer
5ea4c0cec3
Import revised translations. DO NOT MERGE
...
Change-Id: I1f50ea2efc93a69ccd27df5e2708bdd8384f0df1
2011-05-26 11:26:29 -07:00
Tadashi G. Takaoka
ab9335e949
Merge "Update phone/number layout with new 7inch design (DO NOT MERGE)" into honeycomb-mr2
2011-05-26 10:38:52 -07:00
Tadashi G. Takaoka
37445e1136
Update phone/number layout with new 7inch design (DO NOT MERGE)
...
Bug: 4442045
Change-Id: I346489b62b424f6fb897b109310b62b2538ef397
2011-05-27 01:20:43 +09:00
Tadashi G. Takaoka
a3eff88af6
Fix Russian keyboard input code
...
This is cherry pick from Honecyom-MR2 Iebeec413.
Change-Id: I11b292fe4469f1d0232948b57a93cd0f0275c87d
2011-05-26 23:35:54 +09:00
Tadashi G. Takaoka
c4fc3b0266
Fix Russian keyboard input code (DO NOT MERGE)
...
Change-Id: Iebeec413f7f7d26fc00102a27c4eaec1fb63f8a1
2011-05-26 23:07:41 +09:00
Tadashi G. Takaoka
d8638ff34b
Introduce new 7" keyboard layout (DO NOT MERGE)
...
This change only changes QWERTY layout. The phone/number and
AZERTY/QWERTZ/Russian/Scandinavia layouts will be fixed soon.
Bug: 4442045
Change-Id: Ib42c84e1d05fee513b1b7680ef0dcf755298d444
2011-05-26 20:33:17 +09:00
satok
a0493fa070
Fix whitelist
...
Bug: 4090049
Change-Id: I1d57ddafcacb895196c65acaae198dad7499983b
2011-05-26 20:30:27 +09:00
Tadashi G. Takaoka
f5d9649680
Introduce web and email mode (DO NOT MERGE)
...
This change introduces new keyboard mode "webEmail" to honor
InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS. In this mode, both
'@' key and TAB key appear on the keyboard.
The keyboard layouts will be modified with other change.
Bug: 4490948
Change-Id: I66f9bda4907da448db097e9c900199dfa700b16a
2011-05-26 19:47:47 +09:00
Justin Ho
b0598460cf
Updated IME assets and layouts to support 600dp devices
...
Bug: 4442045
Change-Id: I98664b0c954be82eeda00c69e712da2e20ca606a
2011-05-25 18:39:03 -07:00
Tadashi G. Takaoka
13a7419994
Use custom theme for Keyboard theme switch
...
This change reduces the number of layout files and make these
theme-generic. This might be very helpful to re-design suggestion
strip.
Bug: 4175031
Change-Id: Idca10a4aa0bf7ac496eedd1879311e59780a423b
2011-05-25 18:59:00 +09:00
Tadashi G. Takaoka
f71454fecb
Slightly lower the keyboard height on 7" landscape (DO NOT MERGE)
...
Bug: 4479212
Change-Id: Ie3b1d82ee659c5f67eede936c079e99c1a4451b9
2011-05-24 16:10:54 +09:00
Tadashi G. Takaoka
c150acc7c8
Move CandidateView into input view
...
Bug: 4175031
Change-Id: I95f379b9943d1dcab1dc5527b6e5ac5abd58e280
2011-05-24 15:37:53 +09:00
Tadashi G. Takaoka
5903e061ad
Merge "Reorganize drawable for large and xlarge device (DO NOT MERGE)" into honeycomb-mr2
2011-05-23 23:11:48 -07:00
Tadashi G. Takaoka
eef3b7b328
Add number password keyboard layout to phone (DO NOT MERGE)
...
Bug: 4479212
Change-Id: Ia0a284a365af99257ed47351bdd3387fd9a53eba
2011-05-24 12:31:52 +09:00
Tadashi G. Takaoka
83fdaddda8
Reorganize drawable for large and xlarge device (DO NOT MERGE)
...
Because the holo theme drawables have "holo" effect around 9-patch as
fixed size image, so we need dedicated drawables for each sw600dp-mdpi
and sw768dp-mdpi resolutions for visual designers.
* drawable-mdpi (fallback resources)
* drawable-sw600dp-mdpi (7" tablet, phone style keyboard, placeholder for now)
* drawable-sw768dp-mdpi (10" tablet, tablet style keybaord)
Note that:
* Eventually sw600dp drawables will be updated by designers.
* We need sw768dp drawable copies because, without these, 10" tablet
will use updated sw600dp drawables wrongly.
* We have to keep drawable-mdpi as final fallback resources.
Bug: 4436327
Change-Id: I93db87ee99c2abb8d18e869e5411e3cb5bec1020
2011-05-23 19:44:50 +09:00
Tadashi G. Takaoka
88100d3651
Rename filename of hint icons for numbers (DO NOT MERGE)
...
Bug: 4436327
Change-Id: I1f3bc846683edc4be666dce8ea89659225ef7301
2011-05-23 19:10:39 +09:00
Tadashi G. Takaoka
20920c0178
Remove unnecessary executable permission from drawable
...
Cherry-Pick: Ie8644396e1df8fbc16e4047808857c91aa2451ba
Bug: 4436327
Change-Id: I6917876995f20361358b6e6577fc646795f04d7e
2011-05-23 16:22:49 +09:00
Tadashi G. Takaoka
51139a6104
Merge "Remove unnecessary executable permission from drawable" into honeycomb-mr2
2011-05-22 23:51:04 -07:00
Tadashi G. Takaoka
f4e2af842c
Remove unnecessary executable permission from drawable
...
Bug: 4436327
Change-Id: Ie8644396e1df8fbc16e4047808857c91aa2451ba
2011-05-23 15:49:00 +09:00
Tadashi G. Takaoka
f4911e4348
Rename resources with new scheme (DO NOT MERGE)
...
This change renames resources along with new naming scheme.
* large to sw600dp (7" tablet uses phone keyboard layout)
* xlarge to sw768dp (10" tablet)
Bug: 4436327
Change-Id: I96678fa699d2abcb48022d8878557f1486e839aa
2011-05-23 13:16:08 +09:00
Tadashi G. Takaoka
c142f5e48c
Fix Android Keyboard crash on hdpi device
...
Cherry-pick: I9fcb970c214e92ad7711fbbf4a375a8c3c6d024b
Bug: 4436327
Change-Id: I0d1831783cbff7b9056f84819fbcb8a4a9a34d5d
2011-05-21 14:51:05 +09:00
Tadashi G. Takaoka
4bb0992fd2
Fix Android Keyboard crash on hdpi device
...
Change-Id: I9fcb970c214e92ad7711fbbf4a375a8c3c6d024b
2011-05-21 03:26:38 +09:00
Tadashi G. Takaoka
28ad889d0e
Remove unused resources (DO NOT MERGE)
...
This change also syncs the drawables with Master.
Cherry-pick: I2573786aac5fd8d543cf12d24c951b67c7353fd7
Bug: 4436327
Change-Id: I88dc0162033a1017040205590c0c34a5111b835a
2011-05-20 21:43:20 +09:00
Tadashi G. Takaoka
d794c6f078
Remove manual config item controlling to show input language settings
...
Change-Id: I77f831c653567f2cf214a5b61107b25cca6d751d
2011-05-20 12:36:46 +09:00
Tadashi G. Takaoka
f5443e4ef5
Replace large device keyboard with phone style keyboard (DO NOT MERGE)
...
This change also fixes copyright comments.
Bug: 4442045
Change-Id: I297a2c64e709fb0d613404e5f1de45d810f9de15
2011-05-20 12:28:26 +09:00
Tadashi G. Takaoka
d73bdfeb18
Fix Serbian (Cyrillic) keyboard layout (DO NOT MERGE)
...
Cherry-pick: Iae1d8e9752c355d08d7f3d0fe7057fce61ea702f
Bug: 4406840
Change-Id: I5e0109b427093a459d2937809498985dc8409f97
2011-05-19 15:20:48 +09:00
Tadashi G. Takaoka
3f72d81388
Copy xlarge layout/values/drawable to large (DO NOT MERGE)
...
Bug: 4442045
Change-Id: Iaec97c019eed8f035fef0e8f0b7604db7ecba2b7
2011-05-18 18:28:31 +09:00
Eric Fischer
a205d23ffd
Import revised translations.
...
Change-Id: I8d37e4dc59fbb9fdb55597b04840e86838ae0650
2011-05-17 17:05:55 -07:00
Tadashi G. Takaoka
0041e96d69
Fix minKeyboardHeight of tablet
...
Change-Id: I5520a2e1abdc24736cb7ef96badefc06bb78e2a3
2011-05-17 00:26:54 +09:00
Tadashi G. Takaoka
a645d88228
Remove unused resources
...
Bug: 4436327
Change-Id: I2573786aac5fd8d543cf12d24c951b67c7353fd7
2011-05-16 16:22:39 +09:00
Tadashi G. Takaoka
869c8759a8
Cleanup VoiceIME related drawable
...
Bug: 4436327
Change-Id: I55d7ab043f32d51c32acfd11434214b79a7ae204
2011-05-16 12:09:31 +09:00
Tadashi G. Takaoka
0da235208e
Merge "Fix missing max/minKeyboardHeight in es/pl/pt locale"
2011-05-13 05:33:14 -07:00
Tadashi G. Takaoka
3bedf1094c
Fix missing max/minKeyboardHeight in es/pl/pt locale
...
Change-Id: I7bb32aa918ed2f5f4785aaf070026fac1ae43592
2011-05-13 21:29:32 +09:00
Tadashi G. Takaoka
96e822c94c
Merge "Lower the key preview position a bit on phone layout"
2011-05-13 05:04:40 -07:00
Tadashi G. Takaoka
a3aeaaf3b5
Lower the key preview position a bit on phone layout
...
Change-Id: I90ded245ceb7e13d3e8a76d8c1cc0e7325ab6aab
2011-05-13 20:58:28 +09:00
Jean Chalard
240297d0ee
Add advanced settings screen
...
Also add an option for popup dismissal delay so as to inaugurate the
new screen. Besides, remove a path for options to escape from
LatinIME and replace with a direct read from the settings.
Change-Id: I7ec6e724262871fa6523506ecc39f65c5fbe34da
2011-05-13 20:40:21 +09:00
Tadashi G. Takaoka
d157834345
Auto text sizing using fraction of key height
...
Bug: 4411676
Change-Id: I8f289dcebe577d277fe2ad6a8331d59f735cbada
2011-05-13 18:44:57 +09:00
Tadashi G. Takaoka
13e6725a78
Merge "Add minKeyboardHeight attribute to Keyboard layout"
2011-05-13 02:41:50 -07:00
Tadashi G. Takaoka
ce1902bb0e
Merge "Remove double high-reversed-9 quotation mark"
2011-05-12 23:12:55 -07:00
Tadashi G. Takaoka
b05c913fb1
Remove double high-reversed-9 quotation mark
...
Because current DroidSans font lacks double high-reversed-9 quotation
mark '\u201f' glyph (Bug: 4368421), this change remove it from symbol
keyboard popup mini keyboard. This change also removes corresponding
double low-9 quotation marks as well.
Bug: 4347045
Change-Id: I30d1493376efe5af98722e76999107de5dfcae3e
2011-05-13 13:02:32 +09:00
satok
cbcae9a6e8
Merge "Fix the available input locales and moved Recorrection"
2011-05-12 19:33:58 -07:00
satok
f733074aae
Fix the available input locales and moved Recorrection
...
Bug: 4409091
Change-Id: I6efd23ebb9528bf1bd35320057a0ea264c187451
2011-05-12 20:26:24 +09:00
Tadashi G. Takaoka
ff483e8d0c
Add minKeyboardHeight attribute to Keyboard layout
...
Bug: 4411676
Change-Id: I1f56ba58bacb90790f82326718bf9de95dba5d28
2011-05-12 18:19:12 +09:00
Tadashi G. Takaoka
101a00e3d4
Revert "Added support for speaking keys through accessibility service."
...
This reverts commit dcade18113
.
Bug: 4379983
Change-Id: I2448d8f03990a39a3e328a88904d82efc70241a2
2011-05-12 00:14:55 +09:00
Tadashi G. Takaoka
287d0d47ff
Fix Serbian (Cyrillic) keyboard layout
...
Bug: 4406840
Change-Id: Iae1d8e9752c355d08d7f3d0fe7057fce61ea702f
2011-05-11 20:32:40 +09:00
Tadashi G. Takaoka
14a5f53c27
Merge "Fix suggestion strip geometry"
2011-05-09 20:52:16 -07:00
Tadashi G. Takaoka
37b6b44a90
Fix suggestion strip geometry
...
Bug: 4393288
Change-Id: I6cad1d186db25174a3f31a57975165e720b41266
2011-05-10 11:53:55 +09:00
Eric Fischer
6efb50ba07
Import revised translations. DO NOT MERGE
...
Change-Id: I7d3771cac30793818a12ddd57baf980d7495c87e
2011-05-09 17:05:02 -07:00
Jean Chalard
3d994a48a2
Merge "Improve magic space handling."
2011-05-09 04:07:16 -07:00
Tadashi G. Takaoka
ff082d081f
Refactor KeyboardView and create MiniKeyboardView
...
Change-Id: I8d68b944762ccde05020978f20b3742eb6ab945b
2011-05-09 19:17:39 +09:00
Jean Chalard
863f95b605
Improve magic space handling.
...
Split symbols into:
- Symbols that should swap themselves with a magic space.
- Symbols that should remove the magic space.
- Symbols that should transform the magic space into a real space.
Also, have symbols inserted from the suggestion strip always consider
the space before them to be magic.
Also, do minor refactoring to remove useless variables or make clearer
how to carry some symbol-related information.
Bug: 4391347
Change-Id: Ie2308a62c8fef55e3610897c0f58943acb7aa8c9
2011-05-09 19:15:11 +09:00
Ken Wakasa
aac2d87dcf
Merge "Tweak keyboard heights for phone, and key preview delay."
2011-05-06 04:02:58 -07:00
Ken Wakasa
7642eb3b4b
Tweak keyboard heights for phone, and key preview delay.
...
Change-Id: I1c5e6db2923ce256ae70347f17ab28ff3c700ef1
2011-05-06 19:56:07 +09:00
satok
0d8a4eb367
Add pl keyboard layout
...
Bug: 4394303
Change-Id: I0fa24829e1240549728d9b81af3e39a024725016
2011-05-06 19:22:08 +09:00
Eric Fischer
80bcf30dd6
Import revised translations.
...
Change-Id: I255568e425169188a3be66c56fc36434e0b325fb
2011-05-02 15:55:46 -07:00
Jean Chalard
ccb60b7627
Merge "Straighten out magic space vs real spaces behavior."
2011-05-02 04:28:16 -07:00
Jean Chalard
0730bbfbf5
Straighten out magic space vs real spaces behavior.
...
Picking a suggestion inserts a space after the word. This change makes
this space a magic space.
Incidentally, do some minor cleanup: add CODE_DASH, CODE_SINGLE_QUOTE
and CODE_DOUBLE_QUOTE to Keyboard and use them throughout the code,
and remove a useless import directive in some unrelated file.
Bug: 4319740
Change-Id: I245f396c34dd0af820bca91edc4ec363238a4ae4
2011-05-02 19:19:05 +09:00
Ken Wakasa
9b2192bfd2
Revert the suggestion update delay to the original value (100msec) for phones.
...
This is actually a follow-up to I385f9eb2
bug: 4361287
Change-Id: I4c4a0a96a7fa28f4f96dd984453d2c9f3fa7d6c2
2011-04-29 19:23:49 +09:00
Tadashi G. Takaoka
b880ccc3bd
Merge "Fix quotation marks"
2011-04-26 23:47:15 -07:00
Tadashi G. Takaoka
717cef79ea
Fix quotation marks
...
This change
* Allows snap back from symbols shifted to symbol layout.
* Add "left single", "right single", "single low" and "single high
reversed" quotation marks to popup characters of "single quote".
* Add "double low" and "double high reversed" quatation marks to popup
characters of "double quote".
* Add "prime" and "double prime" to popup characters of "degree".
* Disable non-ASCII key of symbol more layout on passowrd input.
Bug: 4345054
Bug: 4347045
Change-Id: I8168ce6a74a9536e4966f7f9d1099ac0132925c7
2011-04-27 15:21:06 +09:00
Eric Fischer
837432d4e2
Import revised translations.
...
Change-Id: I71334fc9054623b29cf42188f259712f1619abf2
2011-04-26 16:09:00 -07:00
Eric Fischer
9d4aadbe24
Merge "Import revised translations."
2011-04-22 12:30:32 -07:00
Eric Fischer
3722bb9b48
Import revised translations.
...
Change-Id: I4944120cd4a15f643f7c1619524dde8147fab0a3
2011-04-22 12:20:20 -07:00
satok
c06e65b3f6
Merge "Fix arabic layout for phone"
2011-04-22 05:28:30 -07:00
Tadashi G. Takaoka
a0537fb4c7
Fix repeat key behavior
...
Change-Id: Ia7e5b2e9579aa0e5050857cdb14f16fa05a33621
2011-04-22 21:17:55 +09:00
satok
d63135c148
Fix arabic layout for phone
...
Change-Id: I2b71f44e27f95ba3949e2e2c150696045f3c28b3
2011-04-22 20:52:04 +09:00
Tadashi G. Takaoka
75136cd009
Fix language switch preview
...
This change also makes the delay after key preview longer to 60ms.
Change-Id: If7cf3b493824bb12e0bf44aa0bc3c186b15b51f6
2011-04-22 18:26:32 +09:00
satok
940b8d81f3
Merge "Add an debug option to use spacebar switcher"
2011-04-22 00:51:07 -07:00
satok
c5a2b51924
Add an debug option to use spacebar switcher
...
Change-Id: Icc483f097696a1c5a2a7ab037afce19c9cfe837f
2011-04-22 15:54:39 +09:00
Jean Chalard
b50591295d
Add an option for using bigram prediction.
...
This change adds the option for bigram prediction under the option
for bigram suggestion. The "prediction" option depends on the
"suggestion" option.
This change also reorders a tad bit the settings screen. Namely, it
sticks both bigram options under a "bigram" category, and groups the
options that did not have a group under a "other options", or misc,
category.
Finally this change also renames the internal name of the "text
corrections" option category to "correction_category" instead of
"prediction_category" which was misleading.
Change-Id: I2d8787c8a391fd8202ed3a686c613494b7260a1e
2011-04-22 15:53:48 +09:00
Tadashi G. Takaoka
6c10cf6bf8
Merge "Rename and reorganize key code"
2011-04-21 23:33:21 -07:00
satok
1b9eecb521
Fix language selection settings
...
Change-Id: I84e51ce2b80a21650e309e5e6c9ee5f1739170c9
2011-04-21 23:27:46 +09:00
Tadashi G. Takaoka
d2c5fdda86
Rename and reorganize key code
...
Change-Id: I13d6fef7af1c4356a22b0e8aebc9e613b1693ece
2011-04-21 20:32:33 +09:00
satok
49a11524fc
Fix language selection settings
...
Change-Id: I99e2039579a5bd606a8e698cdee2739465b998bc
2011-04-21 19:46:06 +09:00
Tadashi G. Takaoka
c9c3aa219e
Merge "Disable key preview of space, return and delete"
2011-04-21 03:10:21 -07:00
Tadashi G. Takaoka
ba9aefcc18
Disable key preview of space, return and delete
...
This change also re-orders punctuation mini keyboard.
Change-Id: I987ef14fe5956d13439a0a76de367feed825314c
2011-04-21 19:04:49 +09:00
satok
15a0ba6d74
Check the availability of layouts for showing the input languages in the settings
...
Bug: 4316889
Change-Id: I746b3ff79c2a6cd4925fca1817d5b209623b5108
2011-04-21 17:17:32 +09:00
Jean Chalard
c9bc5c8d34
Merge "Move language-specific keyboard setting to resources."
2011-04-20 01:52:54 -07:00
Jean Chalard
c899038eee
Move language-specific keyboard setting to resources.
...
Some flag settings used to be stored in a keyboard layout extravalue setting. This
change:
- Introduces the capability of setting such specific flags in values/config.xml
- Retains the ability to use extravalues (for layout-specific settings), though
there is no more any such setting at the moment.
- Fixes a bug where loading a dictionary from outside does not initialize the flags.
- Moves Flag to another class.
Note: this needs I705ec68c to avoid breaking the build
Change-Id: Ia7703aae3215b06c0b3cb792821649806e8998c1
2011-04-20 17:31:59 +09:00
Tadashi G. Takaoka
708aa80492
Add mini keyboard fo tab key in web layout
...
This change also re-orders punctuation mini keyboard.
Bug: 4315046
Change-Id: I567ea417fc8d3cb23dceac6965fa279e6beca970
2011-04-20 15:46:35 +09:00
satok
95d9e47104
Merge "Tweak voice layout for Dogfood"
2011-04-19 23:15:37 -07:00
satok
015b21cf52
Tweak voice layout for Dogfood
...
Change-Id: Ic51a044901a63c4cec907163e35cd5e458f36dde
2011-04-20 15:13:57 +09:00
satok
b1ae5d84b1
Merge "Remove debug mode from the settings preference"
2011-04-19 21:52:12 -07:00
satok
39144ca4f9
Change the default value of logging to true
...
Change-Id: I52198ebca929f02e8b04db77a474ee5a7e79cdea
2011-04-20 11:42:55 +09:00
satok
10f113f5d2
Remove debug mode from the settings preference
...
Change-Id: I2b3f973f8d59687fe5b95b841449bff5c4b1a2ba
2011-04-20 11:34:20 +09:00
Tadashi G. Takaoka
9c192e1b70
Shrink tab key width on web mode layout
...
Bug: 4315046
Change-Id: I468ddf14d1f486d2c24cef56ed211ac9228cae43
2011-04-19 18:34:59 +09:00
Eric Fischer
73544aded7
Import revised translations.
...
Change-Id: Icdf10a328353d201b5751ac7f21f2fb7a64b3daa
2011-04-15 14:46:55 -07:00
satok
4f6e646352
Merge "Add a value for the screen metrics"
2011-04-15 04:06:22 -07:00
Tadashi G. Takaoka
ffca763050
Merge "Fix French mini keyboard keys precedence"
2011-04-15 02:21:07 -07:00
Tadashi G. Takaoka
5d542c2492
Auto mini keyboard layout
...
Bug: 4280617
Change-Id: I34c344cbf350fe125589aa14ad69e4bd1f4e6f66
2011-04-15 18:19:31 +09:00
satok
16e9edfb14
Add a value for the screen metrics
...
Change-Id: I4d221e19b495e865a6714854c4addfaeddeb4e18
2011-04-15 16:55:07 +09:00
Tadashi G. Takaoka
d4f14d07fa
Fix 1st suggestion text alignment
...
Change-Id: I530de62b7cf088cff01c98a8a47d75393e8725b2
2011-04-14 17:59:25 +09:00
Tadashi G. Takaoka
dc3d4e8c06
Merge "Fast key preview"
2011-04-13 03:12:06 -07:00
Tadashi G. Takaoka
7a3d3ae17f
Fast key preview
...
Previously the key preview was implemented by PopupWindow. The key
preview popup window would be dismissed and shown each time the key
was released and pressed. It turned out that it was taking several
milliseconds.
This change implements the key preview by a simple TextView which will
be layout-ed at absolute coordinates within the screen FrameLayout.
And dismissing and showing the key preview is implemented by the
TextView's visibility.
This implementation needs careful coordination of candidates.xml
layout and LatinIME.onComputeInsets to control suggestion strip
visibility.
Bug: 4179964
Change-Id: Id6347cb35b91eb14ab20dd2f312e58b54b6625a7
2011-04-13 18:59:33 +09:00
Tadashi G. Takaoka
772eef03e7
Fix French mini keyboard keys precedence
...
Bug: 4280617
Change-Id: Ic4af5260a9fb8b2bf83ad6135069079266a96aa9
2011-04-13 17:56:48 +09:00
Tadashi G. Takaoka
740be4493a
Fix Arabic mini keyboard precedence
...
Change-Id: I73e9e8bb243ae89944bf346885529fc3dd6df226
2011-04-13 15:04:29 +09:00
satok
09df2a5bf4
Merge "Remove voice subtypes"
2011-04-12 20:16:46 -07:00
satok
b435a6ddca
Remove voice subtypes
...
Bug: 4176028
Change-Id: Icbd699370051c377da281016df3c363f8544a788
2011-04-13 10:41:50 +09:00
Ken Wakasa
33fa046fe3
Additional tweak of gaps for delete/shift keys
...
bug: 4269094
Change-Id: I62c5b80276d743f86dcf2f3eb5cdc6d7aa519024
2011-04-12 19:07:14 +09:00
Eric Fischer
b73ab9f2df
Import revised translations.
...
Change-Id: Id2c4aac29ce82298a3c3d64540592932767f1e45
2011-04-11 14:30:01 -07:00
Tadashi G. Takaoka
689e7e907b
Add Arabic keyboard to phone
...
Change-Id: I60c312fe9dc383a8048b46d9b54eee535c515aaa
2011-04-11 14:16:02 +09:00
Tadashi G. Takaoka
56abeabced
Add visualInsetsLeft and Right as Key attribute
...
Bug: 4269094
Change-Id: Ic38d326a8e9ef802453c909f3a81d556863acc9b
2011-04-11 12:13:38 +09:00
Tadashi G. Takaoka
a8c163f262
Fix suggestion strip layout
...
This change also removes unused drawable and xml resources.
Bug: 4181825
Change-Id: Ia723376bc5d40900a513df62e89cdfe35b2c859f
2011-04-08 20:03:57 +09:00
Tadashi G. Takaoka
82730b0e09
Merge "Remove redandant key from popup mini keyboard which has settings key"
2011-04-08 02:43:26 -07:00
Tadashi G. Takaoka
1844ee7cf8
Remove redandant key from popup mini keyboard which has settings key
...
Bug: 4196879
Change-Id: If0ed5cace2d4d0c1f0e225e1003d54c055690387
2011-04-08 18:03:23 +09:00
Tadashi G. Takaoka
2c389c5b9e
Merge "Increase the horizontal gap between shift/delete and normal keys"
2011-04-08 02:00:59 -07:00
Tadashi G. Takaoka
6d81e2b79b
Increase the horizontal gap between shift/delete and normal keys
...
This change also adds capability to add horizontal padding to the
keyboard.
Bug: 4269094
Change-Id: I805e76b253a497079517c01bd2a976f8702f7e56
2011-04-08 16:43:01 +09:00
satok
299e366bcf
Shrink sym_keyboard_voice_off_holo for phone
...
Bug: 4225070
Change-Id: Ic61c3c0263158ed3429553b134f13e8e94f5f5b7
2011-04-08 16:39:25 +09:00
Tadashi G. Takaoka
50cce07f59
Merge "Remove "settings" key popup from "slash" and "atmark" key"
2011-04-07 21:43:28 -07:00
Tadashi G. Takaoka
cf4eff3f59
Remove "settings" key popup from "slash" and "atmark" key
...
Removing "settings" key popup from these keys when there's a dedicated
"settings" key in the layout.
This is followup chnage of I119528c0.
Bug: 4196879
Change-Id: I742cc6d1d890c095610f1e8b9ac91a044ec540b7
2011-04-08 10:27:51 +09:00
Eric Fischer
2e4a15bf60
Merge "Import revised translations."
2011-04-07 14:07:55 -07:00
Eric Fischer
85427b3d8e
Import revised translations.
...
Change-Id: I8c2fb2177e47ad50cf0ae1a191d2b8b4186c0700
2011-04-07 13:59:50 -07:00
Tadashi G. Takaoka
e7c0e73a19
Simplify the Key's on state transition
...
Because handling shift locked state of alphabet keyboard is done by
KeyboardSwitcher, there is no need to change the "on" state of Key
when releasing the key. On the other hand, symbol and symbol shifted
keyboard has fixed "on" state "ALT/MORE" key.
This change also renames the attribute "isModifier" to "isFunctional".
Change-Id: I082885bd2376ae26bdfc378c14add2b5d6be1d4e
2011-04-07 20:28:46 +09:00
Tadashi G. Takaoka
494926fc2b
Remove "settings key" popup from "comma key"
...
Bug: 4196879
Change-Id: I119528c03526b47a1398d9efc2aa307eb0c07ffe
2011-04-07 17:49:49 +09:00
Tadashi G. Takaoka
da4bfbbbb3
Fix popup key preview on tablet
...
This change temporally enable popup key preview option on
tablet. (config_enable_show_popup_on_keypress_option).
Bug: 3286117
Change-Id: Iabbac5a333460e1ed2f8d05ba82f4bae81854b85
2011-04-07 15:56:16 +09:00
Eric Fischer
fa62894c4b
Import revised translations. DO NOT MERGE
...
Change-Id: Ica512df634b9152aac5bcd5f15d783110724fd7d
2011-04-06 13:51:45 -07:00
satok
fd58877d4f
Merge "Add settings for theme, userfeedback and other settings (temporary)"
2011-04-01 03:53:26 -07:00
satok
8f9b86fec5
Add settings for theme, userfeedback and other settings (temporary)
...
Change-Id: I063c48dbf021f5608c241a3543aa2628b5faaa40
2011-04-01 19:48:17 +09:00
satok
eee03627ce
Revert all hdpi assets to gingerbread
...
Bug: 4196962
- all hdpi assets are blurred.
Change-Id: I4a589f99ead2b8db96f03c19771f083306276e61
2011-04-01 17:44:48 +09:00
Eric Fischer
97c916a684
Import revised translations. DO NOT MERGE
...
Change-Id: I9c0ccba49ec84860ad5390d4c5f878a48f873cfe
2011-03-29 12:01:28 -07:00
Jean Chalard
9107d98290
Add comments and basic reformatting for new files.
...
Ic4df2a9a introduced new keyboard layouts for Hebrew and Arabic.
This change adds a comment to them alongside with trailing
whitespace suppression.
This change explicitly limits its scope to files introduced by
Ic4df2a9a. It replaces I48927626 which has been deemed too reckless.
Change-Id: Id6b0e47f0623ead0b4e42e57dae359231a2b97fc
2011-03-24 00:32:10 -07:00
Jean Chalard
e50add1fbd
Add a first version of Hebrew and Arabic keyboard.
...
The Arabic keyboard is more or less based on PC keyboard and other
sources. It has no means to input diacritics at the moment.
Some data for the Hebrew keyboard was already there, but not used.
This change splits phone and tablet layout and consolidates the
tablet one to something that seems sensible. It can't input diacritics
either at the moment.
Other shortcomings affect those keyboards. For example, normal
Hebrew keyboards switch to capital QWERTY keyboard with shift on,
as there are no capital Hebrew characters, but this version does not
feature this.
It should be mostly possible already to enter Arabic or Hebrew with
these keyboards however.
Change-Id: Ic4df2a9a77ffd03c4f9ee2c47e03c0f43f8e48ae
2011-03-23 22:31:40 -07:00
Eric Fischer
f75f9c5303
Import revised translations. DO NOT MERGE
...
Change-Id: Icac4b15118a9a49cac6d0c70e5783e64fa430782
2011-03-22 13:40:31 -07:00
Eric Fischer
76c2ff2154
Import revised translations.
...
Change-Id: I02fb673c7b4f180fb60c5cb869c458b65820781a
2011-03-17 16:56:28 -07:00
satok
9807ab27ea
(Refactor 1) Moved voice related codes to deprecated/voice
...
Change-Id: I008ac7099c815fb74a9ab374419617b336453f97
2011-03-16 23:00:59 -07:00
Eric Fischer
88adb7d4a9
Import revised translations. DO NOT MERGE
...
Change-Id: Ieb00b75f2eb2f9a85e11c1694d42d2ee449e29e0
2011-03-16 17:02:12 -07:00
Eric Fischer
c0471c43fb
Import revised translations. DO NOT MERGE
...
Change-Id: I6eaad0ee53243ae5eece9bc6f8013eb77472e988
2011-03-15 14:49:18 -07:00
Eric Fischer
9eb7e2c37f
Import revised translations.
...
Change-Id: Idc65c5944dcfa576ee50facb6b1f82e2a7d7186f
2011-03-15 10:48:11 -07:00
Eric Fischer
9db8d06418
Import revised translations. DO NOT MERGE
...
Change-Id: I660c6bc3b40072e209fe31c3c86ad11ce7928a71
2011-03-10 11:28:07 -08:00
Tadashi G. Takaoka
33e8124cf4
am 6a75cd12: Add alphabet hint to number password layout
...
* commit '6a75cd124d885df1b257d63c9c2b0561a9b09b84':
Add alphabet hint to number password layout
2011-03-09 10:07:46 -08:00
Tadashi G. Takaoka
6a75cd124d
Add alphabet hint to number password layout
...
Bug: 4063047
Change-Id: I53e79edcb15d4da73a72d14a38224e80b612c115
2011-03-08 18:02:18 -08:00
satok
b34c74abb1
am b55fcea6: Merge "Add whitelist dictionary" into honeycomb-mr1
...
* commit 'b55fcea6fc23bf44966ffb278d976c54995be72e':
Add whitelist dictionary
2011-03-07 22:50:07 -08:00
satok
bcfce3b3b9
Add whitelist dictionary
...
Bug: 3447571
Change-Id: I538e4e706982129b666ca1ab1085f1b68b69f87f
2011-03-08 11:29:10 +09:00
Eric Fischer
d7e2bc335d
Import revised translations. DO NOT MERGE
...
Change-Id: I2d90d6842d8572db68b3034917fa45e642c7f123
2011-03-07 13:03:14 -08:00
Eric Fischer
a549101f3a
Import revised translations. DO NOT MERGE
...
Change-Id: Icc96e318e240e58b07ec52e64fb640b3bc9f6443
2011-03-04 13:48:59 -08:00
Eric Fischer
50a4cb403f
Remove unneeded large-screen-specific translations.
...
Change-Id: Ia583ff3a4674dab1a2dc5cad7d7166ec9311585a
2011-03-03 15:50:53 -08:00
Jean Chalard
c2bbc6a449
Use translation of fallback umlauts digraphs for German.
...
For German : handle "ae", "oe" and "ue" to be alternate forms for
umlaut-bearing versions of "a", "o" and "u".
Issue: 3275926
Change-Id: I056c707cdacc464ceab63be56c016c7f8439196c
2011-03-03 11:52:23 +09:00
Tadashi G. Takaoka
fc20f2198d
Introduce timeout for "." shortcut
...
Bug: 3294239
Change-Id: I1832be8b54cd4d55cd504a3e1e0434aa284f9592
2011-03-01 23:57:51 -08:00
Tadashi G. Takaoka
db241a1038
Update assets from designer-git repository
...
This new assets has revised alpha value.
Bug: 3451586
Change-Id: I8485044263b92111d882c4f88ca6a0e92c82f0ed
2011-03-01 17:41:59 -08:00
Tadashi G. Takaoka
ee327ad0de
Merge "Import new assets from designer-git repository"
2011-03-01 14:03:42 -08:00
Tadashi G. Takaoka
8ba2ceea68
Merge "Add "apostrophe" key to symbol keyboard of url mode"
2011-03-01 13:58:24 -08:00
Tadashi G. Takaoka
b9038eb841
Import new assets from designer-git repository
...
Change-Id: Ie07dc956ea5c40b760d511976e42f847f0f68f9f
2011-03-01 13:44:48 -08:00
Tadashi G. Takaoka
dd0ac4a58d
Add "apostrophe" key to symbol keyboard of url mode
...
Bug: 3491087
Change-Id: I4fa339e66c958a54f2d28a2997861135ef94f7e6
2011-03-01 11:58:41 -08:00
Eric Fischer
19292fbff6
Import revised translations.
...
Change-Id: Ic7ae2c78e732707ef2504e82c08851fe627465b3
2011-03-01 11:03:19 -08:00
Tadashi Takaoka
52e96f1e89
Merge "Added support for speaking keys through accessibility service."
2011-02-24 17:45:44 -08:00
Tadashi G. Takaoka
20887c57a6
Force currency key to "dollar" on password input field
...
This is followup change of I660c6f50.
Bug: 3413589
Change-Id: I7684150f7c52444884fe02a27e39c6de0105b2d8
2011-02-24 18:11:48 +09:00
Tadashi G. Takaoka
0e3548788b
Merge "Dynamic currency key label"
2011-02-24 00:03:18 -08:00
Tadashi G. Takaoka
d77e968942
Merge "Add noSettingsKey private IME option"
2011-02-23 23:48:45 -08:00
Tadashi G. Takaoka
613514252c
Dynamic currency key label
...
The currency key shows different key label depending on the coutnry
code of the keyboard, "dollar", "euro" and "pound".
Bug: 3413589
Change-Id: I660c6f5010629276df3f97d337f4493d1fbccb3f
2011-02-24 16:47:25 +09:00
Tadashi G. Takaoka
4199e29a7d
Add noSettingsKey private IME option
...
Change-Id: Idf74aa32c9ea565fa6771013e2d37ee952c83a57
2011-02-24 16:31:20 +09:00
Alan Viverette
dcade18113
Added support for speaking keys through accessibility service.
...
Issue: 3366636
Change-Id: I70a2ebb4420782ba4d7d874ffc2259bb1b80446f
2011-02-23 18:16:43 -08:00
Jean Chalard
ededda059c
Merge "Treat quotes as part of the word in French."
2011-02-23 17:29:10 -08:00
Jean Chalard
92e208429e
Treat quotes as part of the word in French.
...
Bug: 3397183
Change-Id: Ie634a9b0f1f7ed7cfa9f4f3aeba44b578bc7caac
2011-02-23 22:08:19 +09:00
Tadashi G. Takaoka
912ade36d2
Add countryCode attribute to case tag of Keyboard
...
Change-Id: I0480c3350a335e4cb57bba2d3484622990cd90af
2011-02-23 17:09:24 +09:00
Tadashi G. Takaoka
4adf5d9ae5
Disable non-ASCII symbol keys in password input
...
Bug: 3384942
Change-Id: Ifa10e84f22bb6ff85dfc397fac95a0294b2a6bea
2011-02-20 18:59:25 +09:00
Tadashi G. Takaoka
4b13b4f942
Add "passwordInput" attribute to case tag of Keyboard
...
This change also introduces number password (a.k.a. PIN) layout. The
text password layout will follow.
Bug: 3384942
Change-Id: I50b5e413e47a28d5285fd0468115e11ce46c7f18
2011-02-20 18:46:48 +09:00
Tadashi G. Takaoka
ec2ef40dab
Revised Russian keyboard layout
...
Bug: 3451586
Change-Id: I10d5f45b6218e8f0ab5a0d2f2c285469338890c6
2011-02-20 00:41:07 +09:00
Tadashi G. Takaoka
ea6c2e3350
Add "languageCode" attribute to "case" tag in Keyboard XML
...
bug: 3451586
Change-Id: I08ca80e48648ba18543e9b8ca7362c06bb61a826
2011-02-18 17:04:04 +09:00
Tadashi G. Takaoka
d9c52ba623
Rename imeOptions attribute of Keyboard to imeAction.
...
Bug: 3384942
Change-Id: I3ce01b83f0ae37f447de8a7fcdb5d7fe06b108c6
2011-02-18 16:56:05 +09:00
Tadashi G. Takaoka
aa721c4783
Add "enabled" as an attribute of Key in Keyboard xml
...
If the key is marked as "enabled=false", the key will not respond to be pressed.
Bug: 3384942
Change-Id: I1ea82d9f3dfa5a9916ff3bbc736ea7e6c77426ae
2011-02-18 14:45:37 +09:00
Eric Fischer
2ca4e9ae8a
Import revised translations.
...
Change-Id: I4b678c68e9a32ac77c46958ef2c530da81508978
2011-02-17 10:21:28 -08:00
Max Braun
3cadd8e366
Adding 'ß' as an alternate for 's' (for 'en' keyboard).
...
Change-Id: Ic1dfd4b18be1bcfb9c525dad540b85892608d5c4
2011-02-11 13:15:38 -08:00
Jean Chalard
f0d99b8677
Make the keyboard sound on by default for xlarge screens.
...
Also change the name of the default value for re-correction for
consistency with other constant names.
Bug: 3426884
Change-Id: I615ba640fb17e6d7514b8a0e4f52028eb0e23908
2011-02-08 12:44:03 +09:00
Justin Ho
a702741374
am 20e3e036: am d6cac41d: Merge "Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6" into honeycomb
...
* commit '20e3e0362804e1ba9fa0db7a9514005480a0f33a':
Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6
2011-01-30 20:15:03 -08:00
Justin Ho
d6cac41dc7
Merge "Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6" into honeycomb
2011-01-30 20:09:24 -08:00
Justin Ho
9a3be5eab0
Fixing colon key alignment
...
Bug: 3362749
Bug: 3405016
Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6
2011-01-30 19:58:18 -08:00
Ken Wakasa
41fe2ee6ee
am 7c355c69: am e80c070c: Merge "Updated + key" into honeycomb
...
* commit '7c355c698d3776cf8e14dc9e1a438a7b2c3dbfee':
Updated + key
2011-01-29 00:11:58 -08:00
Ken Wakasa
e80c070c7d
Merge "Updated + key" into honeycomb
2011-01-29 00:08:07 -08:00
Justin Ho
755661e598
Updated + key
...
Bug: 3401855
Change-Id: Ib5e67d0038b7e89ecdf3b652ac0719e96bf4ab2f
2011-01-28 22:53:09 -08:00
Eric Fischer
fe97647f1b
Import revised translations. DO NOT MERGE
...
Change-Id: I87042810bd939cf3c83a97034c8f1fda99cdd534
2011-01-28 14:59:40 -08:00
Tadashi G. Takaoka
878d0c11dc
am 109c4e59: am 4d3b9d70: Import new icon for disabled mic key
...
* commit '109c4e59208c07107abebdec48ef3d9cbcbf3b2b':
Import new icon for disabled mic key
2011-01-27 23:35:30 -08:00
Tadashi G. Takaoka
4d3b9d709c
Import new icon for disabled mic key
...
This change also updates other hdpi assets.
Bug: 3345931
Change-Id: Ia91e449905677b025307bf9ea6e618d82090a389
2011-01-28 16:16:59 +09:00
Justin Ho
fe68d8418a
am 68d96067: am c768bcf9: Merge "Updating keyboard settings asset" into honeycomb
...
* commit '68d960671eae99abc4c01ff4911a7e1cc203367c':
Updating keyboard settings asset
2011-01-27 19:07:25 -08:00
Justin Ho
c768bcf92f
Merge "Updating keyboard settings asset" into honeycomb
2011-01-27 19:03:19 -08:00
Justin Ho
c9ead118c8
Updating keyboard settings asset
...
Bug: 3362749
Change-Id: If9f0dd25bc40a5dbc6613ce0660bd62237c27760
2011-01-27 18:56:26 -08:00
Ken Wakasa
35e485fa23
Small manual translation fix in es-rUS
...
Change-Id: Ie4556432661d3408c6f58739d551fd2c01c8531a
2011-01-28 09:44:37 +09:00
Tadashi G. Takaoka
b900040880
am 3e5462a7: am 0d6a8b13: Merge "Add tablet keyboards supported in Gingerbread" into honeycomb
...
* commit '3e5462a75017c2bdbcb45a1516269df9a4ed8de1':
Add tablet keyboards supported in Gingerbread
2011-01-26 22:31:34 -08:00
Tadashi G. Takaoka
0d6a8b133c
Merge "Add tablet keyboards supported in Gingerbread" into honeycomb
2011-01-26 22:27:36 -08:00
Tadashi G. Takaoka
79b965e04f
Add tablet keyboards supported in Gingerbread
...
This change also re-orders the laternate characters on mini keyboard.
Bug: 2214959
Change-Id: Id44c5b0c05f9f32ff939ad91d229d83731f2a135
2011-01-27 15:21:01 +09:00
Ken Wakasa
69f8b14801
Tentative translations for es-rUS
...
Change-Id: I32e7347e81f45f98a1d5f17c703ad8b3cd8ec97f
2011-01-27 13:49:12 +09:00
Eric Fischer
e2602eaa6d
Import revised translations. DO NOT MERGE
...
Change-Id: Ie4bacc79a479ab65a80c0f022bea7ad3e14f2b89
2011-01-26 16:40:37 -08:00
Tadashi G. Takaoka
1fb3077bd2
am aedd89f1: am 5cd87e1b: Disable shortcut key when network is not available
...
* commit 'aedd89f1d7198ac6a5a13fdbbcfbbae87b4579d4':
Disable shortcut key when network is not available
2011-01-26 00:53:43 -08:00
Tadashi G. Takaoka
5cd87e1b1c
Disable shortcut key when network is not available
...
Bug: 3345931
Change-Id: I1deef774598b8e78da4404535b6d3814464a9d2d
2011-01-26 17:07:55 +09:00
satok
2c8139d6dc
am 7fbfde52: am dc9c9790: Merge "Added voice input languages" into honeycomb
...
* commit '7fbfde523ec29035cf4d7817b34bbf73a8fc7a72':
Added voice input languages
2011-01-25 22:12:03 -08:00
satok
dc9c979074
Merge "Added voice input languages" into honeycomb
2011-01-25 22:07:13 -08:00
satok
0b0c522523
Added voice input languages
...
bug: 3382825
Change-Id: Iec031dffb86e4b05a4a718d17afe20064d14633e
2011-01-26 15:04:02 +09:00
Tadashi G. Takaoka
dc09973f36
am fb02bb8b: am 36113a38: Merge "Import new drawable assets" into honeycomb
...
* commit 'fb02bb8b965066476c75b05b5c8365e3dc559f6f':
Import new drawable assets
2011-01-25 20:59:21 -08:00
Tadashi G. Takaoka
8c1f39510e
Import new drawable assets
...
Change-Id: I0267e4e4296d127fb44d77323d7cc4eb2f63666d
2011-01-26 12:44:41 +09:00
Tadashi G. Takaoka
b3861a41b5
resolved conflicts for merge of f73d2386
to master
...
Change-Id: I3f7d3cf35e5df888e397e61acc9786972a1fda4c
2011-01-26 00:49:20 +09:00
Ken Wakasa
071bf799c7
am e16e692f: am 3b46ae53: Merge "Automatically layout mini keyboard" into honeycomb
...
* commit 'e16e692fa4cd1a52fe1e4f4ad07786fddefe7829':
Automatically layout mini keyboard
2011-01-25 07:37:54 -08:00
Ken Wakasa
6d0ff1d070
Merge "Revert "Implement callback to handle touch event outside SoftInputWindow"" into honeycomb
2011-01-25 05:42:22 -08:00
Ken Wakasa
3b46ae535f
Merge "Automatically layout mini keyboard" into honeycomb
2011-01-25 05:32:41 -08:00
Tadashi G. Takaoka
04c96ab966
Automatically layout mini keyboard
...
Bug: 2214959
Change-Id: I06370e1c9e0683666ad19454a2fb501008af95c0
2011-01-25 20:36:11 +09:00
Tadashi G. Takaoka
00eb365873
Revert "Implement callback to handle touch event outside SoftInputWindow"
...
This reverts commit de59a84029
(Ie8d4469b).
The requested feature has been implemented by I92d98bed.
Bug: 3238092
Change-Id: I9d53030b3d5c9a0f24883292a93576a3231813aa
2011-01-25 19:27:10 +09:00
Jean Chalard
788895d866
am 31569d62: am 2f4cc01e: Clarify a settings summary text.
...
* commit '31569d625278469cab965a023ecc0a331a46750d':
Clarify a settings summary text.
2011-01-25 00:40:16 -08:00
Jean Chalard
2f4cc01e61
Clarify a settings summary text.
...
Change-Id: I98ee8bbe312a1515199b9c5c56c390010e8ef616
2011-01-25 17:31:34 +09:00
satok
28fc914d93
am e64e3a71: am f8ddd13b: Removed subtype icon for each country and added subtype icon for each mode
...
* commit 'e64e3a71ffe08f2d54ff4408945f3aacbc1a192c':
Removed subtype icon for each country and added subtype icon for each mode
2011-01-24 22:34:06 -08:00
satok
f8ddd13b40
Removed subtype icon for each country and added subtype icon for each mode
...
Bug: 3286869
Change-Id: I43f151be00d2392c1816a43d37148169ff39a9f0
2011-01-25 14:43:23 +09:00
Eric Fischer
85fa405a58
Import revised translations. DO NOT MERGE
...
Change-Id: I8a8786f484918749fd679adf0ce3e952d3f483f1
2011-01-24 12:40:17 -08:00
satok
bab08331c0
Add excludeFromLastInputMethod to voice subtype
...
Bug: 3382702
Change-Id: I0a0a85a509aee9586fafe8771b44892f6bc469bc
2011-01-25 00:34:11 +09:00
Satoshi Kataoka
0dd0ea63ab
Merge "Always display the VoiceIME language in the Speak Now pop-up" into honeycomb
2011-01-24 02:59:22 -08:00
satok
85a6175f49
Merge "Set minimum height for RecognitionView in the case that there is no keyboard view loaded." into honeycomb
2011-01-24 02:58:16 -08:00
Luca Zanolin
2c5ec3a50d
Always display the VoiceIME language in the Speak Now pop-up
...
Change-Id: I1b01458aff98447b7b3d5459b765968bed5515cb
2011-01-24 10:36:15 +00:00
satok
8cacb024cf
Set minimum height for RecognitionView in the case that there is no keyboard view loaded.
...
Bug: 3352322
Change-Id: I9a7b2a745b47bdc62a96a5cd2c0d8ad717e1b406
2011-01-24 19:29:27 +09:00
Tadashi G. Takaoka
de59a84029
Implement callback to handle touch event outside SoftInputWindow
...
Bug: 3238092
Change-Id: Ie8d4469bc2c6880bdf2a0c4e4eec68bb136b837c
2011-01-24 17:34:05 +09:00
Tadashi G. Takaoka
156493cf66
Add description for auto correction threshold strings
...
Bug: 3088802
Bug: 3091970
Change-Id: I6f0cdb9ec74824497ff5f9e3a2ca5d7d29de0dd7
2011-01-24 14:51:39 +09:00
satok
251cb11f0d
Remove unused assets
...
Change-Id: Iae825b3d1c62d622db8389718359eaaa2b289fb4
2011-01-24 11:38:18 +09:00
Tadashi G. Takaoka
6ac5e2a225
New drawable assets
...
This change excludes drawable-xdpi/* and
drawable-mdpi/sym_keyboard_smiley_holo.png from designer's repo.
Change-Id: Ic8a06903ba75aa2de2d81ac159f4e37962b4da52
2011-01-24 11:10:42 +09:00
Tadashi G. Takaoka
6fe297a905
Use simple smiley for the emoticon key
...
This change uses keyLable to show simple smiley on the key top and
removes sym_keyboard_smiley_holo drawable.
Bug: 3350296
Change-Id: I7d28db8a6f74936f932f250a70991a1bd1ff4ddd
2011-01-21 15:17:09 +09:00
satok
439f2dbe1b
Change the order of subtypes list
...
Change-Id: I748ed8e8a280832c1e3170ed070c2ae22ee7d5c1
2011-01-20 02:02:56 +09:00
satok
4022a79957
Merge "Add subtype languages" into honeycomb
2011-01-19 08:17:05 -08:00
satok
be324535f6
Add subtype languages
...
Change-Id: Ib251bd63f79281a4dc1739b213b16e8a936ea319
2011-01-20 01:15:09 +09:00
Jean Chalard
89764ad4ac
Simplify text correction settings in latin IME.
...
Conditionally remove the "Quick fixes", "Bigram suggestions" and
"Usability study mode" options, depending on configuration.
When disabled, have the quick fixes and bigram option become
false if autocorrect is off, and true otherwise.
Also reorder options to bring "Auto correction" above "Show
suggestions".
bug: 3282448
Change-Id: Ib7fd928be417a816ef9e21423a531773069b7468
2011-01-19 20:08:46 +09:00
Jean Chalard
ce9c417184
Change separator titles in settings screen.
...
Add a "General" category to enclose general settings, and rename
"Word suggestion settings" to "Text correction".
bug: 3282448
Change-Id: Ie695683af0646974da82e29e11d1c3a785ef46c7
2011-01-19 19:50:14 +09:00
Jean Chalard
8b0febc6f0
Merge "Simplify latin IME settings page." into honeycomb
2011-01-18 19:08:15 -08:00
Luca Zanolin
bbd651a008
Change the UI of Voice IME to be more like Voice Search.
...
There has been a bit of refactoring in RecognitionView in particular to fix the portrait layout.
The main issues found were:
- the size of the keyboard is specified in inches, and
(cm)(inches + inches) != ((cm) inches) + ((cm) inches))
- the height of keyboard background is high as the landscape keyboard, but it higher than
the portrait keyboard. This is not an issue on LatinKeyboard, as it overwrite the
onMeasure method. However, if I use the same image background in RelativeLayout
the Relative layout height is set to the height of the background, thus higher than the keyboard
- the change configuration was not propageted correctly
Change-Id: Id5dca425826997c573ccae7a085d5ddc9719733b
2011-01-18 15:49:17 +00:00
Jean Chalard
fd7d814c81
Simplify latin IME settings page.
...
Do not show the recorrection option on xlarge terminals,
and make it true by default. Also, bring the Auto-capitalization
at the top of the settings page.
Issue: 3282448
Change-Id: I51a9ae6c7e496be2970107277f0a4ac65b12821e
2011-01-18 18:41:15 +09:00
Tadashi G. Takaoka
4e73674943
Merge "Add settings key to table keyboard" into honeycomb
2011-01-18 00:50:51 -08:00
Tadashi G. Takaoka
7ab9f601cc
Add settings key to table keyboard
...
Bug: 3351762
Change-Id: Ibee1cf42af2f53017d83034f069b19be6657acbb
2011-01-18 16:27:40 +09:00
Jean Chalard
6c381b38cc
Remove the keyboard popup option by default.
...
Add an option to mask the sound on keypress preference, and
make it false on xlarge terminals by default.
bug: 3282448
Change-Id: I747272d9edf854dc229aa620836cfa35a437d13f
2011-01-18 16:26:11 +09:00
Tadashi G. Takaoka
90a916170f
Disable suggestion strip by default for tablet
...
Bug: 3352374
Change-Id: Ic2fed4ecd6d73f6c2d0ad81061ecd266f4704b10
2011-01-17 19:59:33 +09:00
Tadashi G. Takaoka
66432cfc9b
Place language name at center of spacebar if no space icon
...
This change also leaves the language name as light grayed after fading out.
Bug: 3290290
Change-Id: I71adf80c9a3b77d2fd34bca458845d85d55cbee7
2011-01-17 17:04:53 +09:00
Tadashi G. Takaoka
5a88787e67
Merge "Add SubtypeLocale class" into honeycomb
2011-01-14 05:25:47 -08:00
Tadashi G. Takaoka
c99c0ed939
Merge "Notify keyboard language on space bar when it has changed" into honeycomb
2011-01-14 05:25:35 -08:00
Tadashi G. Takaoka
de0c8874a4
Notify keyboard language on space bar when it has changed
...
This change also introduces the following.
* space bar language switcher is enabled for phone device.
* get rid of spcae key icon from number keyboard of tablet.
* slightly lower the position of language name on space bar of tablet.
Bug: 3290290
Change-Id: I432be8f757bcc84c257770112ff1f6fa7970c584
2011-01-14 20:11:52 +09:00
Tadashi G. Takaoka
297d6619b3
Add CHAR LIMIT to string resources
...
Bug: 2988183
Bug: 3276544
Change-Id: Ib5c2c86972b1ab32468cd0ab9370ec629255c54d
2011-01-14 18:29:35 +09:00
satok
48f6ac68b7
Merge "Fix descriptions for strings. Bug: 2876541 Bug: 2988169" into honeycomb
2011-01-13 23:32:38 -08:00
Tadashi G. Takaoka
e276d8ddaa
Add SubtypeLocale class
...
Change-Id: Ic4c73c313f976ad6df1b4ddf48b914d05a08d283
2011-01-14 16:12:36 +09:00
Tadashi G. Takaoka
212368e877
Merge "Support "nm" (no mic) privateImeOptions" into honeycomb
2011-01-13 23:09:38 -08:00
Tadashi G. Takaoka
41f7fb51b0
Make input language selection settings work
...
This change also tweaks the padding of candidate strip for phone.
Change-Id: Iefe4dfeb7015e11d5b2d1566121f719d60b1377e
2011-01-14 14:21:12 +09:00
satok
543334cc21
Fix descriptions for strings.
...
Bug: 2876541
Bug: 2988169
Change-Id: I80130aa258e38f638b226448ba53a7efaeb6c3d7
2011-01-14 11:06:59 +09:00
Tadashi G. Takaoka
0f901aab36
Support "nm" (no mic) privateImeOptions
...
Bug: 3331635
Change-Id: Ide160b9317c8f7d966f879dd460640fc4f894e9b
2011-01-14 10:02:26 +09:00
Tadashi G. Takaoka
eead8c8311
Add discription for keyboard/voice subtype string resources
...
Bug: 3197096
Change-Id: I9dafcbf4d5775b3b928be54e546ac38042ece685
2011-01-13 11:52:15 +09:00
Tadashi G. Takaoka
e332d45253
Merge "Fix text color of main key labels in shifted state" into honeycomb
2011-01-11 03:56:23 -08:00
Tadashi G. Takaoka
5f35a89182
Merge "Remove stale suggestion divider drawable" into honeycomb
2011-01-11 03:51:34 -08:00
Tadashi G. Takaoka
926a110fd0
Fix text color of main key labels in shifted state
...
Bug: 3322539
Change-Id: Ib9bc54da8d3725f64c86dbe6d9700e386f74de5e
2011-01-11 20:41:40 +09:00
Tadashi G. Takaoka
7c6ffbc648
Remove stale suggestion divider drawable
...
Bug: 3329543
Change-Id: If96648bf88e1a69e01ebe00d31ddd46df1fca45c
2011-01-11 20:15:15 +09:00
satok
e72a57deae
Tweak keyboard icon
...
Change-Id: I2c802c1c0c5f7e173285656ac47e3251ff97e44d
2011-01-11 17:28:27 +09:00
Eric Fischer
7a42a46069
Merge "Import some unabbreviated translations for large screens." into honeycomb
2011-01-07 12:58:09 -08:00
Eric Fischer
f73e76de00
Mark configuration strings untranslatable.
...
Change-Id: If8a35fe33e2091bcf95cc543e76df1184d52ce2b
2011-01-07 10:42:26 -08:00
Ken Wakasa
715189fe6e
Get rid of the space bar symbol on the tablet.
...
bug: 3290290
Change-Id: I4c57151197989375e6e9f36f508e6e875f856654
2011-01-08 00:15:14 +09:00
Eric Fischer
e494e4d13e
Import some unabbreviated translations for large screens.
...
Change-Id: Ifa1c25a7b2eb40fcaaddca06e3df1a66587cd3e3
2011-01-06 18:18:22 -08:00
Tadashi G. Takaoka
f16028b92e
Remove digit popup characters from mini keyboard of tablet
...
Bug: 3321376
Change-Id: I38d963952d3c6d2cf1ad19a69b32f90191f17178
2011-01-07 01:12:15 +09:00
Tadashi G. Takaoka
cc55d947ad
Calculate mini keyboard key width from labels
...
Change-Id: I4259753bd10fdf488fcffacb6b131e30511e780f
2011-01-06 22:40:20 +09:00
Ken Wakasa
458249e703
Consolidate main dictionary files.
...
This change is a preparation for upcoming optimizations on dictionary file loading.
* We can consolidate dictionary files because we are no longer relying on Asset Manager.
* Stopping compressing dictionary files as planning to use mmap() on the region in the apk file.
* Probably we won't rely on Asset Manager. Instead we'll probably use offset and size obtained from AssetFileDescriptor.
Change-Id: Id57dce512fd3d2397a58628f8264bd824194da76
2011-01-05 11:31:58 +09:00
Tadashi G. Takaoka
05ddb9a5d2
Add config_default_keyboard_theme_id resource
...
Change-Id: Ie4e9e85694cfd43fcd1fdfeeaa477f13c372a8a6
2010-12-28 21:06:45 +09:00
Tadashi G. Takaoka
bfe2b53445
Import new drawable assets
...
Change-Id: Ie74bd49921cca4aee69f9e7bfc8ef93e13d3c4d9
2010-12-24 11:26:26 +09:00
Eric Fischer
9cfb874f7f
Import revised translations.
...
Change-Id: I3d92d46d7683c07e455ba15c0befee9199a442bc
2010-12-23 14:37:28 -08:00
Tadashi G. Takaoka
363cd6ef0f
Make dismissing keyboard by swiping down as configurable
...
Bug: 3306370
Change-Id: If4e258ce4db05fb75dcd3b23fefa422c1287955b
2010-12-23 12:44:40 +09:00
Tadashi G. Takaoka
baf83886be
Filter out too short noisy touch events
...
Bug: 3294017
Change-Id: I1769eab1d096d16bfa9d6f23b973483ee6e7a478
2010-12-21 23:46:15 +09:00
Tadashi G. Takaoka
c4f71668d7
Remove multi-tap feature
...
Change-Id: Ife44b3f9d420d77d2cfb51044a8356f02ed63e8b
2010-12-20 21:58:31 +09:00
Tadashi G. Takaoka
67a4ecacc7
Disallow sliding key input
...
This feature is configurable by R.bool.config_sliding_key_input_enabled.
Bug: 3294076
Change-Id: I0225a6ce19d9b911c9d9543a106ab57ee0b7de75
2010-12-18 20:41:53 +09:00
Tadashi G. Takaoka
c59009648c
Add description and CHAR LIMIT to string resources
...
Bug: 3290252
Change-Id: I1978e132de0280bec5c90bd14d9f4823d742bada
2010-12-17 17:40:04 +09:00
Tadashi G. Takaoka
f0ab0b4e86
Merge "Add popupKeyboardTemplate attribute to Keyboard"
2010-12-17 00:21:51 -08:00
Tadashi G. Takaoka
9b6d1d52d9
Add popupKeyboardTemplate attribute to Keyboard
...
This change
- introduces the popupKeyboardTemplate attribute of Keyboard to
specify XML Keyboard file for popup mini keyboard.
- introduces the maxPopupKeyboardColumn attribute of Keyboard to
specify the maximum column of popup mini keyboard.
- changes the content format of the popupCharacters attribute of Key.
It now represents keyLabel, codes and keyTextOutput of each key of
popup mini keyboard using CSV format.
Bug: 2214959
Change-Id: I539e310f7e38a049ee193de0b4ad5d7afdce37b1
2010-12-17 17:18:28 +09:00
Tadashi G. Takaoka
7dc190f6a1
Updated contrast in keys
...
This change also makes the keyboard top gutter slightly taller.
Bug: 3293748
Change-Id: I574a2fea6440c7ad78f8ef51c87b221838b6df13
2010-12-17 16:56:49 +09:00
Ken Wakasa
014f4883c7
Merge "Revise language string size on spacebar"
2010-12-16 00:50:42 -08:00
Tadashi G. Takaoka
a8baf5701f
Merge "Tweak base line of key top letter"
2010-12-16 00:22:23 -08:00
satok
24e1f28f25
Changed Icon for a US English keyboard subtype temporary
...
Change-Id: I422b9a1c055177c35e4dd9564b408179cf82f21e
2010-12-16 16:58:00 +09:00
Ken Wakasa
183fbbb0db
Revise language string size on spacebar
...
bug: 3290290
Change-Id: I09694392d7fa447796c56a1f74b5b719ca28e466
2010-12-16 16:53:02 +09:00
Tadashi G. Takaoka
98935836f0
Tweak base line of key top letter
...
Bug: 3285380
Change-Id: Idf6b9b7e000d87df924742634188d193f948130f
2010-12-16 16:07:40 +09:00
Tadashi G. Takaoka
160d2ec445
Merge "Update suggestion strip drawables"
2010-12-15 22:56:31 -08:00
Ken Wakasa
5cc2416c6a
Update the spacebar visual.
...
bug: 3290290
Change-Id: I7f48911bf75e1a54b74e500d5d9603e1015b51ae
2010-12-16 12:42:38 +09:00
Tadashi G. Takaoka
e9311bc893
Update suggestion strip drawables
...
Bug: 3286297
Change-Id: I51d4051ea22c465f81852e4fb98e48bad9cf57f1
2010-12-16 12:38:43 +09:00
Eric Fischer
68b6932024
Import revised translations.
...
Change-Id: I65a87452bbd35b850def20bc37eedf3698f4e931
2010-12-14 13:59:57 -08:00
Tadashi G. Takaoka
9cb9f33f0c
Merge "Make "Tab" and "ALT" and "123" as donottranslate resources"
2010-12-13 22:55:48 -08:00
Tadashi G. Takaoka
246acc5033
Make "Tab" and "ALT" and "123" as donottranslate resources
...
Bug: 3273889
Change-Id: I1bd47ffbc7bc92d66d421c5f2787acf14e08e0f7
2010-12-14 15:33:24 +09:00
Justin Ho
1a878ffe1f
Merge "Integrating updated LatinIME keyboard assets"
2010-12-13 09:10:59 -08:00
Tadashi G. Takaoka
a893ac38f5
Merge "Tune padding of candidate word"
2010-12-13 01:01:54 -08:00
Tadashi G. Takaoka
4700a6f2b0
Tune padding of candidate word
...
Change-Id: I980e568f9b4b87b0f414aa7ce0197dba39a7708f
2010-12-13 17:46:11 +09:00
satok
7f1d3fa5d8
Remove language settings from preference activity
...
Bug: 3268561
Change-Id: Ia910f0a090dc66c7dd9176999930d8cb763203b0
2010-12-13 15:27:33 +09:00