Commit Graph

1010 Commits (e0df0fe957fee721365ab371d67206c1f90ecf24)

Author SHA1 Message Date
Tadashi G. Takaoka c0007568d9 Merge "Key release event should be sent when finger sliding" 2010-12-01 02:35:17 -08:00
satok d4952c8fe9 Move a logic for finding words with a missing character to the native code.
Change-Id: I58338643830ff4f9708f78a9c26f75c8bf2ebf45
2010-12-01 19:26:36 +09:00
Tadashi G. Takaoka bd20db25be Merge "Tweak tablet keyboard design" 2010-12-01 02:07:26 -08:00
Tadashi G. Takaoka 5d04042663 Tweak tablet keyboard design
This change introduces,
- center align "More" key label
- remove drop shadow from key label
- darker key label color when manual temporary upper case
- narrower pop up mini keyboard
- remove unnecessary key background from pop up mini keyboard
- smaller key label in portrait

Bug: 3216592
Change-Id: I77e0733f467a88aa32e09fcbace56fe08f755229
2010-12-01 18:51:38 +09:00
Tadashi G. Takaoka c0b5c9c43e Key release event should be sent when finger sliding
This change is cherry-pick I1a020e3d from Gingerbread-MR

Bug: 3132881
Change-Id: I885eab7744369dfb841f9b34d210b6c2aef8f19a
2010-12-01 15:12:08 +09:00
Ken Wakasa 80e459f8c9 Update the voice input warning dialog message string.
Updated the relevant settings menu as well.

bug: 3194809

Change-Id: Ibcd00fcf32f82b7733da155ef6e15e389d53c645
2010-12-01 14:14:47 +09:00
Justin Ho c205237314 Merge "Integrating updated LatinIME assets" 2010-11-30 18:17:21 -08:00
Tadashi G. Takaoka 98cdfe643e Merge "Fix subtype icons in method.xml" 2010-11-30 18:12:39 -08:00
Tadashi G. Takaoka 6b1e5fd260 Fix subtype icons in method.xml
Change-Id: I1b157254483446e86d577cdc010b92761754dbb7
2010-12-01 11:09:53 +09:00
Tadashi G. Takaoka ab2a1e213d Merge "Fix ".com" output of tablet keyboard" 2010-11-30 17:35:50 -08:00
Tadashi G. Takaoka 842b3d4115 Support de,fr locale keyboard layouts for tablet
This change introduces,
- support de QWERTZ
- support fr AZERTY
- support fr_CA QWERTY layout
- support fr_CH QWERTZ layout
- refactor some common keyboard row layouts

Bug: 2334086
Change-Id: I3e01e841e0dc72419d55e29d426bdec70655459c
2010-12-01 10:17:16 +09:00
Justin Ho be5f09f098 Integrating updated LatinIME assets
Change-Id: I232f874c6dd8f60bd0634111e2f7fc60b6082c14
2010-11-30 16:44:55 -08:00
Tadashi G. Takaoka 4ee6dc884f Fix ".com" output of tablet keyboard
Bug: 3241174
Change-Id: I6e40d6623890b7bbbd91175649b1f28b4f327621
2010-12-01 09:38:58 +09:00
Justin Ho b30fa723f0 Adding drawable-land-hdpi into LatinIME
Change-Id: I21c4223151b89da9c4edd423fdb1bb7bee023ce1
2010-11-30 11:41:12 -08:00
satok dc2a41ff4e Add icons for each subtype
Change-Id: I0a86a781e3b30a8355ccc8083f3ac66af84a05b7
2010-11-30 14:17:01 +09:00
satok 965004fbe9 Remove excessive call of onKeyboardLanguageChanged in SubtypeSwitcher
Change-Id: I8f85f9b053a70b8ad1755e4f343ac06ecd9e103b
2010-11-30 11:10:50 +09:00
Tadashi G. Takaoka d20208361b Merge "Remove unused string for key label" 2010-11-29 17:51:34 -08:00
Tadashi G. Takaoka 0ff78a1bae Remove unused string for key label
Bug: 3230041
Change-Id: I1c3cc78157f30f43a5b4a32e413fb43df1db4907
2010-11-30 09:51:12 +09:00
Justin Ho e92ab0569e Merge "Integrating updated LatinIME keyboard assets" 2010-11-29 16:16:29 -08:00
Justin Ho 8fb22a5d97 Integrating updated LatinIME keyboard assets
Change-Id: I5bc137892ea82e08d5b65e1e124f0de69d0a77c5
2010-11-29 15:25:55 -08:00
Eric Fischer d5da121471 Import revised translations.
Change-Id: I0cabf9fceb714a9ffd5180f9d9a0234ec92e5f71
2010-11-29 15:18:20 -08:00
Tadashi G. Takaoka f2d7c4599e Merge "Remove unused bool configuartion value" 2010-11-29 03:51:45 -08:00
Tadashi G. Takaoka 0e7c31febb Remove unused bool configuartion value
This change is follow up of Ie5494601.

Change-Id: I20911479e2942695384200e2cc732abfed7bd140
2010-11-29 18:30:08 +09:00
Tadashi G. Takaoka fa086c9076 Cleanup unused Java import
This change also fixes wrong file mode.

