Commit Graph

190 Commits (a13f4942addb5512f0d3756c35c2d7b221fd62e5)

Author SHA1 Message Date
Tadashi G. Takaoka 088350d663 Fix CHAR LIMIT of some string resources
Bug: 6421155
Change-Id: I1e2f1fa419c16dcbf483ace7c1a362b51f0dc7bb
2012-05-01 14:15:41 +09:00
Tadashi G. Takaoka 6b006b4947 Increase CHAR LIMIT in some string resources
Bug: 6374565
Bug: 6381144
Change-Id: I2fff2323e8f0f79df2b71ed030a1a0953b2854c8
2012-04-26 15:38:41 +09:00
Tadashi G. Takaoka 27b42ced86 Fix "no language" subtype name (DO NOT MERGE)
* Move SubtypeLocale.get{Full,Middle,Short}DisplayName() to
  LatinLeyboardView and add unit tests (SpacebarTextTests).
* Add SubtypeLocale.getSubtypeDisplayName()

This is a cherry-pick of I57420c6a from Master.

Bug: 6393865
Change-Id: I68748189c17c73984ac4ae05a5a40fb54bf46453
2012-04-26 11:50:28 +09:00
Tadashi G. Takaoka c27fe6253c Add custom subtype settings
Bug: 4460018
Change-Id: I4919d79516dcf574be2761bbaf9adcdc381b2ddc
2012-04-19 19:33:51 +09:00
Jean Chalard 80f2ccc236 Update the names and default values of bigram options.
Bug: 6293595

Change-Id: I9978a1127c64b7a26a5ccf6f777366f7c4e214db
2012-04-05 21:07:40 +09:00
Tadashi G. Takaoka 3bf57a5624 Use "No language (QWERTY)" for language agnostic QWERTY keyboard name
Bug: 6010147
Change-Id: I401c2e3fcd639c0e1a03e64489a0d792810caa18
2012-04-04 12:58:42 +09:00
Ken Wakasa 911b8f9d19 Remove the "deprecated" classes
bug: 6129704
Change-Id: Ib27f2774444e1f084b19be3fe6f56d25dffa7084
2012-03-30 16:20:56 +09:00
Tadashi G. Takaoka 2eb8781dc2 Separate leftward arrow from "add to dictionary" hint text
Bug: 6008875
Change-Id: I2be1698e485bc6541163771f41b8b82eaa3cee7a
2012-03-29 15:58:26 +09:00
Tadashi G. Takaoka 81d4e3cd66 Add language switch key only to the phone layouts
Bug: 5759092
Change-Id: Ic7d7d4812976654c0e85fecabd1128eadfc52c5c
2012-03-07 10:03:21 +09:00
satok e54723d84d Change the name of AOSP LatinIME spell checker
Change-Id: I8b93f66c272d91ba02888da31d56a9811ba2a1f0
2012-03-05 15:39:07 +09:00
Tadashi G. Takaoka 97bde43740 Settings key always exists in more keys of shortcut/f1 key
This change also
  * Fix comman/f1 key for Arabic keyboard.
  * Removes "show settings key option" and related stuff.
  * Renames and simplifies F2 key to shortcut key on 7 inch tablet.

Change-Id: Ib1cf99ad00d9780a2f0d170260e756771e161521
2012-02-17 01:04:11 -08:00
Ken Wakasa a56639613b Use more standard Unicode notations in keyboard layout resource files.
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
2012-02-15 06:44:09 +09:00
Ken Wakasa f6f40539aa Minor string updates in Android keyboard settings
bug: 5999345
Change-Id: I77560b02c71c3ba0c525572b7062ebbfd66b3b85
2012-02-14 03:32:39 +09:00
Charles Chen 4baf767fac Merge "Improved shift key and symbol/alpha switch key accessibility feedback." 2012-02-09 15:33:40 -08:00
Tadashi G. Takaoka 7a39bd4454 Shift+Smiley key will register newline character of textMultiLine
This change also
 * Honors the custom action label in EditorInfo.actionLabel.
 * Invokes InputConnection.performeEditorAction if action is specifed
   at EditorInfo.imeOptions or actionLabel/actionId.
 * Stops using InputMethodService.sendKeyChar. Implements
   sendKeyCodePoint instead.

