Commit graph

1470 commits

Author SHA1 Message Date
Tadashi G. Takaoka
0462f4dced Fix 10-inch tablet layout
* Fix missing delete key for greek
* Remove shift keys from farsi
* Move delete and enter key down for farsi
* Tweak 3rd-row key position of nordic

Bug: 6422448
Change-Id: I2066c1927f60660513c89615488520f716a15fa5
2012-05-10 19:20:19 +09:00
Tadashi G. Takaoka
60ece5cba5 Merge "Tidy up Hindi 7-inch layouts" into jb-dev 2012-05-10 02:56:16 -07:00
Tadashi G. Takaoka
e6241e2543 Merge "Tidy up Arabic and Farsi 7-inch layouts" into jb-dev 2012-05-10 02:54:20 -07:00
Tadashi G. Takaoka
c44a3e07a3 Merge "Tidy up 11-11-{7,8,9} 7-inch tablet layouts" into jb-dev 2012-05-10 02:54:14 -07:00
Tadashi G. Takaoka
3b7d40f464 Merge "Tidy up 10-10-7 7-inch tablet layouts" into jb-dev 2012-05-10 02:54:08 -07:00
Tadashi G. Takaoka
7aa6c030cf Tidy up Hindi 7-inch layouts
* Remove right shift key from hindi (same as east_slavic)

Bug: 6422448
Change-Id: Icea9a027c825f74471425abea261d5499f02c2c6
2012-05-10 18:50:49 +09:00
Tadashi G. Takaoka
edde070a90 Tidy up Thai 7-inch layouts
* Remove right shift key from thai
* Add comma and period keys

Bug: 6422448
Change-Id: I40ff445ee763d964860fe6eb46e7168534a98c35
2012-05-10 18:36:44 +09:00
Tadashi G. Takaoka
09d942e0da Tidy up Arabic and Farsi 7-inch layouts
* Tweak key width and positon for arabic.
* Move delete and enter key down for farsi.

Bug: 6422448
Change-Id: I4fce1f4761eb1b53e432900c19e455a023721fc6
2012-05-10 18:28:38 +09:00
Tadashi G. Takaoka
2363d0c931 Tidy up 11-11-{7,8,9} 7-inch tablet layouts
* Add gutters between shift keys and letters for nordic
* Slightly narrower 3rd-row letter keys for bulgarian
* Remove "ъ" key from 1st-row of east_slavic
* Remove right shift for 11-11-9 east_slavic and south_slavic

Bug: 6422448
Change-Id: I2311bd475aabda51080f0be3714fabffa65b2009
2012-05-10 18:27:58 +09:00
Tadashi G. Takaoka
4739b21b41 Tidy up 10-10-7 7-inch tablet layouts
Bug: 6422448
Change-Id: I0c1721462572da7be7850d670c4f86d0c18cb610
2012-05-10 18:26:38 +09:00
Tadashi G. Takaoka
5fc2c22d43 Tidy up 10-9-7 7-inch tablet layouts
* Slightly smaller key width and larger shift key and space key.
* Both left and right shift key has the same width.
* Move the 2nd-row slight right.

Bug: 6422448
Change-Id: If27028eaac20c503c352ba35dd156befc53918c7
2012-05-10 15:26:55 +09:00
Tadashi G. Takaoka
bced82709a Merge "Fix calculation of more keys keyboard position based on key preview" into jb-dev 2012-05-09 06:04:47 -07:00
Tadashi G. Takaoka
7ecc1081ab Fix calculation of more keys keyboard position based on key preview
Bug: 6135881
Change-Id: Id1c4e2c13d13b474466cb9b42b425aa9f6f9448b
2012-05-09 21:23:09 +09:00
Tadashi G. Takaoka
465003441f Fix key preview background of GB theme
To match with the requirements of Id1c4e2c1

Bug: 6135881
Change-Id: If877fffb3863101edec2fa96f1fa4ae016c017f1
2012-05-08 17:07:58 +09:00
Tadashi G. Takaoka
47021b7a94 Merge "Preserve enter key's label case" into jb-dev 2012-05-07 21:12:02 -07:00
Tadashi G. Takaoka
a10003281d Preserve enter key's label case
Bug: 6449347
Change-Id: I897df3a3c5464eaccf04c8b1cba70ccf313dd0bb
2012-05-08 12:57:34 +09:00
Tadashi G. Takaoka
7b6afb1287 Enable long-press spacebar on 7 inch tablet
This change also eliminate useless attribute longPressSpaceKeyTimeout
of LatinKeyboardView.