Change-Id: Ifcf4c9444ddcdc62d2e4b394891d6eee135c1e8f
2010-11-29 17:57:48 +09:00
Ken Wakasa 27d13713bb Preload SharedPreferences at start.
bug: 3207554
Change-Id: I84072461aee9675cc67897de03f89e9c0036bc1f
2010-11-26 18:48:04 +09:00
Tadashi G. Takaoka 7f0befe1f0 Update tablet keyboard layout to the latest design
This change introduces shiftedIcon attribute for Key which specifies
icon to draw the shift key while the key is in shifted state.

This change also intriduces new configurable dimension value
key_label_horizontal_alignment_padding which represents horizontal
padding for left or right alignment of key label.

Bug: 3216592
Bug: 3201839
Change-Id: I3aa7392227ce573c404517678e6340a8d1fcb328
2010-11-25 00:11:21 -08:00
satok 79efbed76f Call showInputMethodPicker instead of showInputMethodSubtypePicker
- because showInputMethodSubtypePicker will be removed.

Change-Id: I255f9bbff77de24ce067f35ee101d368e36edd45
2010-11-25 14:09:50 +09:00
satok 1fb28137f4 Fix a bug at showing warning dialog at the first time when IME is trigerred in voice mode
bug: 3226268

Change-Id: Ife7c752ad309ef796d9b7cc32517f00c2bb2af34
2010-11-24 20:53:57 +09:00
Tadashi G. Takaoka 2c60d6e28e Support dedicated number/date keyboard layout
Bug: 3009716
Change-Id: Idc12cc9d8ee4f5febfae4e11712e2aaca327a6ea
2010-11-24 00:16:00 -08:00
Tadashi G. Takaoka 6624fd8736 Support imeOptions condition in <case>
Change-Id: Ie5494601efb29cf65363c4aa3bf5a9ab04a0109a
2010-11-23 23:13:39 -08:00
Tadashi G. Takaoka 59c9930ca9 Support colorScheme <case/> condition in Keyboard XML
Change-Id: Ibbfb99e0e2b15df301f83af6739b7bca01ebf490
2010-11-23 18:07:27 -08:00
Tadashi G. Takaoka a963d0b2e4 Merge "Fix odd "more" key behavior on tablet phone number keyboard" 2010-11-23 15:59:10 -08:00
satok da64719c6d Merge "Enabled to change the current subtype to voice input subtypes" 2010-11-23 13:35:20 -08:00
Tadashi G. Takaoka 90ebff1323 Add "@" key to email mode tablet keyboard layout
Bug: 3222319
Change-Id: Ibc56cd69c30aee19f26fe11e7ea176ff01e21dbe
2010-11-23 13:30:14 -08:00
Tadashi G. Takaoka 4b8bbbadac Fix odd "more" key behavior on tablet phone number keyboard
Bug: 3176540
Change-Id: Iaa1f3776d5ac236b2655910ede7522ceac36a9a1
2010-11-23 09:52:59 -08:00
satok 8e09172df1 Enabled to change the current subtype to voice input subtypes
bug: 3201828

Change-Id: I4450cbc8ba8829060d702564889c735f1326cf23
2010-11-23 20:20:50 +09:00
Tadashi G. Takaoka a444889403 Merge "Use normal font for functional key label instead of italic font" 2010-11-23 01:01:43 -08:00
Tadashi G. Takaoka fab243a183 Use normal font for functional key label instead of italic font
This change also uses slightly larger font size for functional key
label according to the v4 keyboard design.

Bug: 3216592
Change-Id: I027f109b7748ade8564dc808487d9a6ce1da9761
2010-11-23 00:38:09 -08:00
Tadashi G. Takaoka cc359dddb3 Merge "Fix caps lock release in non-distinct multi touch device" 2010-11-22 22:54:34 -08:00
Tadashi G. Takaoka 0d0a46da03 Fix caps lock release in non-distinct multi touch device
Bug: 3221869
Change-Id: I7c5d407c465f22945cba37e42683345913b43acc
2010-11-22 22:41:17 -08:00
Tadashi G. Takaoka 0b60f83192 Support <key-style/> and keyStyle attribute for Keyboard XML
Change-Id: Ie052e989d0180eecfc8c244ba6c60594a46103d1
2010-11-22 18:33:47 -08:00
satok 4092205833 Refactor to move voice functionarities in LatinIME to VoiceIMEConnector
Change-Id: I593a8187d48338c9c0e7d75c73c2dbfc32400335
2010-11-23 10:32:12 +09:00
Tadashi G. Takaoka 04448c2978 Make F1 and Symbol keys static in XML file
Change-Id: If869f5ad4fe8f192f89a8679a4abde99a25e02e6
2010-11-21 03:00:53 -08:00
Tadashi G. Takaoka 7c25ad473f Update tablet keyboard layout to version 4
Bug: 3216592
Change-Id: I9950292184d9d0e131f76498067b0a6cb462a0ab
2010-11-21 02:13:30 -08:00
Tadashi G. Takaoka cd39f2adee Add keyLabelAlign attribute to Keyboard XML
Bug: 3216592
Change-Id: I88f8055199f2cd0525faf9374114fbebba53b951
2010-11-20 18:48:55 -08:00
Tadashi G. Takaoka 45911256fd Perform editor action IME_ACTION_NEXT/PREVIOUS by tab key
Bug: 3122995
Change-Id: I44280fe1c6cc27f429b311edec71e1027178222d
2010-11-19 21:36:37 -08:00
Tadashi G. Takaoka 07f903afba Merge "Fix automatic temporary upper case mode behaviour" 2010-11-19 17:21:55 -08:00
Tadashi G. Takaoka 6769c67987 Fix automatic temporary upper case mode behaviour
This change is a followup of I948ef26f

