Commit graph

1530 commits

Author SHA1 Message Date
Tadashi G. Takaoka
0bae2ab460 Refactor KeyboardTextsSet class
Change-Id: I0b48c85aa2c291e1e7ee25d61c558700fc677e29
2014-01-31 16:31:07 +09:00
Yohei Yukawa
94797fb3a6 Introduce a delay for key-press feedback on the Emoji palette
Currently key-press effect such as highlight and vibration
occur even when a user want to scroll the Emoji palette.
To mitigate this situation, this patch introduces a short delay
for key-press feedback on the Emoji palette.

This is not an ideal solution but should be better than now.

BUG: 11103083
Change-Id: I1fa4514d742eb37f36fef60e6beabbc5eaa1653a
2014-01-31 15:48:10 +09:00
Tadashi G. Takaoka
d245f6c9e2 Move arrayAsList method to CollectionUtils
Change-Id: If7c1eb7c802490f19c5d3b81d714362408daf376
2014-01-31 15:26:05 +09:00
Tadashi G. Takaoka
639bf62e4f Move some methods to StringUtils
Change-Id: I29d87fdd65ec879d1c0bdf7e7792a677687c1693
2014-01-31 14:49:36 +09:00
Tadashi G. Takaoka
d432892f0c Fix Farsi keyboard comma and period
Bug: 12807701
Change-Id: I49503e9945d97e13d7cc98f54ca071cb935d1e52
2014-01-30 15:45:23 +09:00
Yohei Yukawa
576f8a5b72 Fix inconsistent behavior with the back-to-the-main-keyboard key
With this patch, the back-to-the-main-keyboard in the Emoji
palette will be registered as a key-release action instead of
a key-press action, like switch-to-the-emoji-palette in the
main layout. This provides mroe consistent UX when the layout is
switched from the main layout to the Emoji palette then
switched back to the main layout.

BUG: 12464067
Change-Id: Ia0d0185db43234dfcfb7cee2677f3d199fe6ed96
2014-01-28 19:30:27 +09:00
Yohei Yukawa
0e04c24a05 Fix inconsistent behavior with the spacebar on the Emoji pallete.
On the Emoji palette, unlike other layouts, a user could not
cancel events by moving the finger away from the spacebar.

With this patch, the actual handler of the spacebar will be
registered as onClick event, which will not occur when the user
cancel the event.

Bug: 12464067
Change-Id: I7e7e11ae5f17073e5d92116adca0702579d3ae9c
2014-01-28 13:44:31 +09:00
Yohei Yukawa
0b58617951 Merge "Fix inconsistent behavior with backspace in the Emoji pallete." 2014-01-27 08:11:51 +00:00
Yohei Yukawa
ea8c1c811c Fix inconsistent behavior with backspace in the Emoji pallete.
In some ways, the delete key on the Emoji palette was
inconsistent with that in other keyboard layouts.
- It deletes a character in down events, not up events.
- A user cannot cancel the event by moving the finger away from
  the key.

This patch fixes these inconsistencies by revisin
EmojiPalettesView.DeleteKeyOnTouchListener. Notable changes are:
- An explicit state machine is introduced because there are
  different event sequences to be considered.
- Background thread is replaced with CountDownTimer so tha
  key-repeat events can be naturally generated in the UI thread.
- MotionEvent.ACTION_MOVE is now handled to cancel the
  subsequent delete key events when the finger is moved away
  from the key area.

Bug: 12464067
Change-Id: Ibc360a1394afef368a8d9af7b4c0e99e8ce1d83c
2014-01-27 16:24:51 +09:00
Jean Chalard
1d6e647ac3 [IL69.1] Move a static method to a utility class.
This is a followup to IL69.

Change-Id: Iba154517aa7f75b9f16aa1b808c0da8d84be837f
2014-01-24 11:59:23 +09:00
Jean Chalard
a91dfff5e5 [IL65] Pull up X,Y processing, step 4
This works because getKey{X,Y} is a no-op on
Constants.NOT_A_COORDINATE.

Bug: 8636060
Change-Id: I2f7dd96b6011f094110f7978f8ff24ef2a6e2585
2014-01-22 14:44:27 +09:00
Yohei Yukawa
6c326caa4f A style fix
Just a style fix to follow up the previous commit.