Bug: 2498607
Bug: 5961809
Bug: 5368408
Change-Id: If4cd5eb3dacfc6b6a7ea434b0617c2438e06e42d
2012-02-08 19:31:35 +09:00
alanv 8d4f0d5d1d Improved shift key and symbol/alpha switch key accessibility feedback.
Bug: 5933165
Change-Id: Id71f38874640785b7ad43b7a70e27f40c13be748
2012-02-07 13:14:18 -08:00
Eric Fischer fbd83a8712 Restore deleted string still referenced from code to fix the build.
Change-Id: Ideb39da09730960f555f2b928d699819c986531b
2012-02-02 13:57:15 -08:00
alanv f3e951b259 Removed spoken descriptions for characters supported by TTS or TalkBack.
Change-Id: Iddef18559bc6af9487e536a33607b0a0b07df282
2012-01-31 13:02:33 -08:00
Tadashi G. Takaoka 4015a64a26 Fix SubtypeLocaleTests
Change-Id: Id85814aa3bcd9cacbe446b2dfda3ca2ab9146c13
2012-01-13 14:35:43 +09:00
satok c1da6566dd Change the application name of aosp latin ime
Change-Id: I96281709736bc20d70e63af170bfb48b5df3f18d
2012-01-12 14:27:22 +09:00
Jean Chalard db5aedb5a5 Add an option to use contacts or not while spell checking
Bug: 5447495
Change-Id: Iffb09895676c3dd1a79d1699b0eac865282508d4
2011-11-30 18:58:10 +09:00
satok 79c0acf519 Add a settings to change the sound effect volume
Bug: 5345401
Bug: 5402541
Change-Id: I1e653573a3362160104b77388d6cbd1700424649
2011-10-11 22:25:13 +09:00
Alan Viverette b0c8db018d Let accessibility users know to connect a headset when the IME connects to a password field.
Change-Id: If96cd7626950dd12e88a8a97f5e405d303d41e06
2011-10-06 11:02:29 -07:00
Jean Chalard 45f45a4fdb Cleanup : remove recorrection-related stuff.
This removes UPDATE_OLD_SUGGESTIONS, and the associated settings.

Bug: 5402537
Change-Id: Ie87d4e05c54e4b7d2dd5a05f2d0b570e9cd3e463
2011-10-03 18:23:23 +09:00
Tadashi G. Takaoka e0aed8d3a2 Fix CHAR LIMIT
Bug: 5387401
Change-Id: I97161de79006a23e507a55041c7840267fbb2df8
2011-09-29 21:28:15 +09:00
satok 433965784d add vibration duration settings
Change-Id: I56a1a94df63160f367f866da759d7dd4fc428ed5
2011-09-29 11:46:20 +09:00
Jean Chalard adda8e358b Add a string for main dictionary
Change-Id: I6d5a7af534faffc812537ad3068de22eec5112dc
2011-09-14 17:01:40 +09:00
Tadashi G. Takaoka 4630590350 Remove unused string resource ngram_category
This is a follow up change for Ib1fc608a.

Change-Id: Id53965310fa4d13739835f37e1d6facf5b654a3f
2011-09-12 18:12:46 +09:00
Tadashi G. Takaoka 7ac280895f Remove unused string resource label_more_key
Change-Id: Id798ad572344beca39e2775090c362ffc1a12809
2011-09-12 17:30:18 +09:00
Jean Chalard 1531528bfe Add an option to prevent insertion of suggestion spans
This is to help debug of
Bug: 5250788

Change-Id: I961321aff3776c4912eaf7a1fa4de0c01d715f24
2011-09-02 14:43:13 +09:00
Jean Chalard 2e58804a98 Merge "Change settings wording for ICS" 2011-09-01 04:39:54 -07:00
Jean Chalard 7bf1d7f437 Change settings wording for ICS
Bug: 5066983
Change-Id: I7f5e680da963dc4e9cf4744f7696cb35a9ca3efb
2011-09-01 19:46:25 +09:00
Tadashi G. Takaoka 913e2aeef2 Rename CandidateView to SuggestionsView
Change-Id: I6480cdf025f065130e1969899b259a243e7a11be
2011-09-01 15:41:34 +09:00
Tadashi G. Takaoka d81479a340 Implement KeyboardLocale InputMethodSubtype extra key
The locale is specified by KeyboardLocale extra key in method.xml,
LatinIME will use the specified locale for keyboard layout.