Automatic Temporary Upper Case mode acts like Normal mode until shift
key is pressed. However, after shift key is pressed, it acts like
Manual Temporary Upper Case mode.

Bug: 3193390
Change-Id: Id3d7a38a1f5905322cd46ded36b1db26576d49af
2010-11-19 16:51:50 -08:00
satok 3757d16083 Merge "Open settings of input method subtype enabler when users are trying to change language." 2010-11-19 16:37:11 -08:00
satok b6c1255f2d Open settings of input method subtype enabler when users are trying to change language.
Change-Id: Id13926a87d43a3972f2a57128379c17b70b50da2
2010-11-20 09:35:05 +09:00
Tadashi G. Takaoka 1d8196cd41 Use "flag" feature of attr.xml to represent keyboard mode
Change-Id: Ibc317ada5167a119477fe8ea2994df6c6462afd0
2010-11-19 14:57:24 -08:00
Tadashi G. Takaoka 75fde64890 Cleanup drawable-xlarge resources into drawable-mdpi
Change-Id: I2db335a601ddb0062a637a71289e14cf1d375a1e
2010-11-19 01:37:38 -08:00
Tadashi G. Takaoka f27364600c Implement both automatic and manual temporary upper cases
With this change,
- Shift and Shift lock state of keyboard is maintained by
  LatinKeyboard.ShiftState.
- Shift key state is maintained by ShiftKeyState object in
  KeyboardSwitcher.
- LatinIME informs KeyboardSwitcher that shift key press, release and
  long press and KeyboardSwitcher determines which state LatinKeyboard
  and ShiftLeyState should be.

Bug: 3193390
Change-Id: I948ef26fda512eb1cb0ebddc89d322c4f4f4d670
2010-11-18 19:32:59 -08:00
satok 1d2d3228a3 Merge "Add a functionarity to handle Subtype" 2010-11-18 18:10:25 -08:00
Eric Fischer 636eaf3ff3 Merge "Import initial translations for 20 new locales." 2010-11-18 17:15:56 -08:00
satok 4ab730dbd3 Add a functionarity to handle Subtype
Change-Id: Ic6055ba218b64f4276e3db99a435f546c3990ee5
2010-11-19 08:30:02 +09:00
Ken Wakasa 95a5daa3e3 Merge "Avoid disk writes on UI thread." 2010-11-18 12:46:58 -08:00
Ken Wakasa 11eb13e04f Avoid disk writes on UI thread.
bug: 3207554
Change-Id: I285691f9e94d989823fcb5c21615ca50cecddff6
2010-11-19 05:38:18 +09:00
satok 279da1da91 Hide space bar preview when space bar switcher is disabled.
Change-Id: I469197a4b3f55335eaee104177f0970cc904bb34
2010-11-18 20:50:37 +09:00
Eric Fischer 0dec431f18 Import initial translations for 20 new locales.
Change-Id: I7bd8f9596ebc2922c63717a63cef7cfdf68c919e
2010-11-17 16:43:50 -08:00
satok 3b776b7892 Move functions in LatinKeyboard related to LanguageSwitcher to SubtypeSwitcher
Change-Id: I777db896bd0287931ce7c810b080ccee1121d34e
2010-11-18 08:35:26 +09:00
satok 0ed7191b4d Move functions related to LanguageSwitcher to LatinIMESubtypeSwitcher
Change-Id: I5fa306cf311063ff96b6d45faaca2ffe84cddbf9
2010-11-18 06:58:49 +09:00
Eric Fischer 3a4d9b420f Import revised translations.
Change-Id: If29e9f29b1500c92989c1d224ebd4eaa69e3737a
2010-11-17 11:41:41 -08:00
Ken Wakasa 378a1b516d Stop highlighting in suggestion strip after auto-completion cancellation
Follow up change to I2185fcf6

bug: 2847211
Change-Id: I7874bc8400e5a7613bfbae83b790ea6192d287b3
2010-11-17 16:40:48 +09:00
Tadashi G. Takaoka b643dab73a Refactor KeyboardSwitcher and LatinIME
Bug: 3193390
Change-Id: Id894c9bc574a53966d9efc419ab398bae89c34c1
2010-11-16 23:06:37 -08:00
Tadashi G. Takaoka 10227a71a0 Implement temporary upper case hint icon
This change partially implements the requested feature. The following
are not supported yet.
- Non-letter key handling on automatic temporary upper case layout.
- Non-letter key handling on shift chording in caps lock layout.
- Hint icons for manual temporary upper case layout are not final ones.

Bug: 3193390

Change-Id: I636da99d1be05b1337935d87c6f4d140661e1cc8
2010-11-16 13:45:49 -08:00
Ken Wakasa c1e2e827b5 Canceled auto-completion shouldn't be re-auto-completed
bug: 2847211
Change-Id: I2185fcf6b798a41135c329485914bc035fad5119
2010-11-16 19:18:05 +09:00
Tadashi G. Takaoka 889691eca1 Refactor shift key state into KeyboardSwitcher
Change-Id: If484d3d7e7a0794ee7fc88f0771229d6f90db466
2010-11-16 01:47:39 -08:00
Tadashi G. Takaoka d7641636db Refactor UI Handler of LatinIME
Change-Id: Iabae338c32969997cb3c7f612c2e5a6999420e28
2010-11-16 01:37:19 -08:00
Tadashi G. Takaoka 89cfd23f34 Merge "Refactor symbol key state into KeyboardSwitcher" 2010-11-16 01:17:26 -08:00
Tadashi G. Takaoka 6c92ee127d Refactor symbol key state into KeyboardSwitcher
Change-Id: Idce4e9bf070b08b8a930fd8e800df9c4d8829f8f
2010-11-16 01:15:16 -08:00
satok af41759729 Add functions for usability logging
Change-Id: I9b66bde1b5ae76742cb685bbc558ce9570dca50a
2010-11-16 18:03:28 +09:00
satok eb5689ed8d Merge "Add a logging functionarity for usability study." 2010-11-16 00:21:10 -08:00
satok 18e9a7c6fb Add a logging functionarity for usability study.
Bug: 3193879