BUG: 11439600
Change-Id: Ib7a4654627a6fc22d86f2097f86f001bd76426e9
2014-01-09 15:54:47 +09:00
Yohei Yukawa
c1f2986a72 Merge "Trigger haptic feedback at touch down on the EmojiPalettesView" 2014-01-09 05:19:37 +00:00
Jean Chalard
5cbda70956 Fix a bug where changing auto-shift would cancel autorepeat.
Bug: 12453966
Change-Id: Idd65f732e2de0a7309e08315893c28cca63732c5
2014-01-09 12:57:10 +09:00
Yohei Yukawa
df10aeb1da Trigger haptic feedback at touch down on the EmojiPalettesView
EmojiPalettesView triggers the haptic feedback at the timing of touch-up rather than touch-down.
This patch set changes the timing to touch-up so that the UX on the EmojiPalettesView can be consistent with normal keyboard layouts.

This patch set also fixes the missing haptic feedback from facemarks such as ":-)".

Bug: 11439600
Change-Id: I22245946712bd1c36226786d6ff81e3b563f7ef7
2014-01-09 12:27:31 +09:00
Tadashi G. Takaoka
ad78058a93 Rename InputPointers.addPointer and ResizableIntArray.add
Change-Id: I5580250c91b29f93ed886b080ce33845b3b67ace
2014-01-08 14:30:21 +09:00
Tadashi G. Takaoka
4a4b6d42a7 Add BatchInputArbiter
Move the logic that determines how to handle gesture typing from
PointerTracker to BatchInputArbiter class.

This change must be checked in together with Ia7db8f4fb7.

Change-Id: I5e9f786de58d8a3cb0407ae562af707710ec37fb
2013-12-26 14:09:57 +09:00
Tadashi G. Takaoka
c3fe1425a5 Separate GestureStrokeDrawingPoints from GestureStrokeRecognitionPoints
This change must be checked in together with Ibed5330614.

Change-Id: I20ba79fd20e8ea0aa3ac596c011ec5bfea528ace
2013-12-25 15:19:00 +09:00
Tadashi G. Takaoka
e2a6253cb5 Rename gesture related classes
Change-Id: I5cb03576bb7221f1864e157857d872880a0a58f8
2013-12-25 11:52:54 +09:00
Tadashi G. Takaoka
afca1ddd23 Comprehensive memory deallocation
Change-Id: I4673543c96eb342c3c977e00d44772a0d719a23e
2013-12-24 18:26:55 +09:00
Tadashi G. Takaoka
cf915ddc87 Rename classes related to AbstractDrawingPreview
Change-Id: Ife2e2c08b2b6fbf9ec33cf259f276878816b291c
2013-12-24 18:17:00 +09:00
Tadashi G. Takaoka
e82200787c Separate GestureStrokePreviewParams to top level class
Change-Id: I4c6ac12dac9636760128625bb5b7138b7d56f3d1
2013-12-24 17:27:15 +09:00
Tadashi G. Takaoka
c845d4c664 Make GestureStrokeParams as a top level class
Change-Id: I540a2d3a6c6ce6ecdcccecd38df6b3c23fcf8d95
2013-12-24 15:29:10 +09:00
Tadashi G. Takaoka
904866c701 Clean up batch input related code a bit
Change-Id: I3b6a95fdb82bd15e2b636b1374a96d8987d5d8cf
2013-12-24 14:24:27 +09:00
Tadashi G. Takaoka
aa7a68a3e0 Remove duplicate code
Change-Id: Ia33ea2dc4bb063ec5bf282c656ccc1f11ac967fe
2013-12-24 12:39:16 +09:00
Tadashi G. Takaoka
f405c58c09 Merge "Use config_screen_metrics resource in BogusMoveEventDetector" 2013-12-20 09:03:25 +00:00
Tadashi G. Takaoka
9c4de1e5f7 Use config_screen_metrics resource in BogusMoveEventDetector
Change-Id: I6b957b43c6dd7ce4f639e46d248179662c1ee669
2013-12-20 17:35:19 +09:00
Tadashi G. Takaoka
a00838b6e8 Separate logic of enabling gesture typing
Change-Id: I91fc566f24a38a55d2352201d5d581d3fa02a428
2013-12-20 16:37:17 +09:00
Tadashi G. Takaoka
c986d16e8a Separate BogusMoveEventDetector class
Change-Id: I24f0ff385f338ff313ef32514f2930f120183be7
2013-12-20 16:17:41 +09:00
Tadashi G. Takaoka
5045103d61 Separate TypingTimeRecorder class
Change-Id: Ic56d3e3a1be935854dcace36d8a05a9d2619dab9
2013-12-20 16:14:26 +09:00
Tadashi G. Takaoka
921a32f0a9 Remove unnecessary default KeyDetector from PointerTracker
Change-Id: Ib0fbb40a7040202d2a4b4ab49319d9e247a2a6ce
2013-12-20 15:34:54 +09:00
Tadashi G. Takaoka
081989ca30 Remove unused default object of GestureStrokePreviewParams
This change also fixes build broken by Id615556766.

