Commit graph

604 commits

Author SHA1 Message Date
Tadashi G. Takaoka
7cc2595b6f Add LatinKeyboard.spacebarTextRatio attribute
Bug: 5776979
Change-Id: Ia568d1170ed33a000eb3bb02ecdf611e4b5ff2d5
2011-12-18 01:00:06 +09:00
Tadashi G. Takaoka
94a3f8f243 Generalize Russian to Slavic layout
Adding Belarusian, Kyrgyz, and Ukrainian keyboards will follows.

Bug: 5738545
Change-Id: I05055d519fac8c67f728cee693b133c3dfb29047
2011-12-16 20:54:25 +09:00
Tadashi G. Takaoka
a44685ab32 Add colorValidTypedWord and alphaValidTypedWord
This change fixes Gingerbread theme.

Change-Id: I142437ac0173df48ab36390f47ed67c6cea24a65
2011-12-16 12:26:19 +09:00
Tadashi G. Takaoka
23d27fefcb Fix auto correction spacebar LED
Change-Id: I4894d188d5612380cc9f8eec7cb72544e37fb2b0
2011-12-15 17:34:14 +09:00
Tadashi G. Takaoka
623d0155b6 Just ignore settings/shortcut key while typing on tablet
Bug: 5759096
Change-Id: Ie1f1800d0f32ac0938715c79974e0f382c9c3d27
2011-12-14 17:14:44 +09:00
Tadashi G. Takaoka
f86109ca56 Utilize KeyboardSet XML definitions
This change introduces KeyboardSet and SubKeyboard XML definitions to
represent a set of keyboard layouts.

Bug: 5002108
Bug: 5679585
Change-Id: Ib6c8d5936187381bb6725c9fe574e93871c01a86
2011-12-14 16:28:31 +09:00
satok
e0dfc54c5b Show usability study mode for research purposes
Bug: 5722703

Change-Id: I27acc374c5d4b52707708b83689dea5d78a573d7
2011-12-09 15:31:06 +09:00
Tadashi G. Takaoka
ae7746e580 Merge "Add Key.altCode attribute" 2011-11-30 03:15:44 -08:00
Tadashi G. Takaoka
2013bab89c Add Key.altCode attribute
* Registering alternate code and while key is typing.
  * Showing press/release graphics of the key that has the above altenate code.
  * Showing press/release graphics of all shift keys.
  * Renaming Key.ignoreWhileTyping to Key.altCodeWhileTyping.

Bug: 5639503
Change-Id: I67fb45bae76284a1f0deb6fd12ae5fb781d06cc3
2011-11-30 20:06:47 +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
Tadashi G. Takaoka
c1f7d39b4a Introduce ignoreWhileTyping flags to Key.keyActionFlags
Bug: 5639503
Change-Id: Ic2afad6766edb2538a58f722209e2daa40aa488d
2011-11-22 18:18:29 -08:00
Tadashi G. Takaoka
13d5f6605b Add Key.keyActionFlags and obsolete Key.isRepeatable
This change also renames Key.keyLabelOption to keyLabelFlags.

Change-Id: Iedd0bfaa420ad382c07ce084416355690e390919
2011-11-21 20:33:03 -08:00
Tadashi G. Takaoka
431ce93925 Introduce noKeyPreview Key attribute
This change also removes hacks in LatinKeyboardView by utilizing
noKeyPreview attribute.

Bug: 5638595
Change-Id: Icd8a3af3b7849b941f8f5532e2b432e126a909e6
2011-11-18 14:40:05 -08:00
Tadashi G. Takaoka
18630d5fd6 am 15a01d72: Merge "Do not show key preview of settings and shortcut key" into ics-mr1
* commit '15a01d72724ce7f0a9a5814443a03b907962f3fd':
  Do not show key preview of settings and shortcut key
2011-11-18 09:15:52 -08:00
Tadashi G. Takaoka
49cc3beb75 resolved conflicts for merge of 137667ed to master
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
2011-11-18 08:51:39 -08:00
Tadashi G. Takaoka
15a01d7272 Merge "Do not show key preview of settings and shortcut key" into ics-mr1 2011-11-17 18:02:05 -08:00
Tadashi G. Takaoka
175acb8205 Ignore microphone and settings key while typing
Bug: 5560766
Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
2011-11-17 16:01:31 -08:00
Tadashi G. Takaoka
ca14c8bf34 Do not show key preview of settings and shortcut key
Bug: 5560766
Change-Id: I580efaf4e33f7dfbaa591e2afae9c49547bf26fb
2011-11-17 15:34:57 -08:00
Jean Chalard
a409f009fa Fill in the HAS_RECOMMENDED_SUGGESTIONS flag.
Bug: 5530727
Change-Id: Ic53e227f72096053e08d90204bf1f287ec09290b
2011-11-10 02:52:46 +09:00
Tadashi G. Takaoka
556a7147c1 Merge "Tweak more suggesitons modal tolerance a bit longer" into ics-mr1 2011-10-26 17:27:44 -07:00
Tadashi G. Takaoka
b35f70acec Tweak more suggesitons modal tolerance a bit longer
Bug: 5459166
Change-Id: I18f10f7d537a451462cf7874e525c5eba103fb9a
2011-10-26 19:33:28 +09:00
Tadashi G. Takaoka
7fe66ea42e Add a few Arabic symbols
Bug: 5458689
Change-Id: I61ce876606ce3fa620d606752c8e5442b8ad78d6
2011-10-26 14:25:11 +09:00
Tadashi G. Takaoka
d2bc850c4c am 908a2f63: Merge "Special handling of one key mini-keyboard to mitigate visual flicker" into ics-mr0
* commit '908a2f63949687c9e7acb2e3d50fd50815582e8b':
  Special handling of one key mini-keyboard to mitigate visual flicker