Bug: 5238658
Change-Id: I8e6cb66c73a7ac1bf611d9910b42fa9cff38eba0
2011-09-01 14:05:01 +09:00
Jean Chalard 31fd54c53f Add a settings activity for the spell checker.
Bug: 5156940
Change-Id: I762de1296f861abce2d0413404bca54571e0ea0a
2011-08-12 19:07:51 +09:00
Tadashi G. Takaoka 62d4a96497 Support label with icon key
Bug: 5108339
Change-Id: I7cd4258a95a7e25b8b1114b43ffcca5b77c5c1e3
2011-08-03 01:53:30 -07:00
Ken Wakasa 047f63f559 "?123" should be up for translation for Arabic layouts
bug: 5108339
Change-Id: Ie1abcf50abba569683f76a136718ab24f5089677
2011-08-03 00:28:46 +09:00
Ken Wakasa 0b08a4b7c2 Add char limit for several key label resources
Change-Id: I7a63dce1e85282055b847c43a6e9b9b90a10fa98
2011-08-02 19:58:54 +09:00
Ken Wakasa 2ba975afb9 Turn off the Settings key by default
bug:5094401
Change-Id: Ieb42fdfa79be2afcfa6634e7404c17737ef6927d
2011-07-31 07:26:24 +09:00
Jean Chalard f50aa19337 Purge quick fixes option.
This change removes everything related to the quick fixes
Latin IME option item.
Note that Autotext is still used if the current subtype language
is the same as the system language.

Bug: 4985058
Change-Id: I51728a2190543ffb9e004470674ef6257b14f6c2
2011-07-26 16:25:57 +09:00
satok 2c18ffb97f Merge "[step3] Add spell checker service." 2011-07-25 13:48:47 -07:00
satok 022c1cc203 [step3] Add spell checker service.
Change-Id: Ib13b3a524e0f0b90de40a3e255040b3158d49258
2011-07-25 11:05:24 +09:00
Ken Wakasa 8f98cdef0e Tidy up the subtype names
Change-Id: I5dbdc6c006fab01fa389f0796b6c87aa2a90132e
2011-07-23 17:42:23 +09:00
Tadashi G. Takaoka ef5dfc480c Remove sliding spacebar language switcher
Bug: 4971680
Change-Id: Ia3485ddcf8051bf7b7ba7f7a37fa75c3bc8a4798
2011-07-19 23:24:49 -07:00
Tadashi G. Takaoka bf9d8348d8 Support select input method dialog on pre-HC platform
Bug: 4971680
Change-Id: I641b336da54813e13409bd7874aa22e51f790729
2011-07-19 22:22:47 -07:00
satok 1a3bb54bb4 Use InputMethodSettingsFragment
Bug: 4979539

Change-Id: I4f2010f785eb29ccd42b488c402ef9957633e0c2
2011-07-09 11:25:54 +09:00
Tadashi G. Takaoka a65d84ce81 Merge "Add key description for "fullwidth asterisk" used on phone/number layout" 2011-06-29 03:02:30 -07:00
Tadashi G. Takaoka 0464850e6c Add key description for "fullwidth asterisk" used on phone/number layout
This change also removes non-ASCII comment from strings.xml to
suppress resource compiler warning.

Change-Id: I96d3e8e2c7072816f32a15564745f8cdc3f91ee9
2011-06-29 18:51:22 +09:00
satok 8b0f34dbd3 Remove sliding explanation
Change-Id: Iae35385a3fadd7acc8a67b6a8f9beda9cab96cc9
2011-06-29 18:08:31 +09:00
Ken Wakasa c79aa482a8 Tiny string fix.
Change-Id: I56dd023b770ffbb85d7be1440301596b77c8d8c2
2011-06-25 00:16:55 +09:00
satok 07a62cf3d6 Added very aggressive
Bug: 4905916

Change-Id: I7365dd417855c980a56ab3bc513e9bc824b3182e
2011-06-24 21:31:10 +09:00
Jean Chalard 4f3d5d3733 Add a link from Latin IME to the dictionary pack.
The link only shows up if the dictionary pack is installed.

Bug: 1752028
Change-Id: I4af0a0a63324c155609710064a25df0deeb82b4d
2011-06-24 20:17:38 +09:00
Alan Viverette 5ac4638f99 Added support for touch exploration to Latin IME.
Bug: 4379983
Change-Id: I97f22e54827c6229054b514801401ffa5b4ed3b8
2011-06-22 10:54:06 -07:00
Tadashi G. Takaoka e90fae82d6 Add German QWERTY keyboard
Bug: 3268561
Change-Id: I56a74dc04d337d8d5701d99e5c92493dbcc06e41
2011-06-22 17:46:56 +09:00
Tadashi G. Takaoka 35f20916e5 Support Turkish keyboard
I left TODOs in Suggest.java because we must pay attention to locale
when changing character's case. Filed another Bug: 4769095 to track
that.

Bug: 4768050
Change-Id: I1ae2c4ffd2208403a8c2a25dd3a56b71dcefc826
2011-06-21 17:50:17 +09:00
Tadashi G. Takaoka 2c43ed179e Support Croatian keyboard
Basically Croatian keyboard is QWERTZ layout with extra letters such
as č, ć, đ, ž and š.  This change just introduces Croatian keyboard
subtype and QWERTZ layout which has the extra letters as popup mini
keyboard of base letter.

