Tadashi G. Takaoka
04bc5a369c
Merge "Add KeyboardParams class"
2011-08-01 18:08:17 -07:00
Tadashi G. Takaoka
167e77f170
Use generic interface for filed type of Keyboard
...
This change also re-orders and renames some fields.
Bug: 5023981
Change-Id: I28c1ca7384bb70e3584398cd19ce2276ddfe8541
2011-08-01 17:58:02 -07:00
Tadashi G. Takaoka
4d8eb2e888
Make horigontalGap and verticalGap attributes of Row obsolete
...
Bug: 5023981
Change-Id: Ifb07b54a68cfdd32ff2ea79812188fb6158bd073
2011-08-01 17:45:16 -07:00
Tadashi G. Takaoka
1516d055df
Add KeyboardParams class
...
This object will hold all keyboard parameter while parsing XML file
and act like a Keyboard. After finishing reading XML file, this will be
passed as an argument for the Keyboard class constructor.
Bug: 5023981
Change-Id: I2737b30036b6e4d204e8ed9984a1272e195209be
2011-08-01 17:41:30 -07:00
Tadashi G. Takaoka
723dd753e9
Remove Keyboard reference from Key object
...
Bug: 5023981
Change-Id: Ib0b9debf2018a0a9e9efe9323738e85174589e71
2011-08-01 17:07:45 -07:00
Tadashi G. Takaoka
30479de9e5
Merge "Cleanup key label case adjustment"
2011-08-01 17:04:09 -07:00
Tadashi G. Takaoka
c499866948
Cleanup key label case adjustment
...
Bug: 5023981
Change-Id: Ida06fc6a588c4eb8543455d932e71ac2797d27e5
2011-08-01 16:43:14 -07:00
Tadashi G. Takaoka
b118d4cb58
Cleanup icon drawable related code
...
Bug: 5023981
Change-Id: I729354f32797eef354ec9af8e05f17839f0a361c
2011-08-01 16:37:13 -07:00
Tadashi G. Takaoka
2fe68b9616
Filter non-ascii popup charcters from password keyboard
...
Change-Id: I10885efd317770f892165b6bb059313abf241436
2011-08-01 00:35:59 -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
Tadashi G. Takaoka
83f6ca10d4
Merge "Fix exception message"
2011-07-31 18:43:22 -07:00
Tadashi G. Takaoka
2afc2adb01
Merge "Eliminate "..." from the key that has no popup mini keyboard automatically"
2011-07-31 18:43:17 -07:00
Tadashi G. Takaoka
09430720d5
Fix exception message
...
Bug: 4340933
Change-Id: I81e7b0c72116b5bb56b0fdcd02386288aebd73e7
2011-07-31 18:40:58 -07:00
Tadashi G. Takaoka
0c6e57f2d1
Eliminate "..." from the key that has no popup mini keyboard automatically
...
Bug: 4340933
Change-Id: I08bbdee71f4bc2285fd0c1233d284150be61748e
2011-07-31 18:22:29 -07:00
Tadashi G. Takaoka
73e716f202
Be aware of "nm" and "noMicrophoneKey" private IME option
...
Bug: 4340933
Change-Id: I787108a73d4450963d644bc7070ae1672ebb4455
2011-07-31 18:20:20 -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
97c35650ad
Dismiss key preview regardless of key preview settings
...
Bug: 5099213
Change-Id: Id6c5cb0ae4a07897b34153d4b350b1b45a06aa1a
2011-07-29 19:52:49 -07:00
Tadashi G. Takaoka
364f1fd1f8
Add WindowWidthCache
...
Bug: 4311428
Change-Id: I9f006525c0932d9d49bb8655caf58523135366d7
2011-07-29 18:43:50 -07:00
Tadashi G. Takaoka
0a054dd107
Cleanup KeyboardSwitcher internal a bit
...
Bug: 4311428
Change-Id: Ibe933d0351f750a3a41a08f09befd833d677961b
2011-07-29 17:00:09 -07:00
Ken Wakasa
f12aa77c4b
Merge "Simplifying accessibility code in keyboard's dispatchTouchEvent()"
2011-07-29 01:22:11 -07:00
Tadashi G. Takaoka
5b3c834a9c
Merge "Remove enableShiftLock attribute from KeyboardId"
2011-07-28 17:38:50 -07:00
Tadashi G. Takaoka
6d9bcd5e13
Remove enableShiftLock attribute from KeyboardId
...
This change is a follow up of Ia72de236.
Bug: 4311428
Change-Id: I0ad0f1fb93545ceb40df8dffe377240b020c2602
2011-07-28 17:25:44 -07:00
Tadashi G. Takaoka
34400204a5
Merge "Remove unused method"
2011-07-28 15:42:53 -07:00
Tadashi G. Takaoka
b9538bc447
Merge "Fix that long pressing shift on symbol keyboard registers caps lock code"
2011-07-28 15:27:40 -07:00
Tadashi G. Takaoka
d4b533774d
Remove unused method
...
Bug: 4521802
Change-Id: Iae649f8b77b3bb144ee7eedbb6545e237fa79a17
2011-07-28 15:24:46 -07:00
Tadashi G. Takaoka
851c3267d4
Fix that long pressing shift on symbol keyboard registers caps lock code
...
Bug: 5088376
Change-Id: I586a9fb685f3443aa22fd877df52b36247c4f858
2011-07-28 12:04:35 -07:00
Alan Viverette
65a898d9ef
Simplifying accessibility code in keyboard's dispatchTouchEvent()
...
Change-Id: Ie33cf93ee2d7eadad38ca170aa8ad988bb0ae9a9
2011-07-28 11:55:45 -07:00
Tadashi G. Takaoka
c3d175c01f
Fix wrong keyboard width when orientation has changed while IME is not shown
...
Bug: 5084021
Change-Id: Ie42da40b8249eaf9cf29707058906949278eff6a
2011-07-28 11:02:29 -07:00
Tadashi G. Takaoka
0a5345c7b6
Fix NPE
...
Bug: 5086698
Change-Id: Iaa3082649344722bd643c49c9d151df754d6e337
2011-07-27 15:37:42 -07:00
Tadashi G. Takaoka
60ccbe16ee
Clean up keyboard loading and switching
...
Bug: 4311428
Change-Id: Ia72de23634f824d82b7b5f2267d439ce922a3b57
2011-07-27 13:34:16 -07:00
Ken Wakasa
3ca85794a0
Merge "Fixed duplicate call to dispatchOnPopulateAccessibilityEvent()"
2011-07-26 15:15:34 -07:00
Tadashi G. Takaoka
4692af50da
Support multiple key preview
...
Bug: 4298393
Change-Id: Ibd3681f7255c85e3602e1af4ace8f8e7fce3fb06
2011-07-26 14:55:19 -07:00
Alan Viverette
586a15c3f0
Fixed duplicate call to dispatchOnPopulateAccessibilityEvent()
...
Bug: 5060194
Change-Id: I585ae52204a045fa3941e846b4f9bdd7d541bea6
2011-07-26 14:06:26 -07:00
Tadashi G. Takaoka
9ec80d9d89
Make PointerTracker aware of that popup panel is showing
...
Bug: 5070598
Change-Id: I0604287b8c373e4763b4ccf88c0bd7235af907d5
2011-07-26 10:22:07 -07:00
Ken Wakasa
e9d74adcc8
Merge "Take care of bidi-mirrored characters in suggestion strip as well"
2011-07-25 15:59:18 -07:00
Ken Wakasa
83ffff2a49
Take care of bidi-mirrored characters in suggestion strip as well
...
Follow up to I1b884848
bug: 5047217
Change-Id: I18b9962c4943363bae88009354fcc75ab60ad2ba
2011-07-26 07:55:12 +09:00
Tadashi G. Takaoka
34ce778802
Add Bidi-Mirrored letter list link as comment
...
Bug: 5047217
Change-Id: I29449892803c5150726aebfe97ecef6d481e1e97
2011-07-25 15:00:55 -07: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
Tadashi G. Takaoka
d3002aa8cd
Merge key preview handling into key graphics handling
...
Change-Id: I7b0ba38d833362817c607f6abffbaf0a07f52832
2011-07-23 02:23:24 -07:00
Tadashi G. Takaoka
cce61aa045
Merge "Refactor Keyboard and KeyboardView resizing and drawing code"
2011-07-22 18:41:23 -07:00
Tadashi G. Takaoka
38f55b36c3
Refactor Keyboard and KeyboardView resizing and drawing code
...
Bug: 4311428
Change-Id: Ice4050f92c8f3cec1bec2074fe6a913d04f50524
2011-07-22 16:50:53 -07:00
Tadashi G. Takaoka
255486a5d0
Disable VoiceInputLogger inside LatinIME
...
Bug: 4985273
Change-Id: I6c70e50a58be0973f78c6a1abc1fb4eac5449c0b
2011-07-22 02:37:56 -07:00
Tadashi G. Takaoka
68ff3a0a8b
Merge "Fix missing right edge flag"
2011-07-21 14:59:50 -07:00
Tadashi G. Takaoka
419b90fe86
Fix missing right edge flag
...
Bug: 5062972
Change-Id: I2daffdd58802c6173696fe2417e6efcbef66d7bf
2011-07-21 14:32:16 -07:00
Ken Wakasa
035f0f5c94
Fix NPE
...
bug: 5054162
Change-Id: I69d308f0eeb32968515100dde98ad51a7c35020e
2011-07-22 06:14:22 +09:00
Tadashi G. Takaoka
b880731620
Merge "Revert "Add Right-To-Left delete icon""
2011-07-21 00:45:08 -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
6ffb827ad5
Fix centering key icon when visual inset is specified
...
Change-Id: Iae9cb87cc341a88fab269b629aa45c77adf232be
2011-07-20 19:05:27 -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
89bb88f61c
Revert "Keep keyboard layout while orientation change"
...
This reverts commit 8ebbe03fed
.
Bug: 5037466
2011-07-19 18:13:22 -07:00
Jean Chalard
2b4eabed2b
Allow double-space-period after relevant punctuation signs.
...
This allows the user to enter a period via double-space after quotes,
currency symbols, brackets and other non-sentence-finishing
punctuation marks.
Bug: 3430389
Change-Id: Ibe40b3902861207eb918e7be6113e8be12216f53
2011-07-19 16:12:24 +09:00
Tadashi G. Takaoka
fa9f4d1bad
Merge "Trigger IME switcher by long-pressing space key"
2011-07-17 17:34:57 -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
f0d6058b9e
Fix NPE
...
Bug: 5030817
Change-Id: I13133abb308d9f0c8169b6ea3fc0913ce5dda3d6
2011-07-17 16:37:01 -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
5c73ed628b
Move PointerTrackerQueue into PointerTracker
...
Bug: 4768084
Change-Id: I1be83b38c48147827c871c92e17d37da3aeb0f95
2011-07-12 23:35:23 -07:00
Tadashi G. Takaoka
e0d3922ba3
Merge "Fix mini keyboard behavior while chording input"
2011-07-12 21:53:48 -07:00
Tadashi G. Takaoka
63c233ab9f
Fix mini keyboard behavior while chording input
...
This change makes PopupMiniKeyboardView based on KeyboardView, so that
only LatinKeyboardBaseView can manage touch event and PointerTracker.
Bug: 4768084
Change-Id: Id30b132f1fae45da6e79ce822745cf0a653b8eb3
2011-07-12 21:52:49 -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
8275fb0a1a
Merge "Create proximity info just after parsing keyboard layouts"
2011-07-12 00:57:06 -07:00
satok
0d5494c66a
Create proximity info just after parsing keyboard layouts
...
Bug: 4807069
Change-Id: Ic18b2fc526efec58510841884a949a1a0201e7f5
2011-07-12 16:52:02 +09:00
Tadashi G. Takaoka
1fa878339e
Merge "Fix event handling on non-distinct multi touch device"
2011-07-11 19:07:22 -07:00
Tadashi G. Takaoka
8ebbe03fed
Keep keyboard layout while orientation change
...
This change can retain symbols layout only, can't retain shift or
shift lock state of the keyboard.
Bug: 4311428
Change-Id: I6248ed9a6d762e1ca4b72e391fdca9bc9f55ac35
2011-07-11 18:16:14 -07:00
Tadashi G. Takaoka
04dec7f84d
Fix event handling on non-distinct multi touch device
...
This bug has been introduced by Idfbc9706.
Bug: 4768084
Change-Id: If9e2a2d3ed1f6b4e6209c883e6fcca52286ede3f
2011-07-11 17:03:12 -07:00
Tadashi G. Takaoka
f426cdd5c6
Add KeyEventHandler interface
...
This change also revert KeyboardView to non-abstract class.
Bug: 4768084
Change-Id: I827defb58bfb28b345464f6a89aa4438e41cf1e2
2011-07-10 19:48:14 -07:00
Tadashi G. Takaoka
0efe174ea4
Pass KeyboardView to PointerTracker on down event
...
Bug: 4768084
Change-Id: I446b98daef8c9ec2408481e59cb2a88754ef9e01
2011-07-10 18:06:42 -07:00
Tadashi G. Takaoka
3fdae97417
Move processing MotionEvent out from PointerTracker
...
Bug: 4768084
Change-Id: Idfbc9706f9daeaa979edeee9064cb69326bd3bbc
2011-07-08 21:19:16 -07:00
Tadashi G. Takaoka
2321caa1f9
Narrower key timer handler static inner class to TimerProxy interface
...
Bug: 4768084
Change-Id: I8fdff864d09321b44d56a6a32e10aec3f0f5a4d1
2011-07-08 19:15:16 -07:00
Tadashi G. Takaoka
8a995157f3
Merge PointerTrackerKeyState into PointerTracker
...
Bug: 4768084
Change-Id: I0be0e07bff2542db6ba764dcb13505dfbff6994e
2011-07-08 16:26:11 -07:00
Tadashi G. Takaoka
a9f69513df
Merge "Remove swipe gesture"
2011-07-08 00:06:25 -07:00
Tadashi G. Takaoka
c71854a661
Remove swipe gesture
...
Bug: 4971680
Change-Id: Ifff27f3bd3dd26417bfcb7072aaba074025b1bb7
2011-07-08 00:00:14 -07:00
Tadashi G. Takaoka
5a7a696aff
Let KeyDetector hold Keyboard
...
Bug: 4768084
Change-Id: Ia28d6971fc59086dd4e6fedc9fd1b50f13b59854
2011-07-07 23:31:04 -07:00
Tadashi G. Takaoka
1c9817f0e6
Remove stale TODO comments
...
Change-Id: I800e25ca1ecfb11580decd1de147b3f3ae5defb0
2011-07-07 22:51:12 -07:00
Tadashi G. Takaoka
48f989dee5
Merge "Override onSizeChanged only on main keyboard view"
2011-07-07 22:33:44 -07:00
Tadashi G. Takaoka
bb4be5444b
Override onSizeChanged only on main keyboard view
...
Bug: 4768084
Change-Id: I555efbd1bf75691a3a2724e9d9c1a9055039aacc
2011-07-07 22:02:17 -07:00
Tadashi G. Takaoka
906f03121b
Holding PointerTrackerQueue inside PointerTracker
...
Bug: 4768084
Change-Id: Id5006e549c4018a656abd088f14a209415baafed
2011-07-07 17:16:35 -07:00
Tadashi G. Takaoka
f60d09ac30
Narrower KeyboardView reference
...
This change also rename static inner class to more readable name and
get rid of unnecessary object reference from PointerTracker.
Bug: 4768084
Change-Id: Ie4e2b940d66b47d41efcae7eeac853cdae2e4d38
2011-07-04 22:42:48 +09: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
5f6816fa8b
Move keyboard event handling code to separate LatinKeyboardBaseView class
...
To sort out the issue, main keyboard and mini keyboard have to share
the pointer trackers.
In order to prepare for that, KeyboardView needs to be refactored as
two separate classes. KeyboardView is responsible for drawing keyboard
visual. And LatinKeyboardBaseView is responsible for handling key
event and mini keyboard as well.
Bug: 4768084
Change-Id: I5643e333b9bdfde0c939a0693cea76bd22f38897
2011-07-04 18:53:50 +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
e5276b39c1
Remove top padding parameter from MiniKeyboardBuilder constructor
...
To keep unit test simple, instead of specifying top padding in
the constructor, make separate setter for it.
Change-Id: I8870622cc1bd97420637b8c465bdb6c9dd366062
2011-07-02 02:06:33 +09:00
Tadashi G. Takaoka
17a1676e72
Add top padding to mini keyboard
...
Because Key only has bottom padding, to make mini keyboard vertically
symmetric and looks nicer, we should add mini keyboard top padding
that equals to Key bottom padding (a.k.a. vertical gap).
Change-Id: Icceb687d50edfa48e0f0830a60a1e230836c982f
2011-07-01 23:02:47 +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
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
Tadashi G. Takaoka
670e1c6b71
Add visual debug mode
...
Change-Id: Ife131a398c0753b5b0e6e8969fe7bbc2a3bdab96
2011-06-28 19:13:52 +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
d44160d253
Merge "Draw popup hint "..." by text rendering"
2011-06-27 09:53:25 -07: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
660d42fb36
Remove mInForeground flag from KeyboardView
...
Instead of that, added cancelAllMessages() and call it from
onFinishInputView().
Change-Id: I58f6f0931ed8d73441d80d9616ba3afbbbe38e05
2011-06-28 01:00:59 +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
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
4f0d290c5d
Avoid memory leak by by non-static Handler inner classes
...
bug: 4901934
Change-Id: I870ab2e621ef3640a84468f09c074cdd726dc963
2011-06-26 00:14:40 +09:00
Tadashi G. Takaoka
14daf66fc5
Remove spacebar preview and arrows
...
Change-Id: I07f1b7bbf222d90e95919304e82d7d054df2868d
2011-06-24 21:41:27 +09:00
Ken Wakasa
52344a0788
Fix NPE with the unit test
...
Change-Id: I0836f8b7191287bcff65cdc8a8ce0ff7484e9f65
2011-06-24 15:31:09 +09:00
Tadashi G. Takaoka
2442e77985
Display suggested word info in debug mode
...
Bug: 4686782
Change-Id: I0e5bef33aa39c3d6f75edda7818524965aa40b79
2011-06-24 14:19:59 +09:00