Bug: 6449356
Change-Id: Ib4dace4b9510c0eb96bdddacf8e0dbaa14fcfbbf
2012-05-08 12:50:07 +09:00
Eric Fischer
22d196cb17 Import translations. DO NOT MERGE
Change-Id: Ic65c9b1373f39ff3fde9631e516d56b05eae2d1f
2012-05-07 14:39:45 -07:00
Tadashi G. Takaoka
8e50c5d198 Fix subtype name for a custom input style with en_US and en_GB
This change utilizes "UntranslatableReplacementStringInSubtypeName"
subtype extra value to display keyboard layout name dynamically.

Bug: 6449315
Change-Id: I9ef4c3d66ff9a223aa8c89c346d04cb72e4f6263
2012-05-07 03:25:08 +09:00
Tadashi G. Takaoka
ee8ac602e8 Preserve label case of to-symbol-key
Bug: 6443192
Change-Id: I66c3c13d43c04fef4731ad2b4edabd8cd32f9437
2012-05-06 15:58:17 +09:00
Eric Fischer
a995714184 Import translations. DO NOT MERGE
Change-Id: I5527274e1462dab152b4b3bf907343d22ec0e102
2012-05-03 16:34:22 -07:00
Eric Fischer
558f073311 Import translations. DO NOT MERGE
Change-Id: I4f26fabb1968b81ba8646deb459a2ebd0fc07fe3
2012-05-02 14:50:24 -07:00
Eric Fischer
a1c89d9dbf Import translations. DO NOT MERGE
Change-Id: Ia71f1f0df919691792648da0d4b6eb41edcf5747
2012-05-01 14:12:13 -07:00
Tadashi G. Takaoka
aec1770ed1 Tune letter text size of 7 inch tablet
Bug: 6422086
Bug: 6411272
Change-Id: Ia3c40206555353b6f0c633a529d546dc2379e9aa
2012-05-01 19:56:40 +09:00
Tadashi G. Takaoka
dadcfcf011 Merge "Narrow horizontal gap of 7 inch tablet landscape" into jb-dev 2012-05-01 03:51:20 -07:00
Tadashi G. Takaoka
7995703ded Narrow horizontal gap of 7 inch tablet landscape
Change-Id: I20579d75f5669909efd18a70b47cd44f471fd452
2012-05-01 19:24:48 +09:00
Tadashi G. Takaoka
d780963db7 Auto X scale domain key label
Bug: 6411275
Change-Id: I94906adb6936371f5275a1494f6f8b5546633a2b
2012-05-01 19:21:15 +09:00
Tadashi G. Takaoka
dd5e6e6559 Remove duplicated functional keys
Bug: 6410931
Change-Id: I07e84729da00d335e3864b9324bb1261df8968f7
2012-05-01 19:10:24 +09:00
Tadashi G. Takaoka
d16c838d6e Merge "Remove tab key from alphabet layout of tablet 7" into jb-dev 2012-05-01 03:08:24 -07:00
Tadashi G. Takaoka
ad5c0dc8f0 Remove tab key from alphabet layout of tablet 7
Bug: 6410889
Change-Id: If7269aa2aeb1b6af9f0286f96c48b68309d646c5
2012-05-01 18:47:00 +09:00
Tadashi G. Takaoka
d44c196ae4 Merge "Override defaultActionKeyStyle to use non-blue action background" into jb-dev 2012-05-01 01:33:24 -07:00
Tadashi G. Takaoka
1ecd46189d Merge "Add keyboard bottom padding for 7 inch tablet" into jb-dev 2012-05-01 01:19:29 -07:00
Tadashi G. Takaoka
e02de4b9a9 Override defaultActionKeyStyle to use non-blue action background
Bug: 6412932
Change-Id: I1c7335c53a35fc88694224332511415ea63ac745
2012-05-01 17:19:10 +09:00
Tadashi G. Takaoka
6f953ba202 Add keyboard bottom padding for 7 inch tablet
Bug: 6411451
Change-Id: I183e9dca258aa2b632e486ce1d115d1d7f3d739d
2012-05-01 17:05:21 +09:00
Tadashi G. Takaoka
30ce0c4e64 Merge "Fix CHAR LIMIT of some string resources" into jb-dev 2012-04-30 22:54:23 -07:00
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
ec06215970 Remove tab key from number/phone layout of 7 inch tablet
Bug: 6411288
Bug: 6411588
Bug: 6411840
Change-Id: I44b358ae9c078779d6b1108281c1458387a32948
2012-05-01 12:58:59 +09:00
Tadashi G. Takaoka
3287067185 Remove tab key from phone layout of 7 inch tablet
Bug: 6411288
Change-Id: Ie3836becf787536b7346150008053a985280f61b
2012-05-01 12:15:06 +09:00
Eric Fischer
3bb419ec18 Import translations. DO NOT MERGE
Change-Id: Ie86b666066f353bd16f3c8564111f8c096c32283
2012-04-30 14:22:58 -07:00
Eric Fischer
c0e67ea640 Import translations. DO NOT MERGE
Change-Id: I34b791b8bd756e6e68e6e396e5e02bf8950398a3
2012-04-27 14:16:09 -07:00
Eric Laurent
7570954a18 modifications for new system volume policy.
The new system and UX sound volume policy makes that STREAM_SYSTEM
volume is not fixed anymore. It is tracking STREAM_RING (phones) or
STREAM_MUSIC (tablets) in a constrained range between -24dB and -6dB.