2011-10-14 12:21:17 -07:00
Tadashi G. Takaoka
a0e4f40994 Special handling of one key mini-keyboard to mitigate visual flicker
Use pre-computed width and height of mini keyboard if
 * Popup key preview is enabled
 * The mini keyboard has only one key
 * Pre-computed width and height are specified

Bug: 5248783
Change-Id: I53475698e87d5bd67d36e63323c25a9e9f18fbb1
2011-10-14 17:49:48 +09:00
Tadashi G. Takaoka
ab18e39953 am 5f89fbae: Get rid of daggers from Arabic/Hebrew keyboard
* commit '5f89fbaea27666b6d7892e5ac48f40201922c06b':
  Get rid of daggers from Arabic/Hebrew keyboard
2011-10-11 23:30:58 -07:00
Tadashi G. Takaoka
5f89fbaea2 Get rid of daggers from Arabic/Hebrew keyboard
Bug: 5445200

Change-Id: I5e4e19a17b0edcd0c0de8fa8fe4289b0ca7d66b1
2011-10-12 11:55:30 +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
Tadashi G. Takaoka
6984a42024 Get rid of card suits from Arabic keyboard
Bug: 5439295
Change-Id: Idbcd51acb927d5a9d549c91c93a1a6e32ba8be24
2011-10-11 11:10:25 +09:00
satok
633f9592d1 Turn off the auto correction space bar led by default
Bug: 5245468
Change-Id: I0c25d733b21dcc43674d9fe4ca22dd2e1d18105a
2011-10-10 19:01:05 +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
ad2dfa7697 Fix keyboard theme parsing
This is a followup of I13b9997e.

Change-Id: I4c10fbc8b250c3bad72e38d46089684a839bdd5f
2011-10-03 12:34:36 +09:00
Tadashi G. Takaoka
5c26922ab2 Move themeId and touch correction data to Keyboard style
Change-Id: I13b9997e013b704734b6fa94131b1f7fec7a152d
2011-09-30 22:59:53 +09:00
Tadashi G. Takaoka
dc1afa8732 Merge "Fix CHAR LIMIT" 2011-09-29 08:10:44 -07:00
Tadashi G. Takaoka
e0aed8d3a2 Fix CHAR LIMIT
Bug: 5387401
Change-Id: I97161de79006a23e507a55041c7840267fbb2df8
2011-09-29 21:28:15 +09:00
Jean Chalard
4609c02f9e Add a threshold for suggestion score.
Bug: 5384578