Change-Id: I16605cc3b65e3e9ab2d5a498825c31d9b4046b73
2013-12-20 15:25:24 +09:00
Tadashi G. Takaoka
6e97efef78 Fix rugged gesture trail
Bug: 12222472
Change-Id: Id615556766718a8bd4848f7026833fbcea540c39
2013-12-20 14:40:18 +09:00
Tadashi G. Takaoka
6a23b9e3d5 Remove PointerTracker reference from accessibility package
Change-Id: I1a88d9fc4db437070778ea1256aae17c32428729
2013-12-20 12:29:25 +09:00
Tadashi G. Takaoka
dd4937848a Fix typo in varibale name
Change-Id: I7ea6c59b7c980e93c88a6cf0fef97592d411c3ba
2013-12-17 12:15:02 +09:00
Tadashi G. Takaoka
fcacde3dad Revise Armenian punctuations more keys
Bug: 12096943
Change-Id: Ib8559f030fbc27ec7f7e9a9fb36aad72cca29e9f
2013-12-17 11:12:33 +09:00
Tadashi G. Takaoka
3aeb6a9d0d Merge "Refactor touch event forwarding in InputView" 2013-12-17 02:04:40 +00:00
Tadashi G. Takaoka
27fab2cc2a Refactor touch event forwarding in InputView
Bug: 10010128
Change-Id: I82aa4ce847e66cb1241678f39b47b9e27a0f555a
2013-12-17 08:49:50 +09:00
Tadashi G. Takaoka
7f8345d59a Fix IllegalStateException of ViewGroup
Bug: 10629042
Change-Id: I111d092fb2f7dca47328127a155c981aa1c55906
2013-12-16 17:06:23 +09:00
Tadashi G. Takaoka
1b5b0a3ebc Cancel long press shift key while chording input
Bug: 12123508
Change-Id: I693caad1f8ee47ebeb14419603d1fc29f6263a75
2013-12-16 15:30:41 +09:00
Ken Wakasa
2c25c7c9e1 Fix locale names in the make-keyboard-text tool
Change-Id: I33c3fafcff124bb94e395cc604ce264daad55d2d
2013-12-14 18:50:57 +09:00
Jean Chalard
f3d281b775 Merge "Fix a bug where recapitalize prevents going to more syms" 2013-12-13 10:38:18 +00:00
Jean Chalard
5d98e1d82e Fix a bug where recapitalize prevents going to more syms
Bug: 11004973
Change-Id: I97ee9df6e8464e2149beb41c688cbfbd83ac3d8c
2013-12-13 19:21:49 +09:00
Tadashi G. Takaoka
815a339201 Fix key top letter color in shifted layout
There is a chance to have an empty hint label even though
keyLabelFlags has hasShiftedLetterHint flag.