Sound Fx where previously played over STREAM_SYSTEM with a fixed
attenuation of -20dB. The default value of 5% in the keypress sound
volume setting was corresponding to -26dB, meaning 6dB below default.

Modified the default volume value to 50% so that by default, keypress sound
volume varies from -30dB to -12dB which is also 6dB below the other system
sounds.

Change-Id: I146f72275b8e88fdce5ccf8b6dae2903c27f15eb
2012-04-26 18:37:10 -07:00
Eric Fischer
681b7bd8b5 Import translations. DO NOT MERGE
Change-Id: I1df0104d5ec4dac73c45667c621cbb671b44e6df
2012-04-26 16:44:11 -07:00
Tadashi G. Takaoka
18f0d1938a Merge "Show settings key when noMicrophone option is enabled on PC QWERTY" into jb-dev 2012-04-26 01:41:38 -07: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
41398ba265 Show settings key when noMicrophone option is enabled on PC QWERTY
Change-Id: Ib419a597e218af347e5d5da19f5ca8b3db8548c7
2012-04-26 15:20:23 +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
49caddbdab Support PC QWERTY layout
Bug: 4460018
Change-Id: I9a29f6a322af66f6a152fa1883b3686c5f7a3328
2012-04-25 16:34:59 +09:00
Eric Fischer
b4f5c9c088 Import translations. DO NOT MERGE
Change-Id: I17745dd7dbabcc6409361e1b2fa0141ff3f13e09
2012-04-24 14:17:36 -07:00
Tadashi G. Takaoka
bce2c214d1 Use HTML entity for non-ASCII unicode
Change-Id: If8b605778196a5c0a0205ebd49378759027ee265
2012-04-24 18:06:54 +09:00
Tadashi G. Takaoka
3443f52150 Merge "Move functional keys out from rowkeys_symbols{_shift}3." 2012-04-24 00:49:38 -07:00
Tadashi G. Takaoka
ab771b01eb Revert keyHintLetterPadding only to apply horizontally
Partially reverts the Ia3680d84.

Bug: 6356125
Change-Id: I8faa810b833cb98ce6f0f760aa1722e63475cd45
2012-04-24 16:20:47 +09:00
Tadashi G. Takaoka
0b6f6729d2 Move functional keys out from rowkeys_symbols{_shift}3.
Change-Id: Iee5e7e93e5f319551a8ad28c58813c00fc713308
2012-04-24 14:25:27 +09:00
Eric Fischer
7f45ec7bb8 Import translations. DO NOT MERGE
Change-Id: I11d27b3c5c1005bd6679f59804f217640f8d5992
2012-04-23 14:03:26 -07: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
9a7cdb2051 Merge "Remove alt-code-while-typing from tablet" 2012-04-23 09:37:15 -07:00
Tadashi G. Takaoka
0b27e788fe Remove alt-code-while-typing from tablet
Change-Id: I4471d10e3f7c681c27805b966869c0b47508329f
2012-04-23 20:25:16 +09:00
Tadashi G. Takaoka
4849634c70 Separate Hebrew row4 on tablet
Change-Id: Iea17aa7cae60e131d4b5bfeb78d287915fd04164
2012-04-23 16:41:36 +09:00
Tadashi G. Takaoka
5f1d71fbc8 Modularize shortcut key on 10 inch tablet
Change-Id: Ie4cace33f8bcffd092bea7ce2da0cee5a1cbd685
2012-04-23 15:33:59 +09:00
Tadashi G. Takaoka
b560a6cfee Support Colemak layout
Bug: 4460018
Change-Id: I60c3dfaf205c95b92a54022f0256c33f644c8b10
2012-04-23 15:19:37 +09:00
Eric Fischer
7a83ffa45e Import translations. DO NOT MERGE
Change-Id: I901b68d89ab5f04c79b843aa73ec40caa2c1686c
2012-04-20 14:31:48 -07:00
Tadashi G. Takaoka
1b868393fe Merge "Add language switch key to symbols and symbols shifted layout" 2012-04-20 03:30:53 -07:00
Tadashi G. Takaoka
118762b444 Merge "Predefined keyboard layouts are configurable via XML resource" 2012-04-20 03:24:39 -07: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
38026b4f03 Predefined keyboard layouts are configurable via XML resource
Bug: 4460018
Change-Id: Ia03ec826fb3853ea814d9764686903dbe31a6507
2012-04-20 19:19:24 +09:00
Tadashi G. Takaoka
3ee43dccd0 Add language switch key to 7 inch tablet
Bug: 6370443
Change-Id: I4079c4b06de7abd677376094dab341f34aa2d234
2012-04-20 19:01:23 +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
Eric Fischer
9d9b44dc67 Import translations. DO NOT MERGE
Change-Id: I80769f5a263835b74a455905d2789e07c2042f16
2012-04-19 14:26:21 -07: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
344af15674 Change predefined additional subtype format in preference
This change also refactor StringUtils class