Change-Id: Ic0b0203d873492a41c72defef835adf36f010f47
2011-09-29 17:38:08 +09:00
Yusuke Nojima
b45e095aa2 Merge "Add touch position correction data to resources." 2011-09-28 22:41:11 -07:00
Yusuke Nojima
d6339639c3 Add touch position correction data to resources.
Change-Id: I156205672f3935f70c250a6c538793f35c5d86b2
2011-09-29 14:29:23 +09:00
satok
433965784d add vibration duration settings
Change-Id: I56a1a94df63160f367f866da759d7dd4fc428ed5
2011-09-29 11:46:20 +09:00
Tadashi G. Takaoka
63584323ca Add themeId to Keyboard
Change-Id: I6abdeaf41459406cf9021efdf5bb96232ba104c7
2011-09-28 12:08:48 +09:00
Tadashi G. Takaoka
287f4f83e9 Add horizontal edges paddings to phone/number layout
Bug: 4948171
Change-Id: I8a06a25ffcbd141c9418e77e982233166a347914
2011-09-26 17:11:01 +09:00
Tadashi G. Takaoka
68c7b9b195 Merge "Remove "autoCorrectInvert" feature from SuggestionsView" 2011-09-20 23:28:31 -07:00
Tadashi G. Takaoka
77a87e3cb5 Remove "autoCorrectInvert" feature from SuggestionsView
Bug: 5162005
Change-Id: Iec679f5f05f28cd7e8013d7350ea03372f1cd7b2
2011-09-21 15:06:51 +09:00
Tadashi G. Takaoka
f5fe245df0 Fix key preview backing view height
Bug: 5344344
Change-Id: Ied0cda2c4b822b391ece54a6880fae8e349cc0bc
2011-09-21 11:22:05 +09:00
Ken Wakasa
37af28dd23 Enable vibrate on keypress by default
bug: 5337363
Change-Id: I14c95d27dd236d0a43e64a46ae6fbf9f2a97a3da
2011-09-20 20:31:03 +09:00
Ken Wakasa
f58293f6eb Tweak LatinIME's keypress volume
bug: 5337902
Change-Id: I7f864f158d110aa3e755961303799882f59b7e4c
2011-09-20 20:00:43 +09:00
Ken Wakasa
8efe9bb15a Merge "Tweak LatinIME's keypress vibration duration" 2011-09-19 19:29:09 -07:00
Ken Wakasa
28f36d68af Tweak LatinIME's keypress vibration duration
bug: 5337363
Change-Id: If6e6de587cbcddf26710d8f0b237c4bc393589b6
2011-09-20 11:23:30 +09:00
Tadashi G. Takaoka
40fd76faf2 Use Build.HARDWARE to determine "sudden jumping hack"
Bug: 5182291
Change-Id: I6c1ec0c4dd0f96902be89a0ad230dd2264a0dade
2011-09-20 11:09:42 +09:00
Tadashi G. Takaoka
dc7974d54c Merge "Draw more suggestions hint using text font" 2011-09-16 01:07:17 -07:00
Tadashi G. Takaoka
0967ef4036 Draw more suggestions hint using text font
Bug: 5287964
Change-Id: I692b5303268c7b5115853177c956e147312c582d
2011-09-16 16:47:58 +09:00
Ken Wakasa
32cf5bb9f9 Stop auto-switching-back to the main layout by quotes.
bug: 5314117
Change-Id: Idcd6a146665b93eabdc03875b98988f9fa049791
2011-09-16 14:53:04 +09:00
Tadashi G. Takaoka
5b0c124ca8 Remove Key.isStick, use backgroundType="stick" instead
Change-Id: I50e88c0870a3fe360b81f19163ca2f64ec38d8e8
2011-09-15 18:33:01 +09:00
Tadashi G. Takaoka
a6d3a4d61b Make action key background more visually prominent
Bug: 5232726
Change-Id: I76ff2fb431ca295693ceb231a0f13da44f9293e6
2011-09-15 17:40:44 +09:00
Tadashi G. Takaoka
7918ed0169 Refactor Key.isFunctional to more generic Key.keyType
Bug: 5232726
Change-Id: Idc861ca725f62eaf37795f57401573394a17d6d3
2011-09-15 14:38:45 +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
697bf585f8 Update suggestions strip text color
Bug: 5287964
Change-Id: Ic40bb656873f41bb6d65427f02399464e831aab2
2011-09-13 12:54:59 +09:00
Eric Fischer
cd15b9300f Mark configuration string as not translatable.
Change-Id: I691e5a2254c20d339f831ccc79c581b74079e8c9
2011-09-12 16:32:11 -07:00
Ken Wakasa
eada6b880c Merge "Update comment for "log_screen_metrics"" 2011-09-12 03:16:50 -07:00
Ken Wakasa
2057f3b8d8 Update comment for "log_screen_metrics"
Change-Id: Ic558246814a09fa53c99c4b96ecd5c0f77ca5e93
2011-09-12 18:44:21 +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
ed5fe5505e Merge "Remove unused string resource label_more_key" 2011-09-12 01:50:20 -07:00
Tadashi G. Takaoka
4486d77270 Introduce autoXScale label option
Bug: 5267649
Change-Id: I7fdcb98c209b7ccf73075ef3a4e758782fe161e3
2011-09-12 17:32:28 +09:00
Tadashi G. Takaoka
7ac280895f Remove unused string resource label_more_key
Change-Id: Id798ad572344beca39e2775090c362ffc1a12809
2011-09-12 17:30:18 +09:00
Tadashi G. Takaoka
236928c555 Merge "Make Spacer as extended Key class" 2011-09-08 01:44:24 -07:00
Tadashi G. Takaoka
18453d69e0 Make Spacer as extended Key class
Bug: 5275003
Change-Id: I809a8ca363ba72b22ac5cfd926414990f7e8467c
2011-09-08 17:38:50 +09:00
Ken Wakasa
293db0873f Get rid of the double quote from the suggestion strip
bug: 5271209
Change-Id: I1823eaac07e184092bdf2a5d607fa08ff680fca5
2011-09-08 11:46:09 +09:00
Tadashi G. Takaoka
2be872555c Use full screen mode on landscape/phone device
Bug: 5262767
Change-Id: I721c18522c972ced9f359f2e5208572d54a4b7a1
2011-09-08 11:02:55 +09:00
Ken Wakasa
6b97d2b9c2 Tweak bottom padding for the "..." popup hint
Follow up to I45bd6edf

bug: 5255103

Change-Id: I6d5368dadbaf6c7dffadd783d8a8756fea9dbff7
2011-09-07 21:58:30 +09:00
Tadashi G. Takaoka
ed3758e33c Merge "Tune the threshold of fullscreen mode from 2.5in to 500dip" 2011-09-07 01:08:51 -07:00
Tadashi G. Takaoka
f80b6a0699 Tune the threshold of fullscreen mode from 2.5in to 500dip
Bug: 5262767
Change-Id: Ie418ab766951a568d0f40822d8e8d719582749ba
2011-09-07 16:37:50 +09:00
Tadashi G. Takaoka
2ed13003af Use different reference character for hit label
Bug: 5255103
Change-Id: I45bd6edfa68abccb9d67fed617b88efad2bfcc04
2011-09-07 15:06:59 +09:00
Tadashi G. Takaoka
50e1073e11 More suggestions view can be modal
Bug: 5241105
Change-Id: Ib430ee129b9f3cad0bdb1ae083b1068c51a5f2ea
2011-09-06 19:18:40 +09:00
Tadashi G. Takaoka
4269a7cebd Add gap between suggestions strip and more suggestions
Bug: 5260292
Change-Id: Iba792ebe0767f5117f259bcb73ac0bff778b166e
2011-09-06 18:33:01 +09:00
Tadashi G. Takaoka
ea0c567f86 Tune mini keyboard visual
This change only gets rid of the surrounding paddings of the mini keyboard.