Change-Id: I63b9fcc42a40391d5902814cae4c75abb61e4b94
2013-12-13 18:34:30 +09:00
Ken Wakasa
2fa3693c26 Reset to 9bd6dac470
The bulk merge from -bayo to klp-dev should not have been merged to master.

Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
2013-12-13 17:13:32 +09:00
Tadashi G. Takaoka
2eea2d5007 Update Color Scheme summary explicitly
Bug: 11622614
Change-Id: I5464054425e4d688eaa39f96ba9a3a3c613c6f42
2013-11-22 17:26:59 -08:00
Tadashi G. Takaoka
db86a6f271 Add keyboard color switch option
Bug: 11622614
Change-Id: I25aa1ff7376fe72fd94ab2cb7190c61d7a98a1af
2013-11-22 17:26:33 -08:00
Tadashi G. Takaoka
51352009b5 Add JB/ICS resources from Azuki MR1 release
Bug: 11622614
Change-Id: I126fc42dd31e912788db0446b67a9d4ea80f848e
2013-11-22 17:26:26 -08:00
Tadashi G. Takaoka
fe5262a70d Rename KLP theme related resources
Bug: 11622614
Change-Id: I4e390aa263349d730b47502d84e4d528e7f5ce71
2013-11-22 17:26:17 -08:00
Tadashi G. Takaoka
d5e6044ded Rename KLP/JB/ICS common resource name suffixes to _holo
Bug: 11622614
Change-Id: I53b5ff8b6627a38aef352855ad024213a450b40f
2013-11-22 17:26:08 -08:00
Tadashi G. Takaoka
d7d6088130 Revert back punctuations to the more keys keyboard of the period
Cherry-pick I157164910f from Master.

Bug: 11621857
Change-Id: I0fd0496e9091165280f34b4640ff0e524e3847b9
2013-11-12 17:51:54 +09:00
Jean Chalard
7da2295328 Fix a bug where autoshift would be ignored coming from emoji
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-22 05:23:47 -07:00
Satoshi Kataoka
6d91503727 Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev 2013-10-11 11:53:07 +00:00
Jean Chalard
6fc15b9fc4 Fix a bug where emojis would remove the suggestion strip.
Bug: 11163495
Change-Id: I23d12c430125cc2a66a6e00715a4c609bb9e2bb1
2013-10-11 20:51:13 +09:00
Satoshi Kataoka
7611af753a Merge "Do not merge. Save / restore the last used emoji category" into klp-dev 2013-10-11 07:21:35 +00:00
Satoshi Kataoka
7d3f53a1cb Do not merge. Save / restore the last used emoji category
Bug: 11029983
Change-Id: I5547910c7b5dd7974292fc075af33568940f4e81
2013-10-11 16:05:38 +09:00
Ken Wakasa
6dac27eeb4 Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev 2013-10-10 03:39:30 +00:00
Satoshi Kataoka
3a9ae65525 Tweak vertical gap of Emoji palette. DO NOT MERGE
cherrypick of I8163568a9d7f9d321148001e161c672f78796c96

Bug: 11140087
Change-Id: Ifd28f3017a8cf568a8c4a1045811564a129d85b7
2013-10-10 11:29:08 +09:00
Satoshi Kataoka
557a0935d4 Retry to tweak punctuations. DO NOT MERGE
cherrypick of I9ffc457ca44bccfa3eb3bdb0c26535d795215b26

Bug: 11130808
Change-Id: I1a65fd8acc4efe9b4e4786a3dc959498ae63c2f8
2013-10-10 11:14:37 +09:00
Satoshi Kataoka
de65b7c0b3 Merge "Fix the position of emoji palette" 2013-10-08 12:04:03 +00:00
Satoshi Kataoka
f981fe7ed2 Fix the position of emoji palette
Change-Id: I07a3912cb9fef8e28f3605de4e73a201a900e95c
2013-10-08 21:00:43 +09:00
Ken Wakasa
c040d59def Merge "Add more_keys_for_* declarations for the Swedish keyboard." 2013-10-08 11:44:54 +00:00
Fredrik Roubert
a30884e0e0 Add more_keys_for_* declarations for the Swedish keyboard.
This adds all those popup keys that were included in commit
b1cb13292f when the Swedish keyboard was
first added. Many of these definitions were later removed by commit
79b965e04f but most likely by mistake, as
that commit log message doesn't mention anything about removing these.

To help making this file more maintainable, this commit also moves a few
definitions around so that all definitions now appear in alphabetical
order.

