Tadashi G. Takaoka
0b6f6729d2
Move functional keys out from rowkeys_symbols{_shift}3.
...
Change-Id: Iee5e7e93e5f319551a8ad28c58813c00fc713308
2012-04-24 14:25:27 +09:00
Tadashi G. Takaoka
c04075b138
Cleanup <include/> and etc. in keyboard XML
...
* Remove keyXPos and keyWidth from key_*.xml and make it more generic.
* Add keyXPos and keyWidth to <include/> generalized key_*.xml.
* Remove zero width <Spacer/> and fold into successive <include/>.
Change-Id: I4b5c02a165ba0bc9ef8741be0b4938c1efaf5e27
2012-04-24 01:47:03 +09:00
Tadashi G. Takaoka
b560a6cfee
Support Colemak layout
...
Bug: 4460018
Change-Id: I60c3dfaf205c95b92a54022f0256c33f644c8b10
2012-04-23 15:19:37 +09:00
Tadashi G. Takaoka
3ce085079f
Add language switch key to symbols and symbols shifted layout
...
Bug: 6370179
Change-Id: I061559ea5d0cb11a059de4b6e741f9c17ee69a27
2012-04-20 19:24:18 +09:00
Tadashi G. Takaoka
78173bdf53
Support Dvorak layout
...
Bug: 4460018
Change-Id: I08a9b556720f6c4f7089a8838c0869c9f88f479c
2012-04-20 17:28:32 +09:00
Tadashi G. Takaoka
9fa0a2e83f
Modularize keyboard XML files
...
* Remove duplicated xml-sw768dp/keys_apostrophe_dash.xml
* Separate keys_apostrophe_dash.xml to key_apostorhe.xml and
key_dash.ml
* Separate key_space.xml from row_qwerty4.xml
* Separate key_f1.xml from xml{,-sw600dp}/row_qwerty4.xml
* Separate keys_f1f2.xml from xml-sw768dp/row_qwerty4.xml
* Fix incorrectly named rows_symbols{,_shift}4.xml to
row_symbols{,_shift}4.xml
Change-Id: Id71967a016a348174d1fc265b654dbc233c6562e
2012-04-20 16:27:21 +09:00
Tadashi G. Takaoka
6bfd5f6319
Fix confusable "label" usage, use "text" instead
...
* Rename makelabel tool to maketext
* Rename KeyboardLablesSet class to KeyboardTextsSet
* Rename "!label/name" to "!text/name"
Change-Id: Ia9494a89fe56f20ca8e8fedb253adbcf8b771bd3
2012-04-20 15:48:30 +09:00
Tadashi G. Takaoka
cf41aff251
Use string attribute for icon name
...
Change-Id: I336acf33c7e6bc993b9da9b17ec689975fa8127d
2012-04-20 15:31:42 +09:00
Tadashi G. Takaoka
2f16fd40fa
Make KeySpecParser case insensitive
...
Change-Id: I76c3e9179dd8777d3cf3138ad76513d83672debf
2012-04-20 13:20:08 +09:00
Tadashi G. Takaoka
c27fe6253c
Add custom subtype settings
...
Bug: 4460018
Change-Id: I4919d79516dcf574be2761bbaf9adcdc381b2ddc
2012-04-19 19:33:51 +09:00
Tadashi G. Takaoka
c206d04623
Use InputMethodSettingsFragment for IME settings
...
Change-Id: Id6d9cd0ddf99c0687b6d3ea4b2f868f6cf2a0eaf
2012-04-13 19:56:47 +09:00
Tadashi G. Takaoka
f6972561fc
Utilize InputMethodSubtype and additional subtype
...
* Remove de_QY and fr_CH from supported subtypes
* Add de-qwerty and fr-qwertz predefined additional subtypes instead.
Change-Id: I49e8ba0299529302f2b91b4d018b07304cdd6897
2012-04-13 18:36:26 +09:00
Tadashi G. Takaoka
ab0d0d8a02
Add followKeyLabelRatio flag for keyLabelFlags of Key attribute
...
This change renames largeLetter flag to followKeyLargeLetterRatio as
well.
Change-Id: Ida777aac57e4d885fa051654fe863f493f8e946a
2012-04-11 15:53:38 +09:00
Tadashi G. Takaoka
2be51f4fd0
Generate KeyboardLabelsSet from donottranslate-more-keys.xml
...
This change introduces makelabel tool that reads all languages'
donottranslate-more-keys and generate KeyboardLabelsSet.java source
file. The makelabel command must be invoked prior to compile LatinIME.
Change-Id: I7515c7919c535e30f9c80a37bdc831d0f682cd43
2012-04-11 11:23:47 +09:00
Tadashi G. Takaoka
7f0c503afc
Use !icon/<icon_name> notation for more keys spec
...
Change-Id: I616e6c1ac603d2eb7a5c99ec70d5411371d15f3e
2012-04-10 12:01:07 +09:00
Tadashi G. Takaoka
ed3bac91f2
Introduce KeyboardCodesSet.java and remove keycodes.xml
...
Change-Id: Icfd6d06f47425aa037682d22c895548ba6f047d8
2012-04-10 11:53:58 +09:00
Tadashi G. Takaoka
fc169c726a
Merge "Use keyboardSet extra value of subtype to specify layout type"
2012-04-05 19:17:30 -07: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
11d9ee742f
Use keyboardSet extra value of subtype to specify layout type
...
Change-Id: Ice1f345a08a8d760e3b847c885c4072e3e142c97
2012-04-05 17:25:15 +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
Tadashi G. Takaoka
19457316c1
Remove CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED boolean
...
Bug: 6129704
Change-Id: I7643e656c6e7656eff339cc301dd32f34dee83a4
2012-04-02 23:22:49 +09:00
Tadashi G. Takaoka
79dcd270e5
Tweak keyboard layout size a bit
...
* Enlarge 3rd row of phone keyboard slightly for nordic and slavic.
* Fixed the width of the first key of each rows on 10 inch tablet.
Change-Id: I5b1936d7f19db30d2f45aff03a255c2a505a2e7f
2012-04-02 17:26:25 +09:00
Tadashi G. Takaoka
850f3a8525
Merge "Remove digit and Thai digit more keys from shifted Thai keyboard"
2012-04-02 00:36:39 -07:00
Tadashi G. Takaoka
9d3626ae0b
Remove digit and Thai digit more keys from shifted Thai keyboard
...
Bug: 6070772
Change-Id: I21bc0ad3687899bdfa580e2c5c34df500fc174ea
2012-04-02 16:18:52 +09:00
Tadashi G. Takaoka
d5fcc79e4c
Update Hindi keyboard
...
* Remove "U+090E: DEVANAGARI LETTER SHORT E" from 3rd row
* Remove "U+0946: DEVANAGARI VOWEL SIGN SHORT E" from 3rd row
* Remove digit and Devanagari digit more keys from shifted layout
* Replace digit keys on symbol layout with Devanagari digit keys
* Enlarge 3rd row of phone layout slightly
Bug: 5964777
Change-Id: I2a4f85bf11fbec3820a79a026d95c8f73a9cf604
2012-04-02 16:06:19 +09:00
Tadashi G. Takaoka
3224878351
Merge "Add language agnostic QWERTY subtype"
2012-03-30 03:03:55 -07:00
Tadashi G. Takaoka
fb5b4c4fc3
Add language agnostic QWERTY subtype
...
Bug: 6010147
Change-Id: I705e38ac889172ae8b7c2a68e5c688f2ffc28320
2012-03-30 18:20:52 +09:00
Tadashi G. Takaoka
b264de67ea
Remove unused resources
...
Follow up to Ib27f2774
Bug: 6129704
Change-Id: I75b892a5f97270c270441a00f98e6e7ea1abc424
2012-03-30 18:06:09 +09:00
Ken Wakasa
338ba2a236
Merge "Remove the "deprecated" classes"
2012-03-30 01:36:49 -07:00
Ken Wakasa
911b8f9d19
Remove the "deprecated" classes
...
bug: 6129704
Change-Id: Ib27f2774444e1f084b19be3fe6f56d25dffa7084
2012-03-30 16:20:56 +09:00
Tadashi G. Takaoka
478d3fa8bf
Fix settings key on more keys keyboard
...
Bug: 6260868
Change-Id: I0b8113d283fa5d03a02115cd71a5af511982145a
2012-03-30 16:05:25 +09:00
Tadashi G. Takaoka
989abb1295
Cleanup Slavic keyboard resources
...
* Name keylabel_for string based on layout and position
* Move all default resources to individual donottranslate-morekeys.xml
And empty the default resources. This is much easier to maintain
* Rename scandinavian resource name to nordic
Change-Id: I34c43238d0cc4e9773a6d355f73a1fe11589e23e
2012-03-30 10:32:44 +09:00
Tadashi G. Takaoka
499c5e8ad8
Merge "Don't send touch coordinates if proximity characters correction is disabled"
2012-03-29 00:18:28 -07:00
Tadashi G. Takaoka
8dcad2ed47
Don't send touch coordinates if proximity characters correction is disabled
...
Bug: 6225317
Change-Id: I4fa65e020d838f53066d4a071f58fb6f40583e0b
2012-03-29 16:11:54 +09:00
Tadashi G. Takaoka
2b21d68aa9
Change shifted key of quote on AZERTY phone to question mark
...
Bug: 6242861
Change-Id: I8d05d68c2211682d20b0f32966b30212da9f28c7
2012-03-28 22:00:13 +09:00
Tadashi G. Takaoka
e07db71d26
Remove SupportTouchPositionCorrection from subtype extra value
...
Change-Id: Ieedff9ec212f5567405ca276b0f2194132ba7b0c
2012-03-28 19:45:28 +09:00
Tadashi G. Takaoka
5a4f278485
Add Icelandic keyboard
...
Bug: 6150881
Change-Id: I8dedbea96f1bc9de30f5f13b0f3479dd55a33469
2012-03-27 14:26:20 +09:00
Tadashi G. Takaoka
82e43549e4
Merge "Fix Farsi keyboard"
2012-03-26 06:01:01 -07:00
Tadashi G. Takaoka
58d28b1ec9
Fix Farsi keyboard
...
Bug: 5456620
Change-Id: Ia54f084fbc7a238aeda1df234c723d9e675ce62f
2012-03-26 21:44:48 +09:00
Tadashi G. Takaoka
41b33149ea
More readable currency symbol representation
...
Change-Id: Ifc3dc29ba3b827c3a81acf432b04ac02c79207a2
2012-03-26 18:21:48 +09:00
Tadashi G. Takaoka
27bb631f4c
Merge "Add ZWNJ and ZWJ icons"
2012-03-25 23:46:29 -07:00
Tadashi G. Takaoka
39390d3f94
Add ZWNJ and ZWJ icons
...
Bug: 5456620
Change-Id: I7238f41c841803746ca2ab6cd332b2be8498a3ee
2012-03-26 13:05:29 +09:00
Tadashi G. Takaoka
8af62c23ee
Fix Thai Keyboard
...
Bug: 6070772
Change-Id: I0bda4032825cb8bac17d9f800346a77f6903fd30
2012-03-26 10:52:40 +09:00
Tadashi G. Takaoka
5f32a47e45
Support Thai Keyboard
...
Bug: 6070772
Change-Id: Ib7078d062801e17db500f0cd0b4b53d5433b75d1
2012-03-23 16:29:44 +09:00
Tadashi G. Takaoka
9a964ed595
Fix shift locked keyboard layouts of caseless scripts
...
The scripts/languages such as Georgian, Hndi have no notion of case.
In such scripts/language, shift locked keyboard should be the same of
manually shifted keyboard.
Change-Id: Iadea3a332674a52188de7f1566727e4b56dced8c
2012-03-22 16:46:24 +09:00
Tadashi G. Takaoka
53eca32f9e
Support preliminary Hindi Keyboard
...
Bug: 5964777
Change-Id: Id12c75966f6302e6f4ebbd4a8f474e05c601c88a
2012-03-16 17:04:58 +09:00
Tadashi G. Takaoka
f71c2cfb65
ZWNJ key on Persian shouldn't be altCodeWhileTyping key
...
Change-Id: I69301a2c61c2e465058309337672f983669e7967
2012-03-14 10:27:02 +09:00
Tadashi G. Takaoka
fe8555536a
Support Persian Keyboard
...
This is a first trial implementation based on Arabic layout.
Bug: 5456620
Change-Id: Ifa21d7fbd408853a44678623c13b9c078283732c
2012-03-13 22:02:40 +09:00
Tadashi G. Takaoka
fe2dc348e5
Add AZERTY compatible symbols/symbols shifted layouts for tablet
...
This change also adds Spanish compatible symbols/symbols shifted
layouts for tablet.
Bug: 6100832
Change-Id: Ib5ed9856573657b2680e08f9e64fd09b12a0a27d
2012-03-12 17:53:23 +09:00
Tadashi G. Takaoka
47141f7011
Rename keyboard XML files
...
* Slavic to East Slavic
* Serbian to South Slavic
* Scandinavian to Nordic
Bug: 6150183
Change-Id: I8f5641aa07b83cbb225f5fd73e351a6f8abe0784
2012-03-12 16:39:29 +09:00
Tadashi G. Takaoka
2de0c4b754
Merge "Separate Greek semicolon key from row"
2012-03-11 21:01:53 -07:00
Tadashi G. Takaoka
0acfaa77ac
Merge "Breakdown Slavic keyboard into rows"
2012-03-11 21:01:48 -07:00
Tadashi G. Takaoka
b30e719286
Separate Greek semicolon key from row
...
Change-Id: Ie568da868a0bed4f72652cf7475bdeb752be1f5b
2012-03-12 12:30:24 +09:00
Tadashi G. Takaoka
df22f71a16
Merge "Breakdown Serbian keyboard into rows"
2012-03-11 20:06:47 -07:00
Tadashi G. Takaoka
b577005a36
Breakdown Serbian keyboard into rows
...
This change also slightly re-design 7-inch and 10-inch tablet layout
Change-Id: Ibfe11386d865f7c3becf4a60286557921f95036d
2012-03-12 11:30:12 +09:00
Tadashi G. Takaoka
2f85034c5d
Breakdown Slavic keyboard into rows
...
Change-Id: Iff2048839a51e14351ba235ef9d7f5ecbef159e3
2012-03-12 11:29:27 +09:00
Tadashi G. Takaoka
fd7b510b24
Breakdown Hebrew keyboard into rows
...
Change-Id: I25c928a3251424280e2ac4f065126c3019734d20
2012-03-12 10:25:13 +09:00
Tadashi G. Takaoka
d492e2bf8d
Merge "Breakdown Greek keyboard into rows"
2012-03-08 23:37:02 -08:00
Tadashi G. Takaoka
b4fba675f9
Merge "Breakdown Georgian keyboard into rows"
2012-03-08 23:36:55 -08:00
Tadashi G. Takaoka
df0c7711a7
Merge "Breakdown Bulgarian keyboard into rows"
2012-03-08 23:24:57 -08:00
Tadashi G. Takaoka
e955323ae0
Breakdown Greek keyboard into rows
...
Change-Id: I160c0e26058b3841b3820ec95b91d59b295339ca
2012-03-09 16:24:48 +09:00
Tadashi G. Takaoka
d2732d459f
Breakdown Georgian keyboard into rows
...
Change-Id: Id257ea33586e07a91674f654c33003ec2d5aa73d
2012-03-09 16:10:50 +09:00
Tadashi G. Takaoka
258bd90853
Breakdown Bulgarian keyboard into rows
...
Change-Id: Ie0da26a48b186be081ad61858116e519019d1973
2012-03-09 16:00:57 +09:00
Tadashi G. Takaoka
4e67085a15
Breakdown Arabic keyboard into rows
...
Change-Id: Ie2215d8baf501dc7dd87c464deb47fe4267171f6
2012-03-09 15:50:54 +09:00
Tadashi G. Takaoka
9a6ccf9bb0
Merge "Breakdown AZERTY keyboard into rows"
2012-03-08 22:32:24 -08:00
Tadashi G. Takaoka
22375e025b
Breakdown AZERTY keyboard into rows
...
Change-Id: Ibd202d7b141209b3e4310499134522cbd1a8c16c
2012-03-09 15:26:16 +09:00
Tadashi G. Takaoka
85d594a80e
Breakdown QWERTY keyboard into rows and share
...
Change-Id: I0b8ad39120a73395ff5a5b1a32e0f3fe681c062b
2012-03-09 15:02:27 +09:00
Tadashi G. Takaoka
1dba7c2d67
Merge "Split tablet symbols and symbols shifted layout into separated rows"
2012-03-08 21:05:53 -08:00
Tadashi G. Takaoka
174d29f468
Split tablet symbols and symbols shifted layout into separated rows
...
Bug: 6100832
Change-Id: I6771364ceca2c152bd9c55e22159f57c3468cc31
2012-03-09 12:41:56 +09:00
Tadashi G. Takaoka
b1de2912b8
Add ":" to ";" key on Greek keyboard
...
Bug: 5679585
Change-Id: I92d4b4d1eff9561adbb1bae607a1c27b4b5168ba
2012-03-09 12:22:34 +09:00
Tadashi G. Takaoka
9c7db965cd
Fix forgotten resource name change
...
Change-Id: I27ea28c7ea93e50ea8f0d947df95e3ab6d146f11
2012-03-08 21:53:37 +09:00
Tadashi G. Takaoka
e9bfc13bff
Add readable unicode point names
...
Change-Id: I5689711429526a2bad409f235b6825a7ed4c7bc2
2012-03-07 16:35:51 +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
907371b54f
Merge "Change the name of AOSP LatinIME spell checker"
2012-03-04 23:11:46 -08: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
e5cbc94d10
Merge "Support embedded more key"
2012-03-04 22:10:22 -08:00
Tadashi G. Takaoka
e491be6e86
Support embedded more key
...
This is a followup change to Ie10b3e0b.
Change-Id: I1f91d96e32357b83bd0546537d561d638b6ff0c6
2012-03-05 14:22:52 +09:00
Tadashi G. Takaoka
c7b0105114
Suppress more keys that share the same meaning with the parent key's imeAction
...
Bug: 6080806
Change-Id: Ifc3145fd79f10b39442b95432a8d19a624c2fdfd
2012-03-05 12:24:28 +09:00
Tadashi G. Takaoka
13057e7c05
Support Greek Keyboard
...
Bug: 5679585
Change-Id: I540d5ea42a830be8b85440e794cfcee92a23838e
2012-03-02 21:00:38 +09:00
Tadashi G. Takaoka
3a1844c33b
Merge "Support dividers in MoreKeysKeyboard"
2012-03-02 03:58:13 -08:00
Tadashi G. Takaoka
5ef4fccbb9
Support dividers in MoreKeysKeyboard
...
Bug: 6080806
Change-Id: Iacd78c6aab6abf948717d34da7489a79c41316d2
2012-03-02 20:52:25 +09:00
Tadashi G. Takaoka
3790353472
Merge "Support Macedonian Keyboard"
2012-03-02 03:43:46 -08:00
Tadashi G. Takaoka
775d8d8885
Support Macedonian Keyboard
...
This change also fixes missing Cyrillic DJE key of Seribian keyboard
on 10-inch tablet.
Bug: 5934396
Change-Id: I18ae5f0e54f788b65f649a52bdbbef1813334d96
2012-03-02 20:35:44 +09:00
Tadashi G. Takaoka
ede2133cb1
Support time, date, and datetime keyboard
...
Bug: 6030364
Change-Id: I2bd4daf264757d8f3fa7c946d10a39c36ccf5905
2012-03-02 14:01:07 +09:00
Tadashi G. Takaoka
e4c45c6ef9
Explicitly specify that labels might be in more keys
...
Bug: 6080806
Bug: 6081427
Change-Id: I455a0210e65ea2a7774e0e0071cea5f4a99577bd
2012-03-01 20:03:47 +09:00
Tadashi G. Takaoka
9b764e0cc5
Shift+Smiley can register enter in textMultiLine field
...
Bug: 2498607
Change-Id: Ied2217c49665394a01c7d3451a93c0bc647d392f
2012-02-29 17:21:55 +09:00
Tadashi G. Takaoka
8fe892945a
Merge "Add Georgian keyboard"
2012-02-21 23:27:12 -08:00
Tadashi G. Takaoka
0771671a39
Add Georgian keyboard
...
Bug: 5002108
Change-Id: Ia5751181bffc96e2e6c5daed3c7de8408078f91b
2012-02-21 23:24:13 -08:00
Tadashi G. Takaoka
05bfd189a8
Add next/prev navigate action more keys and remove tab key
...
Bug: 6037537
Bug: 5961814
Change-Id: I9c6dedf953452a180fcd5bce7bfadfd3c821f224
2012-02-21 22:50:50 -08: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
Tadashi G. Takaoka
aeeed75848
Support fixed order more keys
...
Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870
2012-02-17 00:49:18 -08:00
Jean Chalard
a252e0547f
Reactivate the bigram prediction option
...
Change-Id: Ib4dcd05c4ecf38bdf3d28371fcd9e2259a59ec0c
2012-02-15 19:25:12 -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
09c677f56a
Replace UTF-8 string resources with their hex representations
...
bug: 5988656
Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
2012-02-11 23:05:23 +09:00
Tadashi G. Takaoka
5962312b07
Custom action label should be a part of keyboard identifier
...
Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
2012-02-08 20:09:39 +09: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
Tadashi G. Takaoka
2affaf91a0
Rename mini keyboard to more keys keyboard
...
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
2012-02-08 16:12:31 +09:00
Tadashi G. Takaoka
c217dc9237
Convert one letter Key.outputText to Key.code
...
This change also uses Key.code instead of Key.outputText for the
variety of parentheses keys taht introduced by I85998f17.
Bug: 5975484
Change-Id: I86879c9942d264edc71e5893325a2f582763d12f
2012-02-07 22:34:20 +09:00
Tadashi G. Takaoka
56d1dc5a58
Shift + smiley key become return key
...
Bug: 2498607
Change-Id: Iec902d8f0035a81e4e793251006d905025bd81cf
2012-02-03 12:28:57 +09:00
Tadashi G. Takaoka
71c695da22
Remove BIDI mirroring hack from Key
...
This change also removes isRtlKeyboard attribute from <Keyboard/>
Bug: 5948247
Change-Id: I85998f17ae146a4c8cd0f419ab820b746cb8974f
2012-02-01 22:58:16 +09:00