Bug: 5248783
Change-Id: Idb95ac1467085c230fd60e4bc0f466fef5700bfb
2011-09-05 20:36:19 +09:00
Tadashi G. Takaoka
9676038b6e Introduce maxMoreSuggestionsRow and minMoreSuggetionsWidth attributes to SuggestionsView
Bug: 5257594
Change-Id: Id52c841b72e38eb9034a1a7f26bcf3d4d81ad216
2011-09-05 18:59:37 +09:00
Tadashi G. Takaoka
1d8ec1cb9f Merge "Rename suggestionsPaneViewStyle to moreSuggestionsViewStyle" 2011-09-05 01:39:33 -07:00
Tadashi G. Takaoka
0e7bd388d2 Merge "Get rid of LinearLayoutCompatUtils" 2011-09-05 01:22:15 -07:00
Tadashi G. Takaoka
0e2fa66144 Rename suggestionsPaneViewStyle to moreSuggestionsViewStyle
Change-Id: I30873ad870c728e28a044baf9946b4461ab03575
2011-09-05 16:48:56 +09:00
Tadashi G. Takaoka
c412309b7a Get rid of LinearLayoutCompatUtils
Change-Id: If0f63eaeb4539c0e03ef20190d2f9211a176babc
2011-09-05 16:15:28 +09:00
Jean Chalard
59b501a050 Only set LOOKS_LIKE_TYPO if the max score meets a threshold
Bug: 5240463
Change-Id: I51e85edae57789d638aa1e12b82e6a75c49d33c7
2011-09-05 12:31:43 +09:00
Tadashi G. Takaoka
abb0c77af1 Use separate View for key preview backing
Bug: 5246982
Change-Id: Icec4281cb01771909fcece36647ee42ba179118c
2011-09-03 01:36:26 +09:00
Tadashi G. Takaoka
99f6760c40 Rename a resource more appropriate one
Bug: 5246982
Change-Id: Ic0e43c0e67f63ea069dd4758cf900765ad7a3678
2011-09-02 16:56:19 +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
Tadashi G. Takaoka
b91b3a3e5c Merge "Rename alternates_for_ as more_keys_for_" 2011-08-31 05:54:38 -07:00
Tadashi G. Takaoka
29e7b7ed6e Implement popup suggestions pane
Bug: 5023981
Change-Id: Ie1d69131dbf884a3f6a2beb3ac3427e5437c1486
2011-08-31 21:21:22 +09:00
Tadashi G. Takaoka
623ac18174 Rename alternates_for_ as more_keys_for_
This is a followup change for I37209a5a.

Change-Id: I17cf4596034ed900cb4c769f89a2607a53b19c0a
2011-08-31 21:14:59 +09:00
Tadashi G. Takaoka
9d5601e901 Rename PopupCharactersParser to MoreKeySpecParser
Also renames PopupPanel to MoreKeysPanel

Change-Id: I37209a5a8fe7dbba1eef03e3be88ba5253653926
2011-08-31 18:34:35 +09:00
Tadashi G. Takaoka
9237a72634 Rename PopupMiniKeyboardView to MiniKeyboardView
Change-Id: Ic83cd1200cfb8f8c0b0cfbcad449031b8e8a29e0
2011-08-31 15:30:54 +09:00
Tadashi G. Takaoka
60dfe896d4 Update "search" icon
Bug: 5232726
Change-Id: Ie42729d15dad05c1650b021396596c1f09c844c2
2011-08-30 14:38:19 +09:00
Tadashi G. Takaoka
2d80400a23 Fix keyLetterSize and keyLabelSize format
This is a followup of Iea7f8f34.

Bug: 5023981
Change-Id: I375a1647343e1d5fa80b328a6824f6c549135e80
2011-08-30 14:20:15 +09:00
Tadashi G. Takaoka
aed8598e3f Add translatable=false to the device list
Bug: 5222586
Change-Id: I0a1dd27c6719d38f6344300fc027162cc47a2976
2011-08-30 09:28:35 +09:00
Tadashi G. Takaoka
83da6c18fb Add keyLetterSize and keyLabelSize as KeyboardView attribute
Bug: 5023981
Change-Id: Iea7f8f340775cbb093c50d6e741b2f1476e9ac39
2011-08-29 23:45:05 +09:00
Tadashi G. Takaoka
c04bbc1ae9 Fix "touch to save" colors
Bug: 5218662
Change-Id: I094b2ceb7438148eb5bdf620b188f598e8442a07
2011-08-26 18:55:36 +09:00
Tadashi G. Takaoka
633bc88a0f Add key preview icon of settings key
The new icon has been created just enlarging
sym_keyboard_settings_holo.png to the size of other feedback icon. The
icon should be designed properly by designer after.