Change-Id: Ie0b4d169b21c260bf238d6fcc9ab0ee8bfd6b508
2012-04-19 17:11:21 +09:00
Eric Fischer
d43f7ec1d7 Import translations. DO NOT MERGE
Change-Id: I0e373f7cd2b577cca91e042b7bb48540d5c09a23
2012-04-18 15:25:32 -07:00
Tadashi G. Takaoka
f5a0bd2c28 Make predefined subtype configurable by XML resource
Change-Id: I1f8486a1fb652f1e06789e7bfd2cc57273092234
2012-04-18 22:45:26 +09:00
Jean Chalard
bd2897d86e Fix the build
Change-Id: I128224799835bc3c230fed1afce942650e1396e0
2012-04-18 16:29:01 +09:00
Jean Chalard
b5365eb8f0 Add interesting corrections to the whitelist
Bug: 6096906
Change-Id: I3b8da88c1547fb94a67a280b60c604041c92e65b
2012-04-18 16:08:49 +09:00
Eric Fischer
b9315e9a85 Import translations. DO NOT MERGE
Change-Id: Idd8b8ea44c3b8b5d5dead243fde3189e891f1e9c
2012-04-13 14:40:35 -07: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
45213ed2a6 Polish fade-in/out animations for the gray-out-while-typing keys
Bug: 6326723
Change-Id: Idb6fa023c497cf1f0f584f496e7e5ae82b1c9f4f
2012-04-12 16:43:24 +09:00
Eric Fischer
fad6a2625b Import translations. DO NOT MERGE
Change-Id: Ieadb02a76d86b07b251d3246b3f1355ddfdfc18d
2012-04-11 10:31:56 -07: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
Eric Fischer
7be6ce0fd7 Import translations. DO NOT MERGE
Change-Id: I2d0942b4d3eaf3e62cde5b38034df60c0ac5cd86
2012-04-10 15:16:14 -07: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
Eric Fischer
43822893c9 Import translations. DO NOT MERGE
Change-Id: I3329fe453b8b014ce367e8083ca79bed5b673abb
2012-04-09 15:41:43 -07:00
Tadashi G. Takaoka
264045ef81 Extract keycodes.xml from donottranslate-more-keys.xml
Change-Id: Iaaf47b018b83f3d51dad348a527f17f8d6df21b6
2012-04-09 17:02:40 +09:00
Eric Fischer
fba1656352 Import translations. DO NOT MERGE
Change-Id: Iace23e7e6136ae74812aff021d9f7be4abd629d3
2012-04-06 14:42:37 -07:00
Jean Chalard
fe4807d52f Remove obsolete resources.
Change-Id: If114306037b23da1c0ef29b7de44ba15de078bb5
2012-04-06 20:01:53 +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
Eric Fischer
1cbd8d09dd Import translations. DO NOT MERGE
Change-Id: I9a3d2ce38cab8721064389dd61be6114f6df3f27
2012-04-05 15:59:37 -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
b082c95a2b Use no language "zz" to disable shortcut key
Change-Id: Ifba5bbd4298ecf84cc5e0ebdb4fc8494eafff62e
2012-04-04 14:35:55 +09:00
Tadashi G. Takaoka
23bcd664c0 Update Thai keyboard comment
Bug: 6070772
Change-Id: Iae59e3c34ee4ea8878f17b8d775a2a4cb886718c
2012-04-04 14:15:53 +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