- Log char input

Change-Id: I5c1568f81012743b7068d423baa99b0f9d1653f8
2010-11-16 17:15:37 +09:00
Tadashi G. Takaoka e3f0ca3848 Merge "Fix tablet url mode keyboard layout" 2010-11-15 23:45:48 -08:00
Tadashi G. Takaoka cf5e68b862 Fix tablet url mode keyboard layout
This is follow up change of I0d92e513757e765d9de98561205754af5a143650

Change-Id: Ibfe8835bb184636e5fb06473cc864852b573fbd4
2010-11-15 23:19:57 -08:00
satok 95175d488b Add an option for the userbility study mode
Change-Id: If41ddfa933f8ade58afa03acbd9536e0477baae8
2010-11-16 07:55:50 +09:00
satok 7599cfea4a Add showing suggestion only on portrait mode and fixing the state of suggestion strip
Change-Id: I7babd1400a3516c87506a3ea4bd46ddaf89e19b4
2010-11-16 07:30:08 +09:00
Tadashi G. Takaoka 71c353aa87 Refactor Tutorial class
Change-Id: Ib8dbcf8f36966988fb0d4efdc6bdb7e30b776a68
2010-11-13 01:49:29 -08:00
Tadashi G. Takaoka 1679432d1c Get rid of the reference to LatinKeyboard from LatinIME
Change-Id: I94286ecec0aa8dbfdfaa74d3a76b744c4a250370
2010-11-13 01:45:12 -08:00
Ken Wakasa 3009310283 Partially revert I63ad561c
This is required to make cancellations of auto-corrections/completions work.

Change-Id: I091fb9946d4642847fde39d86a6b3b09735e93a8
2010-11-13 15:16:43 +09:00
Tadashi G. Takaoka d98c20b036 Fix NPE that is caused by null EditorInfo
Bug: 3192772
Change-Id: Ia057d29e070ccbb90ee60df1e141de14de95f820
2010-11-12 15:26:54 -08:00
Tadashi G. Takaoka 6a567370ce Merge "Add more symbol characters to popup mini-keyboard" 2010-11-12 14:41:43 -08:00
Tadashi G. Takaoka b0465116bd Keyboard XML supports switch-case-default tags to select rows and keys
Change-Id: I0d92e513757e765d9de98561205754af5a143650
2010-11-12 14:30:25 -08:00
Tadashi G. Takaoka f12023c7fb Add more symbol characters to popup mini-keyboard
Bug: 3124752
Change-Id: I6b6f5bfd57a58db7273c4db461095413892552ae
2010-11-12 14:26:38 -08:00
Tadashi G. Takaoka 8b00bc4f32 Rename KeyboardSwitcher.setKeyboardMode to loadKeyboard
This change also eliminates KeyboardSwitcher.refreshKeyboardCache,
LatinIME.reloadKeyboards() and LanguageSwicther.getLocales().

Change-Id: I5fd4914660ea1c955ddfa0ca62b920f9bcd53e1b
2010-11-11 15:44:50 -08:00
Ken Wakasa 4174655e23 Check the system vibrator availability for the "Vibrate on keypress" preference.
bug: 3021001
Change-Id: I7843a3e4765333c720fd8f258c1fffdf6f090d3a
2010-11-11 19:15:34 +09:00
satok ca26f20fa4 Fix states for showing PunctuationList and correction
- Fixed the visibility of the suggestion strip

Change-Id: I63ad561c71464657521661dbd25c72dd34841834
2010-11-11 17:37:11 +09:00
Tadashi G. Takaoka 48bc6b158b Refactor KeyboardSwitch.KeyboardId class
This change defers determining which keyboard should be loaded and
holds the information in KeyboardId object as much as possible.  At
keyboard loading time, the determination deferred will be made
depending on the information of KeyboardId.

Change-Id: Ice2455d9e5b21671a250c342c06c043e4baa5355
2010-11-10 21:26:53 -08:00
Tadashi G. Takaoka 507495efd5 Refactor to remove KeyboardSwitcher.setVoiceMode
This change also renames KeyboardSwitcher.makeKeyboards to
refreshKeyboardCache.

Change-Id: I76897562d5876a53364dc378e7800ab92fb2a37b
2010-11-10 21:16:47 -08:00
Tadashi G. Takaoka 02d7bdead6 Merge "Should cancel both normal and shift long press timers" 2010-11-10 15:31:24 -08:00
Tadashi G. Takaoka 8aaab7c286 Should cancel both normal and shift long press timers
Bug: 3132881

Change-Id: Ib89e2efa4e68e7d57ac1123df2ec6241f1b902d1
2010-11-10 15:27:24 -08:00
Tadashi G. Takaoka 3e99aa0f71 Slightly shorten tablet keyboard height
Now key top height is slightly shorter 13.0mm compared to previous 14.0mm.