Bug: 4948171
Change-Id: I00b018e82ca93190fe87443c8ad8911b36551002
2011-08-25 12:23:12 +09:00
Tadashi G. Takaoka
2d306a225c Merge "Extract sudden jumping touch event hack into separate class" 2011-08-23 01:49:38 -07:00
Tadashi G. Takaoka
c403a46f6d Extract sudden jumping touch event hack into separate class
Bug: 5182291
Change-Id: I6a88ed4df3ec98e31ea4966d82da56f7fca342ac
2011-08-23 17:44:41 +09:00
Tadashi G. Takaoka
f9da4c548f Remove password field special handling
Change-Id: Iaf1b4bbb54be7a4cade856d1ba363e976774f442
2011-08-23 16:49:35 +09:00
Tadashi G. Takaoka
d47a955610 Fix suggestions strip text colors
This change also shows the valid typed word in bold face.

Bug: 5161713
Change-Id: I15355a11888fc8ef90ecc8b64a52eb08c1a2b367
2011-08-22 18:56:54 +09:00
Ken Wakasa
d621b73ebb A follow up to Id6e50398
bug: 5151430
Change-Id: I2cc91cc3f426ba1b42a1421344e1183ce35c60e0
2011-08-18 22:23:47 +09:00
Tadashi G. Takaoka
bea6b72106 Get rid of auto correction flash animation in the suggestion strip
This change also reverts I1350ad3d.

Bug: 5156762
Change-Id: I047e75699e8eea02204ad95e12dcc0aefe49ac34
2011-08-16 17:47:23 -07:00
Jean Chalard
7674f869dc Remove the "Touch to correct words" option.
Bug: 5113009
Change-Id: Idc4a464e499a2530f517bf7fa449326779129371
2011-08-15 16:38:00 +09:00
Jean Chalard
ab791d0bbc Revert "Remove the "Touch to correct words" option."
This reverts commit 8e69dd80d8

...since it breaks the build
2011-08-14 23:49:01 -07:00
Jean Chalard
8e69dd80d8 Remove the "Touch to correct words" option.
Bug: 5113009
Change-Id: Iae8a64e22cf618f4533f966feaf0b5a76725d551
2011-08-15 15:02:51 +09:00
Ken Wakasa
bb5504c47d Merge "Get rid of auto correction flash animation in the suggestion strip" 2011-08-12 07:19:50 -07:00
Ken Wakasa
59f5cc8572 Get rid of auto correction flash animation in the suggestion strip
bug: 5156762
Change-Id: I1350ad3d7125f8ecdfc699233ed05e253cc3f010
2011-08-12 23:14:34 +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
Jean Chalard
4ef448ac82 Externalize the dictionary pack's name and settings
Some changes downward the road need Latin IME to know the dictionary
pack by package name. This makes the name an external string.

Bug: 5095140
Change-Id: Ibebf5eb892af19681c18da38955e50dfb573330a
2011-08-11 21:48:59 +09:00
Ken Wakasa
39d2a4c005 Revert Idedaabd1 partially until we have the new auto-correction indicator in TextView
Change-Id: I492f1282590b3aa23682be24dea0bc5a00bd7749
2011-08-09 13:06:49 +09:00
Tadashi G. Takaoka
ae5c736e37 Remove suggestion pane controller from strip
This change also removes speacebar LED to represent auto correction.

Bug: 5023981
Change-Id: Idedaabd147ed608df35cb51769388578a05174a1
2011-08-08 00:15:49 -07:00
Ken Wakasa
cadb2128f5 Fix issues with long-pressing the spacebar
bug: 5114433
Change-Id: I18f2147724a08965147bafe93e11fc86c7c59d33
2011-08-06 16:49:32 +09:00
Tadashi G. Takaoka
60a004f78e Fixed count suggestions strip
Bug: 5023981
Change-Id: I434d23bdfb653989866d3822c978cd929a2b553c
2011-08-05 19:25:36 -07:00
Ken Wakasa
3889462439 Handle non word separators correctly even for the initial letter of a word
bug: 5101114
Change-Id: I0d804c9a500ff000dc06cadad46a2c6c6b8088b2
2011-08-04 12:24:45 +09:00
Tadashi G. Takaoka
a0ac590c8d Merge "Support label with icon key" 2011-08-03 01:56:24 -07: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
272dfe940d Merge "Replace ALT/More with more meaningful key labels" 2011-08-03 01:13:32 -07:00
Ken Wakasa
09578c895d Replace ALT/More with more meaningful key labels
bug: 5113471

Change-Id: I324d24ea28c0ff9246dde2494296dca1dddabb1b
2011-08-03 17:06:13 +09:00
Ken Wakasa
21fa416c43 Revive the missing Settings key on tablets
This is a follow up change to Ieb42fdfa.

bug: 5094401
Change-Id: If78c966ed02fbc9b8c6da726e00424a927349142
2011-08-03 17:00:14 +09: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
Jean Chalard
20cb6e8078 Merge "Remove the systematic bias to the top." 2011-08-01 03:18:49 -07:00
Jean Chalard
d8eceb1231 Remove the systematic bias to the top.
The keyboard used to introduce a systematic bias to the top.
This may have been to compensate an old driver flaw, but it
seems that it is now in the way and causes a lot of mistyped
spaces and backspaces.
This change removes the systematic bias.