Change-Id: Iadef9e3dd1dc7b39fe87b2fc75210d0697b24361
2013-10-08 13:28:08 +02:00
Satoshi Kataoka
0e01df9baf Reduce memory of emoji palette
Bug: 10902556
Change-Id: I3c8da35a601de2bfb248292c7b59235fc1120988
2013-10-08 20:11:35 +09:00
Satoshi Kataoka
2d3e121014 Fix memory leak in EmojiPaletteView
Bug: 10902556
Change-Id: I3a8c1e08d6f953b462d914acd1f411c36f9d80f2
2013-10-08 19:05:00 +09:00
Ken Wakasa
8cf2a5e59f Prep for RAM footprint optimization for Emoji palettes
bug: 10902556
Change-Id: I313948c73b60cd33c437cf02e8d3fb61c288a240
2013-10-08 17:09:24 +09:00
Satoshi Kataoka
984aa60e11 Merge "Extend hitbox of emoji keys" 2013-10-07 23:27:07 +00:00
Satoshi Kataoka
5d27cb9397 Extend hitbox of emoji keys
Bug: 11105065
Change-Id: I5e90ba55cf708bf7be27d7d101cbc0719ac583c8
2013-10-07 23:22:12 +09:00
Jean Chalard
3c4e8cb693 Call loadKeyboard later if it can't be called right away
Since loadKeyboard relies on the input connection being
available to give it the auto-caps state, but also can't
be called twice in a row because it needs to save and
restore its state and invalidates it after the restore,
we need to wait until we know we have a valid input
connection to call it.

Bug: 11107229
Change-Id: I1c7baf3215682df6f6ceb357bd37254f9e7418c7
2013-10-07 22:57:59 +09:00
Satoshi Kataoka
4746217247 Enter -> Alpha keyboard switcher in Emoji palette view
Bug: 11103091
Change-Id: I0c5384e9f148566d1ac1d178a8227eb913d59908
2013-10-07 17:05:54 +09:00
Satoshi Kataoka
4deb824f3a Add navigateEmoji
Bug: 11074625
Change-Id: I1ef6b81ef923684b502c24fddb4ced8fe1691733
2013-10-07 15:28:39 +09:00
Satoshi Kataoka
e6e4c70a23 Fix build
Change-Id: I61341aa7b1ceb311aaa5faa5888ba31e463a95d5
2013-10-07 12:48:14 +09:00
Satoshi Kataoka
d76b552979 Rename EmojiKeyboardView -> EmojiPalettesView
Change-Id: I226bb8e21fd2b2b6639896a1cc433d19f3f431c2
2013-10-07 12:28:13 +09:00
Satoshi Kataoka
1d188a28fb Merge "Fix emoji" 2013-10-04 12:00:39 +00:00
Satoshi Kataoka
0cf92aa826 Fix emoji
Bug: 10538430

Change-Id: Ib11e29794216b54001806ab12fe440d157243dc1
2013-10-04 20:58:09 +09:00
Satoshi Kataoka
e7ed5cae44 Fix emoji recent key behavior
Bug: 10538430
Change-Id: I91e03a8e7914628cdc8e57c124c95e5e6e8ea2a6
2013-10-04 20:01:00 +09:00
Satoshi Kataoka
c7f8d54d6e Merge "Prepare for changing text color for functional keys" 2013-10-03 07:15:03 +00:00
Satoshi Kataoka
194e004e81 Prepare for changing text color for functional keys
Bug: 10786040

Change-Id: I0de7d4923ea13b44adcf1f4ea456796cd02ef27b
2013-10-03 15:54:46 +09:00
Jean Chalard
cd7422f4df Merge "Fix a pernicious bug with caps." 2013-10-02 07:59:08 +00:00
Jean Chalard
f735117d36 Fix a pernicious bug with caps.
What's happening here is, setAlphabetKeyboard sets the
keyboard to AUTOMATIC_SHIFTED and updates the keyboard, then
restoring the keyboard old state sets it back to UNSHIFTED without
updating it. When we finally know what the correct value is,
we try to set it to UNSHIFTED, but since that's already the currently
recorded state, it skips updating the keyboard forever.

The solution is to avoid setting the shift state without updating the
keyboard.