Bug: 3181068
Change-Id: Ib6f9cfb9269020166e5037467d18133d342d47ec
2010-11-10 15:03:46 -08:00
Tadashi G. Takaoka f8e30a9153 Refactor calling KeyboardSwitcher.setKeyboardMode
This change also eliminates unnecessary recursive call in
KeyboardSwitcher.setKeyboardMode.

Change-Id: Iff25fe23b34227d526dee0bbe8710842545c2afa
2010-11-08 23:50:27 -08:00
Tadashi G. Takaoka e302b19ddd New xlarge keyboard layout (v2)
Bug: 3109804
Change-Id: I1afd022d553785acd50b3104374bbec291206c1e
2010-11-09 11:07:48 +09:00
Tadashi G. Takaoka 59b7bd0730 Using distance to the edge of key as proximity detection
Because there may be very long key, such as space bar on tablet, we
should not use the distance between the touch point and the center of
key as proximity detection.  Instead of that, this change uses the
distance between the point and the nearest edge of key as proximity
detection.

Also this change fixes the bug that space key (code 32) was not
counted in proximity detection.

Bug: 3164020
Bug: 3168138
Change-Id: I687f1ce94a8e944c3f6eea0fe00e18ed6e68e278
2010-11-06 01:10:55 +09:00
Tadashi Takaoka 68864723cf Rename LatinKeyboardBaseView class to KeyboardBaseView
Change-Id: I496ecbfa7d398583d01f821398f49f75d17311d8
2010-11-05 18:36:19 +09:00
satok 38976d5b96 Add labels for subtypes
- Also changed mode name
- Move the position of a subtype for "US Keyboard" to the top

Change-Id: I4dd7f869801d5efa775fe8a89dde233215f508d9
2010-11-05 11:44:31 +09:00
Leon Scroggins 47f795dc87 Treat the new web fields like their corresponding variations.
Bug:2692655
Bug:2460543

Change-Id: I86e814902447ecd5c8b00e399a0143d3dc2ad2cf
2010-11-04 11:27:55 -04:00
Tadashi G. Takaoka 9d34f2c72e Merge "Add [CHAR LIMIT] to some strings for key top" 2010-11-04 03:09:09 -07:00
Tadashi G. Takaoka 03728d6d0f Add [CHAR LIMIT] to some strings for key top
Bug: 3147476
Change-Id: Ic3d898761b6953560dfec34813e96eddab351675
2010-11-04 17:22:30 +09:00
satok 5890ae11f1 Merge "Updated icons for the input method subtype" 2010-11-03 23:09:40 -07:00
satok 3b075346b1 Updated icons for the input method subtype
Change-Id: Ib92666357a6921cb7e068c63353b8b3d997c80b2
2010-11-02 23:11:42 +09:00
satok e8fba33c9c Merge "Change the size of preview for priventing preview from being clipped" 2010-11-02 03:44:15 -07:00
Ken Wakasa 17fcd719de Make sure there are no modes with settings key on tablet.
Follow-up change to I73b8a502

bug: 3095814
Change-Id: I79bb05c61dc73b036331e17d02c791f08a0168fc
2010-11-02 19:33:27 +09:00
satok fe05848e50 Change the size of preview for priventing preview from being clipped
Change-Id: I6f9fb2c8c0e98ede14729e7cb602bfb4b2672159
2010-11-02 19:29:41 +09:00
satok e0035f7c1f Merge "Adjust the gap of keys on a tablet layout" 2010-11-02 00:12:20 -07:00
satok 6936edbfcd Adjust the gap of keys on a tablet layout
Bug: 3155782

Change-Id: Icefe654874e58ee2fcbeab353690bfe15f54ab61
2010-11-02 15:06:37 +09:00
Ken Wakasa 200ece7907 Capitalization for "Quick Fixes" words doesn't work
bug: 3151706
Change-Id: I7770a1d26edb1ea72ee93396181953a724dcc4bf
2010-11-01 20:25:07 +09:00
Ken Wakasa 2a952e9b7e am b5e8c779: am 69db35c4: Make the buttons work for edge pixels of the keyboard
* commit 'b5e8c7799726a5975283fa138ad2870ab02d01a4':
  Make the buttons work for edge pixels of the keyboard
2010-10-29 08:28:28 -07:00
Ken Wakasa c1fe5bf19d Merge "Get rid of number hints on Stingray" 2010-10-29 04:17:24 -07:00
Ken Wakasa 89e841c85b Get rid of number hints on Stingray
bug: 3145786
Change-Id: Ifc2dcdb06d7a056b38ad574c65ef7fcbddcbb6aa
2010-10-29 20:14:10 +09:00
Ken Wakasa e6d171ab0b Add vertical correction for Stingray
bug: 3145773
Change-Id: I3ac1953b00367d3bf487a4186afe4150b039b05b
2010-10-29 20:01:26 +09:00
Ken Wakasa 69db35c493 Make the buttons work for edge pixels of the keyboard
Follow-up change to If7630b89

bug: 3142416
Change-Id: I2660e3d688eb0490363e460d5b4944c89b8ca35c
2010-10-29 19:24:08 +09:00
satok dd8c4c0068 Merge "Increased the size of GRID in Keyboard" 2010-10-29 03:01:32 -07:00
satok 74103ee1b9 Increased the size of GRID in Keyboard
Bug: 3122894

- Changed width 10 -> 32
- Changed height 5 -> 16