Change-Id: Ib65ffba99cbd053d1085d3e6eeaf10a815289fc0
2011-08-01 19:14:14 +09:00
Tadashi G. Takaoka
49e00258b9 Remove '(' from the label of "to symbol" on phone layout
Change-Id: I9261cbba9a04fc25b67dfd5ce4188b7e32f5d8e0
2011-08-01 02:47:03 -07:00
Tadashi G. Takaoka
e00d44d0c8 Show settings and tab key accordingly
Instead of showing a tab key at the position of "period" key, this
change places a tab key on the left side of the space key or on the
mini popup keyboard of the mic/comma key accordingly.

Bug: 4340933
Change-Id: If3cbc6d0b36f74fbc9320d6f433c65c66051dc09
2011-07-31 20:00:00 -07:00
Tadashi G. Takaoka
3712231600 Rename key label and alternates string resource names
Bug: 4340933
Change-Id: I7c80c0b6a8a9082c52b57a858e2b6740c05366ec
2011-07-31 19:00:19 -07:00
Tadashi G. Takaoka
c3afe2c244 Replace the notion of "voice" with "shortcut" as many as possible
Bug: 4340933
Change-Id: I98b4eca5167cc3767a0868fae8f6436164adbe4d
2011-07-31 18:46:44 -07:00
Ken Wakasa
2ba975afb9 Turn off the Settings key by default
bug:5094401
Change-Id: Ieb42fdfa79be2afcfa6634e7404c17737ef6927d
2011-07-31 07:26:24 +09:00
Tadashi G. Takaoka
596600d4ac Tweak long press timeout of language switcher
Previously 1200ms, down to 400ms that is the same value of system
default.

Change-Id: Ia94c6b729893d528ec3f2b961bf2ad22b47fdbb1
2011-07-26 15:02:47 -07: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
Tadashi G. Takaoka
7139335dcd Swap parenthesis-like character code on RTL keyboard
Bug: 5047217
Change-Id: I1b88484825f5c035401cf083522bf95bbee30edb
2011-07-24 18:40:46 -07:00
Ken Wakasa
8f98cdef0e Tidy up the subtype names
Change-Id: I5dbdc6c006fab01fa389f0796b6c87aa2a90132e
2011-07-23 17:42:23 +09:00
Tadashi G. Takaoka
22ed2d3c49 Fix popup mini keyboard of comma key on symbols layout
Bug: 5058762
Change-Id: Ic2d48358b0aceb1d55b3e12bb32b4423ff41ccf3
2011-07-21 00:56:51 -07:00
Tadashi G. Takaoka
5cce2161fb Revert "Add Right-To-Left delete icon"
This reverts commit 886246b19a.

Bug: 5047500
Change-Id: Iefef20b7aeba0dbedfe8f81384a33f65e3907e9f
2011-07-21 00:05:22 -07:00
Tadashi G. Takaoka
426723a9cf Remove Key edge flags from XML
The first key and the last of the row are automatically marked as left
and right edge key respectively.  The existence of Spacer will prevent
those automatic marking.

Bug: 5038844
Change-Id: Ie34169ceaf76e24923b8d8125eda6ecb95cf1fee
2011-07-20 16:56:21 -07: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
1dc80048d7 Merge "Support select input method dialog on pre-HC platform" 2011-07-19 23:22:37 -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
Tadashi G. Takaoka
7c2b3a474f Add Arabic percent sign
Bug: 5046333
Change-Id: I7be8c465ce6be2b78d9e8ece4dc4119941230d97
2011-07-19 18:28:54 -07:00
Tadashi G. Takaoka
98b5c982b9 Trigger IME switcher by long-pressing space key
Long press time out for space key is set to 1000msec.
FYI: Time out for shift key is 1200ms and for mini popup keyboard is 400ms.

Bug: 4971680
Change-Id: Id05f519baa15ca2e54958997ddf7b6b3b7a2d078
2011-07-17 17:23:43 -07:00
Tadashi G. Takaoka
6989e0b804 Update Arabic keyboard
Bug: 4161983
Change-Id: Ie163cd17c87773bf2ca37fff7cff79611fff644f
2011-07-14 01:04:12 -07:00
Tadashi G. Takaoka
1a55286738 Update Hebrew keyboard
Bug: 4170083
Change-Id: I977d7f6cce08e35fe9bed46fe5f4fdedd1f12e9c
2011-07-14 00:30:32 -07:00
Tadashi G. Takaoka
886246b19a Add Right-To-Left delete icon
Bug: 4161983
Bug: 4170083
Change-Id: Ife9a933353e97f3c7c3ede47623dc7528160f3c5
2011-07-12 20:59:20 -07:00
satok
1a3bb54bb4 Use InputMethodSettingsFragment
Bug: 4979539