Bug: 10948582
Change-Id: Ic8670401e378f8284e851281f91a9ad93eac8e90
2013-10-02 16:57:36 +09:00
Satoshi Kataoka
5ceae026e0 Retain Emoji Keyboard after rotation
Bug: 10612450
Change-Id: Ie0ae953958d2b0a0a4da651584f1e28b0ba38ae3
2013-10-01 22:59:02 +09:00
Satoshi Kataoka
9d76391058 Merge "Unfortunately, hide some broken "emoji"s" 2013-10-01 12:18:13 +00:00
Satoshi Kataoka
c7e6f3dbc3 Unfortunately, hide some broken "emoji"s
Bug: 10923117
Change-Id: I27ba38e5f388cc15ae331fd05d63db4e4a41cbbf
2013-10-01 21:02:59 +09:00
Jean Chalard
2afa0e621e Merge "Fix a bug where gesture would delay update." 2013-10-01 11:21:59 +00:00
Jean Chalard
b1e6eeea57 Fix a bug where gesture would delay update.
Change-Id: I94c394f45f2717bc1a4b95692a5757c1e7179152
2013-10-01 20:06:36 +09:00
Ken Wakasa
e56c2f979f Cleanup and remove redundant more keys on phones
Change-Id: I419c3c119eb1e4d2e877c8c00564e46f40b6abc2
2013-10-01 19:02:09 +09:00
Satoshi Kataoka
a4913994c2 Hide indication bar if only one page
Bug: 10923117
Change-Id: If81bf07ba2e7c4fff44a8832f98b4a393c15edc7
2013-10-01 16:58:42 +09:00
Satoshi Kataoka
d0df68e6cb Stop vibration while repeating delete key in emoji view
Bug: 10960355
Change-Id: Ic1fdecdbcab4082c5383623c1f2575e3976ebe27
2013-09-28 17:02:58 +09:00
Satoshi Kataoka
adbb979b56 Fix possible NPE in KeyboardSwitcher
Bug: 10964306
Change-Id: Ibcea76da746f6cac92c8d91425d25d04ade62af0
2013-09-28 01:19:18 +09:00
Satoshi Kataoka
a456e3f659 Input delete onUpKey
to avoid deletion when the user starts gesture from the delete key

Bug: 7303982
Change-Id: If4b3e6287ceee1cf9f72a1d92f2a6789065da454
2013-09-25 18:55:57 +09:00
Satoshi Kataoka
1e69f3e637 Fix emoji page
Bug: 10538430
Change-Id: If4d5ebb26e7ead259e8f370462ccf4c9dbf734f8
2013-09-25 17:20:27 +09:00
Satoshi Kataoka
0938fb6913 Allow gesture from the delete key
And inputting unexpected word while repeating the gesture
Bug: 7303982
Change-Id: I17bb6a689397500fa0e26706d6e07e427ea0b4d7
2013-09-25 14:15:43 +09:00
Satoshi Kataoka
9c3b2dbe34 Fix emoji state
Bug: 10919260
Change-Id: I85e897b2de10f147bba40dd2147e041e26f5b8ad
2013-09-25 11:59:21 +09:00
Satoshi Kataoka
431158c939 Turn off emoji palette on JB-MR2
Bug: 10919260

Change-Id: Ie5a0342386baae61285412786162e74746272538
2013-09-25 11:41:46 +09:00
Satoshi Kataoka
d1ae03046c Fix OOBE in JB backword
Bug: 10905948
Change-Id: I4e953296ce3067d05fc5759375f40513580484a6
2013-09-24 21:14:48 +09:00
Ken Wakasa
15e33c2373 More tweaks for Armenian layouts
Add Armenian question mark and exclamation mark as more keys in the symbols layout.

bug: 7963631
Change-Id: Ic4f306248c10f5439531cd468b78ba467cd1de6a
2013-09-24 18:53:06 +09:00
Satoshi Kataoka
3ca9c5cbec Merge "Implement delete key repeater" 2013-09-24 09:26:47 +00:00
Satoshi Kataoka
9204d11525 Implement delete key repeater
Bug: 10810844
Change-Id: Idbfe2196e8f0f8cf6dd1b77574eefb395c12807a
2013-09-24 18:23:38 +09:00
Ken Wakasa
1b7fc4f338 Tweaks for Armenian layouts
Added a dedicated key for the Armenian full stop

Added Armenian punctuation letters

bug: 7963631
Change-Id: Id28e224329b083a2465256f2713477b4f0782393
2013-09-24 18:22:32 +09:00
Satoshi Kataoka
0d8266b6eb Turn off alpha of key popup preview
Bug: 10786040
Change-Id: I0a636e5f28f177c4d72f9af0312726711f78dd2d
2013-09-24 15:20:23 +09:00