Change-Id: I07354cf5c942974cc25a5e043f41e0f13a09351b
2010-10-29 18:50:18 +09:00
Ken Wakasa 37a0f2d5de am e32a77c6: am 9dce586e: Bugfix: IME gives haptic feedback when button wasn\'t pressed
* commit 'e32a77c691567bdb3031d877e80786508bd47e4a':
  Bugfix: IME gives haptic feedback when button wasn't pressed
2010-10-28 11:38:38 -07:00
Ken Wakasa 9dce586eaa Bugfix: IME gives haptic feedback when button wasn't pressed
bug: 3142416
Change-Id: If7630b89d6c2a8ec38e191c263c03f8f11d3c498
2010-10-29 03:15:02 +09:00
Eric Fischer 566c45eddf Import revised translations.
Change-Id: If1dd926a84f861cdf8bbd24bad264a8a6facbde3
2010-10-27 14:37:12 -07:00
Ken Wakasa fd0bd57deb Change suggestion update delay from 100ms to 180ms to avoid flashy suggestion strip with quick multi-finger typing.
bug: 3122641
Change-Id: I385f9eb2e392487d7b4c252553d1f8d7c21da2e4
2010-10-27 18:05:27 +09:00
Ken Wakasa 8493603be7 Merge "Remove auto capitalization by Shift+puncs" 2010-10-26 22:16:24 -07:00
Ken Wakasa 8252de1a60 Remove auto capitalization by Shift+puncs
bug: 3133312
Change-Id: I12a05d9028ab2fad07e1819407d63cf8ffd4d30c
2010-10-27 14:10:36 +09:00
satok 832ebbec14 Merge "Update assets for LatinIME" 2010-10-26 20:31:45 -07:00
satok 3739770095 Update assets for LatinIME
Bug: 3109804

Change-Id: I07b5b0ff32228a6d10b92575f916b058e4ac26b7
2010-10-27 12:03:07 +09:00
Ken Wakasa 276845c7a9 Follow-up change to revise Caps Lock sequence.
bug: 3122877
Change-Id: I44c539d7c041443f3ad027de4b75a67adf6b2c87
2010-10-26 20:00:21 +09:00
Ken Wakasa eec7bb9386 Get rid of mCapsLock in LatinIME.java
Change-Id: I9c6387ee387d53460d23a12225829da344674579
2010-10-25 23:34:47 +09:00
Ken Wakasa 29ff343f77 Remove LatinKeyboardBaseView.isShifted() and setShifted() for refactoring
Change-Id: I9a1106b679a9ffb3ae959d90377eef096e5af842
2010-10-25 19:55:06 +09:00
Ken Wakasa 55952c9868 Merge "Get rid of references to BaseKeyboard in Latin-specific classes" 2010-10-25 02:08:31 -07:00
Ken Wakasa 0ce98cbf98 Get rid of references to BaseKeyboard in Latin-specific classes
Change-Id: I6871a24967b1410bdb14e902bdd311ef82fd4f0b
2010-10-25 18:04:01 +09:00
satok e767595da5 Add an icon for US keyboard subtype
- TODO: add other icons

Change-Id: Ie958b9d59bb33bd6dbfc78a403bfda022bfaf790
2010-10-25 16:58:30 +09:00
Tadashi G. Takaoka 4189eb2308 Revise caps lock sequences
This change also fixes that the popup preview of ALT on symbol
keyboard is not showing.

Bug: 3122877
Bug: 3127255
Change-Id: I978cb30a0d05298274d8ab6541b91323a0fef211
2010-10-25 00:03:46 +09:00
Eric Fischer 1f2113b27d Import revised translations. DO NOT MERGE
Change-Id: I5227017b4859c24d1c6e873443741e881648371a
2010-10-22 15:31:52 -07:00
Tadashi G. Takaoka 71cc4ef673 Merge "Tablet keyboard should always show "?123" as symbol key" 2010-10-22 10:53:44 -07:00
Tadashi G. Takaoka 36af0880c3 Tablet keyboard should always show "?123" as symbol key
Bug: 3118554
Change-Id: Ib609799f28dee56a4ded2e8144ac4a0c0d113ad6
2010-10-22 23:59:21 +09:00
Tadashi G. Takaoka 0b1cb2d039 Refactor BaseKeyboardParser as Recursive Descendent Parser
Bug: 3082538
Change-Id: Ic0d72c6fe08cfc20db86aeffb10a27efe678095e
2010-10-22 21:58:45 +09:00
Tadashi G. Takaoka d0ed8ec933 Merge "Make mini-keyboard narrower on tablet landscape mode" 2010-10-22 03:34:59 -07:00
Tadashi G. Takaoka 1397cbab76 Make mini-keyboard narrower on tablet landscape mode
This change narrows mini-keyboard key width from 7.5% to 5.0%
of the screen width.