Change-Id: I4f2010f785eb29ccd42b488c402ef9957633e0c2
2011-07-09 11:25:54 +09:00
Tadashi G. Takaoka
c71854a661 Remove swipe gesture
Bug: 4971680
Change-Id: Ifff27f3bd3dd26417bfcb7072aaba074025b1bb7
2011-07-08 00:00:14 -07:00
Tadashi G. Takaoka
a19b84dcf6 Move key hysteresis distance parameter to KeyDetector class
Bug: 4768084
Change-Id: Ib8771afd7363a4a5590b2b4a586e3014c026be34
2011-07-04 22:32:21 +09:00
Tadashi G. Takaoka
9812fb0fe9 Specify Key gaps by percentage
Change-Id: I4721bf831b5edbea1dd4309c6ce907544b098d62
2011-07-04 15:11:17 +09:00
Tadashi G. Takaoka
e984fb55b1 Slightly larger key for ICS and phone combination
Compatible with Gingerbreada theme.

Change-Id: Id05bb8992dac47a23e12af7ab62924b5bc25b7ca
2011-07-01 22:40:19 +09:00
Tadashi G. Takaoka
3118277dd4 Tweak ICS theme a bit
Change-Id: Ib8f1a712a1fc3fd6f08b336617b4b6a17af11376
2011-07-01 21:11:34 +09:00
Tadashi G. Takaoka
74b6897a12 Adaptive suggestions strip
Bug: 4903845
Change-Id: I9e2e17a9eee72df5c92414dcd4796ed7fe1655e1
2011-07-01 00:46:34 +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
Tadashi G. Takaoka
73d377a953 Merge "Cleanup key drawing code" 2011-06-29 02:40:33 -07:00
Tadashi G. Takaoka
d773bf38a3 Cleanup key drawing code
This change also modifies 9-patch drawables to fix the following
issues.  In order to draw key background drawable just on the
coordinates we want, we have to know where an actual "visible" part is
in the drawable.  The only clue we can use is "padding" of the
drawable.  To achieve this, the 9-patch drawable must have its
"visible" part marked as "content".  Please refer the Bug: 4948171 for
more detailed explanation.

This change also reverts the following "black" drawables back from
Gingerbread because recent change broke these (I70019a91).
  * drawable-hdpi/sym_bkeyboard_*.png
  * drawable-hdpi/btn_keyboard_key_*_stone.9.png

Bug: 4948171
Change-Id: I6e4d03b3144caa95c793aac97af22df34c5f454f
2011-06-29 18:34:57 +09:00
satok
8b0f34dbd3 Remove sliding explanation
Change-Id: Iae35385a3fadd7acc8a67b6a8f9beda9cab96cc9
2011-06-29 18:08:31 +09:00
Tadashi G. Takaoka
49c8567db2 Merge "Use left/right-edge popup preview background" 2011-06-28 00:32:19 -07:00
Tadashi G. Takaoka
d87f28f145 Use left/right-edge popup preview background
Bug: 4902361
Change-Id: Iafbadd0e44c0db2fb6a0875c964304bec6ac8cb0
2011-06-28 16:00:23 +09:00
Tadashi G. Takaoka
87089985b1 Render sliding spacebar language switch arrows by text
Change-Id: Ief1a4f12a3d4840c36aa7a082f44b5b1ff894dd1
2011-06-28 15:58:45 +09:00
Tadashi G. Takaoka
cf9c6ccdc5 Remove unused and unnecessary drawables
Change-Id: I7db0ee5e2aa06bba9b9f340aa6f71412c5a22c9a
2011-06-28 02:39:43 +09:00
Tadashi G. Takaoka
3040c8bcdd Draw popup hint "..." by text rendering
Bug: 4959808
Change-Id: I30456b91852904c6801cbdd6476406fd60e84551
2011-06-28 01:50:26 +09:00
Tadashi G. Takaoka
8aee759262 Remove reference to system theme
This change also introduces
 * Background for space key preview
 * Tune stone theme

Change-Id: I84fca0baf2392582da870d2ff77b3e99c28faf7b
2011-06-27 22:36:04 +09:00
Tadashi G. Takaoka
d8850ae1ab Merge "Draw phone/number keyboard layout witout icon" 2011-06-27 04:17:51 -07:00
Tadashi G. Takaoka
b47319867e Show long suggestion in condensed and ellipsized text
Bug: 4903845
Change-Id: I75d58fb55f81594ebb2628ea21d00c2eb59fa70e
2011-06-27 20:17:08 +09:00
Tadashi G. Takaoka
520a297ad1 Draw phone/number keyboard layout witout icon
This change introduces:

* New KeyboardView attribute
  * keyLargeLetterRatio to specify large letter text size.
  * keyHintLabelRatio to specify hint label text size.
  * keyHintLabelColor to specify hint label text color.
  * keyPreviewTextRatio to specify key preview text size.
* New Key.keyLabelOption flags
  * alignLeftOfCenter, align the key label slightly left of the key center.
  * largeLetter, use keyLargeLetterRatio to draw key letter.
  * hasHintLabel, draw keyHintLabel at the right of key letter.
  * followKeyHintLabelRatio, draw the key label following keyHintLabelRatio size.
* Renames
  * Key.keyHintLetter to keyHintLabel.
  * Key.keylLabelOption fontFixedWidth to fontMonoSpace.
  * Key.keylLabelOption popupHint to hasPopupHint.
* Removes
  * number icon releted attributes and declarations.