It might be great if we could have dedidated table layout.

Bug: 4309160
Change-Id: I0fc227295defa56029ca06e406f73833b992be0e
2011-06-18 01:05:54 +09:00
Tadashi G. Takaoka 1b580e3f1a Add Finnish and Hungarian keyboard subtype
There are already both languages keyboard layout. Finnish is based on
Scandinavian layout and Hungarian is based on QWERTZ.

Change-Id: I6c804495bf1ae56661bc5c714e0c500132cd55a8
2011-06-17 22:31:04 +09:00
Jean Chalard 699094f9b6 Add an option to use or not the contacts dictionary.
Bug: 4586840
Change-Id: If62cd57e5ab661e6a51a5442d09bf0af8f08f263
2011-06-13 17:33:04 +09:00
Tadashi G. Takaoka a645d88228 Remove unused resources
Bug: 4436327
Change-Id: I2573786aac5fd8d543cf12d24c951b67c7353fd7
2011-05-16 16:22:39 +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
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 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
satok 0d8a4eb367 Add pl keyboard layout
Bug: 4394303

Change-Id: I0fa24829e1240549728d9b81af3e39a024725016
2011-05-06 19:22:08 +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
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
Alan Viverette dcade18113 Added support for speaking keys through accessibility service.
Issue: 3366636

Change-Id: I70a2ebb4420782ba4d7d874ffc2259bb1b80446f
2011-02-23 18:16:43 -08:00
satok 0b0c522523 Added voice input languages
bug: 3382825

Change-Id: Iec031dffb86e4b05a4a718d17afe20064d14633e
2011-01-26 15:04:02 +09:00
Jean Chalard 2f4cc01e61 Clarify a settings summary text.
Change-Id: I98ee8bbe312a1515199b9c5c56c390010e8ef616
2011-01-25 17:31:34 +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 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 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
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 543334cc21 Fix descriptions for strings.
Bug: 2876541
Bug: 2988169

Change-Id: I80130aa258e38f638b226448ba53a7efaeb6c3d7
2011-01-14 11:06:59 +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 c59009648c Add description and CHAR LIMIT to string resources
Bug: 3290252

Change-Id: I1978e132de0280bec5c90bd14d9f4823d742bada
2010-12-17 17:40:04 +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 246acc5033 Make "Tab" and "ALT" and "123" as donottranslate resources
Bug: 3273889
Change-Id: I1bd47ffbc7bc92d66d421c5f2787acf14e08e0f7
2010-12-14 15:33:24 +09:00
Tadashi G. Takaoka 1b1f7f907f Cleanup unused string resources
This change also renames some "completion" to "correction".

Change-Id: I156dd7ccafe99a632721f20769d5f0ea5915a564
2010-12-12 21:55:00 +09:00
Ken Wakasa 2e4b1bdb7f Prefer United Kingdom to Great Britain as locale string
bug: 3256252
Change-Id: I19a0b763e9314a69f054b1b0996317325d6a4661
2010-12-06 23:53:45 +09:00
Tadashi G. Takaoka e18bd3e323 Fix voice key on phone device
This change,
- changes voice key code back to -102
- renames some key code names and method names
- adds mic_slash_holo to drawable-hdpi

Change-Id: I8be3a20921f472ece4298edad2d275f29a7e4955
2010-12-06 12:29:59 +09:00
Tadashi G. Takaoka 7215c3bd40 Add [CHAR LIMIT] comment to strings
Bug: 3245533
Change-Id: If4dc017f302b6a0e960818d4db6d616988bf802f
2010-12-02 11:57:40 +09:00
Ken Wakasa 6569b400fe Update string for Ic0d5f862
bug: 3232408
Change-Id: I642e736190e63bdf1591d5d7f29ef05b7e82fe03
2010-12-01 22:57:14 +09:00
Tadashi G. Takaoka e6f8bb04b6 Add fr_CH keyboard subtype
Change-Id: I3977f9e201e77a682c1c8bed221cca32204dafbe
2010-12-01 21:26:16 +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
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
Tadashi G. Takaoka 0ff78a1bae Remove unused string for key label
Bug: 3230041
Change-Id: I1c3cc78157f30f43a5b4a32e413fb43df1db4907
2010-11-30 09:51:12 +09: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
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 75fde64890 Cleanup drawable-xlarge resources into drawable-mdpi
Change-Id: I2db335a601ddb0062a637a71289e14cf1d375a1e
2010-11-19 01:37:38 -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
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
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
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 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