Bug: 3122769
Change-Id: I4ae0e79262ec3fadab8f86aa57a8a6cec5cb4670
2010-10-22 18:42:26 +09:00
Tadashi G. Takaoka 4f6060b8b7 Table keyboard should always show return icon on enter key
Bug: 3122750
Change-Id: I75d2b5adff3a349d29d8a56e7b761c26b04683c0
2010-10-22 18:27:59 +09:00
Tadashi G. Takaoka 503797ae0e Make "show settings key option" dependent to device configuration
Bug: 3095814
Change-Id: I73b8a5023b398621a910c953eade252dc6412923
2010-10-22 17:04:14 +09:00
Tadashi G. Takaoka 41338e6c32 Move BaseKeyboardParser to top-level class
Bug: 3082538
Change-Id: If0ddf32bc3811e3c65a7a96503c61ed3351eeb66
2010-10-21 19:38:31 +09:00
Tadashi G. Takaoka bf77bb7678 Refactor BaseKeyboard parsing code
Change-Id: I241125b5b15c9d6bbba456476f1f4fd3ef9db3f2
2010-10-21 17:58:34 +09:00
Tadashi G. Takaoka d329795d91 Merge "Make common qwerty keyboard layout files and include these" 2010-10-20 22:43:45 -07:00
Ken Wakasa f5df46f0e0 Add ; to list of punctuation
bug: 3034792
Change-Id: I8e5f3907840fa2ddc2b5ac99328525313465ea35
2010-10-21 01:56:18 +09:00
Tadashi G. Takaoka c9bf5c005e Make common qwerty keyboard layout files and include these
Change-Id: I0cb8de748c4365e42d015078daf686ed76ca105b
2010-10-21 00:00:43 +09:00
Ken Wakasa e354a85ef4 Manual merge of the following Gingerbread changes logically
I8b38e280
Ia3929bb0
If925b546
I1062763d
I901e36aa

bug: 3100311
Change-Id: Ic7e01277ec816e77d34732599b2b9552668b81c2
2010-10-20 22:51:33 +09:00
Tadashi G. Takaoka 58bfa35072 Update xlarge drawable of Keyboard
Bug: 3109804
Change-Id: I316f9cfcec377a7d0ea1417e1e3cea55cbdb9e2b
2010-10-19 21:59:17 +09:00
Tadashi G. Takaoka 28d8a488c0 Disable gesture detector on mini-keyboard
Gesture detector, for closing keyboard by swiping down, must be
disabled not only when mini-keyboard is on the screen, but also in the
mini-keyboard itself.

Bug: 3105595
Change-Id: I548501f7117ca2310943cabb678c1e250e5012ce
2010-10-19 02:20:03 +09:00
Ken Wakasa b0a6f354ac DO NOT MERGE. Add '...' (hint) to period/smiley keys which triggers mini popup by long-press.
bug: 3105185
Change-Id: I901e36aa12dad5968ba1a420fff6a2f2efb16da5
2010-10-19 01:16:07 +09:00
Tadashi G. Takaoka 2348ca0e76 Cleanup LatinKeyboard and LatinKeyboard.LatinKey classes
Change-Id: I4c5a37315dea1c7545b77a8a6c93b930927a5a82
2010-10-18 16:06:05 +09:00
Tadashi G. Takaoka 4571fff019 Merge "Showing popup preview only when IME is in foreground" 2010-10-17 19:55:15 -07:00
Tadashi G. Takaoka 3740a26c21 Showing popup preview only when IME is in foreground
Bug: 3100922
Change-Id: Icd59fc3978dc1fccb523a368b0a7d4549fc2db78
2010-10-17 23:50:24 +09:00
Tadashi G. Takaoka a2de8f0f83 Save default enter key attributes and restore these if needed
Bug: 3103016
Change-Id: Id8128d5b685ac040afd2c248e1ad17e9aaf1fdf0
2010-10-17 18:27:48 +09:00
Tadashi G. Takaoka cd7b7d3e8f Specify keyboard metrics with physical unit "inch"
Cherrypick I44f3b2eef8086d6e0b0db53d38f08487549060c6 from Gingerbread

This change also introduces the key background drawables which has no
fixed bottom padding.  Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit.  Other keyboard related length, distance and size are
also specified by physical unit.

Bug: 3066107
Change-Id: Ib38355ebfc2f8d5b1d26c4e90eba87196fbeddfa
2010-10-17 18:19:42 +09:00
Ken Wakasa 86953d170d DO NOT MERGE. Revise the setting hint visual and its handling code.
This is a follow up change to I8b38e280.

bug: 3084022
Change-Id: I1062763d87b4498e19598b4e7d99bb91c510c6d2
2010-10-17 12:42:40 +09:00
Tadashi G. Takaoka 65100ff39c am c247df2d: am 0ccc4bfe: Merge "Reduce popup preview fading out animation duration to 70ms" into gingerbread
Merge commit 'c247df2d05932f36ca1ebbba34b57a92254f433e'

* commit 'c247df2d05932f36ca1ebbba34b57a92254f433e':
  Reduce popup preview fading out animation duration to 70ms
2010-10-16 09:13:20 -07:00
Ken Wakasa 4e2feed325 am 4b6b11b5: am 8a26e853: Fix an issue of adding extra character.
Merge commit '4b6b11b5064a3b8b604a6441e7a037b0443ec6ed'

* commit '4b6b11b5064a3b8b604a6441e7a037b0443ec6ed':
  Fix an issue of adding extra character.
2010-10-16 09:13:17 -07:00
Kenny Root 6e0998c945 Import revised translations DO NOT MERGE
Change-Id: If56cd8acf3d73466ff904a707c4bb523dd5ab46d
2010-10-15 15:26:51 -07:00
Tadashi G. Takaoka 1dac5d491f resolved conflicts for merge of ac777128 to master
Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391
2010-10-16 04:57:53 +09:00
Ken Wakasa 1cbfc6c968 DO NOT MERGE. Follow up change to I8b38e280
Add visual indicator that long press / or @ on F1 key will bring up Settings