Change-Id: I2f456737e3a46209e5f48b5155951b2b21a33859
2011-06-27 20:04:34 +09:00
Ken Wakasa
c79aa482a8 Tiny string fix.
Change-Id: I56dd023b770ffbb85d7be1440301596b77c8d8c2
2011-06-25 00:16:55 +09:00
Tadashi G. Takaoka
87a32135ab Merge "Remove spacebar preview and arrows" 2011-06-24 05:45:09 -07:00
Tadashi G. Takaoka
14daf66fc5 Remove spacebar preview and arrows
Change-Id: I07f1b7bbf222d90e95919304e82d7d054df2868d
2011-06-24 21:41:27 +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
Tadashi G. Takaoka
703e7252ba Fix popup key preview on 7/11 inch tablet
Change-Id: I42b4c0c7a554089baa778205da0627daaff667c6
2011-06-24 08:44:11 +09:00
Tadashi G. Takaoka
1bca5b6e83 Revert "Remove extra spacing from candidate strip to fix extract mode layout"
This reverts commit 177fc54d8c.
Bug: 4904733

Change-Id: I7ab48ea559a9aafa58b1a2847f4398d24e9b1cfb
2011-06-24 07:51:49 +09:00
Adam Powell
177fc54d8c Remove extra spacing from candidate strip to fix extract mode layout
Change-Id: Icb2b7d66196cd7d36bedb11eadad0d743f7c048e
2011-06-23 13:18:11 -07:00
Tadashi G. Takaoka
cd96a691b1 Fix "Show settings key" option on 7" device
Cherry-pic I993ac772 from Honeycomb-MR2.

Bug: 4586882
Change-Id: Ie74138523a3ae7958c7bec674c49aa0ab1a72d05
2011-06-24 00:08:42 +09:00
Tadashi G. Takaoka
9116bf18f9 New IceCreamSandwich assets and theme
This change instroduces new IceCreamSandwich assets and renames
Honeycomb theme to IceCreamSandwich.  Though checked only on
hdpi-phone and mdpi-10"-tablet.

File another bug (Bug: 4852048) to fine tune keyboard layout for all
possible combination of devices and themes.

Bug: 4436327
Change-Id: I4f8dc1dd6b798a39204702bbcbebf17a199dc82f
2011-06-23 21:06:17 +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
a93d27d6b8 Remove colorScheme attribute from KeyboardView
Change-Id: I9de118e8be60b9a6fe1aecc00332ba08872db918
2011-06-22 22:45:03 +09:00
Tadashi G. Takaoka
b947c73dcc Merge "Add German QWERTY keyboard" 2011-06-22 01:52:17 -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
c2a21786e5 Move icon declaration to Keyboard theme
Bug: 4436327
Change-Id: I074014d28dcb323b60dbc8fd9e169c75c393e0b3
2011-06-22 17:44:49 +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
ada37cb4d3 Make auto correction candidate displayed in bold font
Bug: 4724868
Change-Id: I0a77893f7894c4edb226f97c0acea24142c35949
2011-06-18 13:40:49 +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
Tadashi G. Takaoka
28a38fdfee Tab key is shown when editor navigation flag is set
Previously tab key is shown only when the input type variant says that
it is web input.  In addition to that, this change also shows tab key
when the IME option includes editor action (next and/or previous)
flag.

Bug: 3094312
Change-Id: I3f8841fdbcee918a0f93f3259090f24e70d96471
2011-06-17 19:08:49 +09:00
Tadashi G. Takaoka
237af54df5 Tune up 7 inch keyboard layout
Bug: 4479212
Change-Id: I25c48ef474f6198dde9b670b23509c087acae149
2011-06-17 16:27:51 +09:00
Tadashi G. Takaoka
9d9522abdc Add Key.keyHintLabel and remove Key.keyHintIcon
This change also removes manualTemporaryUpperCaseCode and
manualTemporaryUpperCaseHintIcon.  Instead of these keyLabelOption now
has hasUppercaseLetter flag value.

Bug: 4436327
Change-Id: I88fdac1e888a7123735296f5ef45f5fdd565cd2e
2011-06-16 21:24:19 +09:00
Tadashi G. Takaoka
a61967330e Make LatinKeyboard aware of theme
Bug: 4436327
Change-Id: Idecdd470cbb0720b96958039eb11f6978d39629e
2011-06-16 20:10:49 +09:00
Tadashi G. Takaoka
08a6f2aea7 Make CandidateView aware of theme
This change is needed to introduce new theme easily.

Bug: 4436327
Change-Id: Idc368b66d892d9c888ba7a26bfa3527c21678292
2011-06-15 20:02:45 +09:00
Tadashi G. Takaoka
b7758d6f91 Make Keyboard aware of theme
This change is needed to introduce new theme easily. As a starter this
change introduces Keyboard.popupHintIcon attribute and
Key.keyLabelOption.popupHint flag to show popup hint icon that is
previously specified by Key.keyHintIcon attribute.

Bug: 4436327
Change-Id: I6b1c5c1b88eece541141b2d2cedd164ee02e5c2a
2011-06-15 19:51:30 +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
1e273fa6d1 Separate debug information display from candidate view
This change is one of the preparations for suggestion strip redesign.

Bug: 4175031
Change-Id: I82675936773ed6cf132a52486909ff21af828256
2011-06-08 16:59:37 +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
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
a8fd3af67a Merge "Remove web mode and add webInput boolean" 2011-05-27 09:09:30 -07: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