bug: 3084022
Change-Id: If925b546829ca8e8806e1f8f89eaf72fc8c220da
2010-10-16 02:54:54 +09:00
Tadashi G. Takaoka 0ccc4bfe38 Merge "Reduce popup preview fading out animation duration to 70ms" into gingerbread 2010-10-15 02:27:02 -07:00
Ken Wakasa 8a26e85387 Fix an issue of adding extra character.
LatinKeyboardBaseView should have removed "long pressed" pointer tracker from the multi-touch pointer queue.

bug: 3099130
Change-Id: I3d358a373b0de07558a204e9ff5a95e9ece38bcc
2010-10-15 17:56:05 +09:00
Tadashi G. Takaoka 62e3fafac6 Reduce popup preview fading out animation duration to 70ms
Bug: 3099331
Change-Id: I32c11bb25ebdb97af0c883c475d96fc8e2749101
2010-10-15 10:22:43 +09:00
Tadashi G. Takaoka ace15025c3 Merge "Follow up change of I8b38e280 (DO NOT MERGE)" into gingerbread 2010-10-14 18:13:18 -07:00
Tadashi G. Takaoka 0661496ee0 Follow up change of I8b38e280 (DO NOT MERGE)
This is follow up change of I8b38e2803eb32469653484701882af35108eb69a

This change fixes the following when "Voice input on symbols keyboard"
option is selected.
- LatinIME.onCreateInputView fails to show "123mic" icon.
- Email and URL variation keyboard fails to show "123mic" icon.

Bug: 3084022
Change-Id: Ia3929bb0cc5c5c8651af816718c21d1f20e8f016
2010-10-15 10:00:06 +09:00
Maryam Garrett 93b3d50041 resolved conflicts for merge of 21c3e696 to master
Change-Id: I35b6abc1569f3e16ddf2db523dc1326ff294962a
2010-10-14 15:36:50 -04:00
Kenny Root 913730d6e7 Import revised translations
Change-Id: Iaf51da312caf84a58796714424fc8dd22df1f6d3
2010-10-14 09:46:48 -07:00
Ken Wakasa 179fa2c03e DO NOT MERGE. Add visual indicator that long press , or mic key will bring up Settings
bug:3084022
Change-Id: I8b38e2803eb32469653484701882af35108eb69a
2010-10-14 19:52:46 +09:00
Tadashi G. Takaoka 3d20d99902 Specify keyboard metrics with physical unit "inch" (DO NOT MERGE)
This change also introduces the key background drawables which has no
fixed bottom padding.  Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit.  Other keyboard related length, distance and size are
also specified by physical unit.

Bug: 3066107

Change-Id: I44f3b2eef8086d6e0b0db53d38f08487549060c6
2010-10-14 13:40:31 +09:00
Tadashi G. Takaoka 0963c781f2 Make some keys in phone keyboard to darker color
Bug: 3088257
Change-Id: I36b1a0f147c1087a98b91f00d60bf15922861f9c
2010-10-13 14:06:21 +09:00
Tadashi G. Takaoka 323971b51e Merge "Follow up change of I4c6df819" 2010-10-12 08:03:11 -07:00
Tadashi G. Takaoka ed3443ebd7 Follow up change of I4c6df819
This change is follow up of I4c6df8197b734feb998da78478a4d9a41f6d92b2

Change-Id: I3b8a82dd71305f34afb2e8b6a705efabdc2bc0cf
2010-10-13 00:02:28 +09:00
Tadashi G. Takaoka adf24e2eb4 Follow up change of If9472a2a
This change is follow up of If9472a2acb029e56790dc4d19ab62e608c970175

Change-Id: I0a474a130f49e2acccbb5a164bdf2984a5bd9042
2010-10-13 00:00:59 +09:00
Tadashi G. Takaoka 50a61083d3 Add text variation keyboard layout
Change-Id: I4c6df8197b734feb998da78478a4d9a41f6d92b2
2010-10-12 14:01:28 +09:00
Maryam Garrett a5a5ffc0dc Fix the over-calling of VoiceSearch Logging
bug: 3035228 This change will reduce the number of times VoiceSearch app
is called to log IME events.  This is because it 1) only
flushes the logs when there is relevant logging information
available and 2) sets a flag in UserHappinessSignals so
that other apps (eg: gmail/sms) can know if there is
relevant logging information before sending the logging
intent to voice search.

Change-Id: I708fea5a38f854091f1101e4f6a3db46296f3e92
2010-10-11 15:37:32 -04:00
Ken Wakasa 39004972b1 resolved conflicts for merge of fd64e47c to master
Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085
2010-10-12 03:15:36 +09:00
Ken Wakasa 3de6ba6ab9 am 938c0a37: am 364da8c6: Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.
Merge commit '938c0a3722a9c597931e6f75408dc7ab636d7052'

* commit '938c0a3722a9c597931e6f75408dc7ab636d7052':
  Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.
2010-10-11 10:42:25 -07:00
Kenny Root ef38215fa4 Merge "Fix merge that should have been manually merged" 2010-10-10 17:16:51 -07:00
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
Kenny Root 6f6dd71862 resolved conflicts for merge of 23d50bfb to master
Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6
2010-10-10 15:19:53 -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 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
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 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 cb0046288d Merge "Make keyboard vertical correction configurable (DO NOT MERGE)" into gingerbread 2010-10-08 03:23:53 -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 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 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 3425026d51 Follow-up to Ia135eb92 . Shorten overflowed string.
bug: 3063598
Change-Id: I703054c930590ef62579183731935ec3362406cd
2010-10-06 17:40:40 +09:00