Commit Graph

1065 Commits (bb843eb223ce0f8fb1088ed3393a4165123ddb1f)

Author SHA1 Message Date
Tadashi G. Takaoka 41f9f1ef70 Optimize drawing key text shadow layer
Change-Id: Id226fe8042ba0f538d5109459a3615d7e7113d7f
2014-05-13 14:16:33 +09:00
Tadashi G. Takaoka dd68d4e4bf Show icon on action key when it is defined in keyboard theme
This CL also adds the following icons name for an action key.
- Go
- Send
- Next
- Done
- Previous

Bug: 14259323
Change-Id: I48bba708d1f78349270d2ca01aebd8f111685723
2014-05-13 11:03:49 +09:00
Tadashi G. Takaoka 1c8e069d3c Add isIconDefined predicate to Keyboard_Case attribute
Bug: 14259323
Change-Id: I9450a5125b1809b9fada6ee6e6b253cabfa2e2b4
2014-05-13 10:24:32 +09:00
Tadashi G. Takaoka c41d261b7e Add voice key to suggestions strip
Bug: 14419121
Change-Id: I3b2bdc3c07bb7e49ea7be53649bd6dd134fea27c
2014-05-12 15:08:14 +09:00
Tadashi G. Takaoka d5e3f02586 Add pseudo LMP theme
This CL introduce pseudo LMP theme. This keyboard theme is a
placeholder and not final. The drawables and colors that this CL
introduces should be replaced with the final assets.

Bug: 14419121
Change-Id: I7a37c884e4ee0cac09ad21ff729996c2b9c1b4af
2014-05-12 11:52:41 +09:00
Tadashi G. Takaoka 59c3ef1ff8 Refactor KeyboardTheme
This CL introduces two preference keys in addition to the existing one.

- pref_keyboard_theme: The new preference key that is used only in the
  preference settings.

- pref_keyboard_layout_20110916: The previous preference key that
  holds keyboard color scheme settings. This is superseded by the next
  key.

- pref_keyboard_theme_20140509: The new preference key that holds
  keyboard theme settings. This value is forcibly reset to LMP theme
  on a LMP device. On a KitKat and previous device, the settings of
  the pref_keyboard_layout_20110916 is carried on into this
  preference.

This CL must be checked in together with Id7b3ddd8aa.

Change-Id: I2d55602d026e30b38d8f822d2124f5c5e4a9a812
2014-05-12 10:59:10 +09:00
Ken Wakasa d47dca429e Revert "Refactor KeyboardTheme"
This reverts commit 19688b584b.

Build breakage.

Change-Id: I95d4be1578824eaee5a2fb08ec277250727ac668
2014-05-09 11:28:19 +00:00
Tadashi G. Takaoka 19688b584b Refactor KeyboardTheme
This CL introduces two preference keys in addition to the existing one.

- pref_keyboard_theme: The new preference key that is used only in the
  preference settings.

- pref_keyboard_layout_20110916: The previous preference key that
  holds keyboard color scheme settings. This is superseded by the next
  key.

- pref_keyboard_theme_20140509: The new preference key that holds
  keyboard theme settings. This value is forcibly reset to LMP theme
  on a LMP device. On a KitKat and previous device, the settings of
  the pref_keyboard_layout_20110916 is carried on into this
  preference.

This CL must be checked in together with Ifcedeabbec.

Change-Id: Ibe75146e2c1c7eebf964ca86550baf244fedb79a
2014-05-09 16:21:02 +09:00
Tadashi G. Takaoka 2b479cccae Use margin instead of padding in SuggestionStripView
This CL also tunes the width of suggestions strip to be able to
display 15~16 letters without x-scaling at the center slot.

Bug: 14419121
Change-Id: Ia5766cee043899533e24e2ebc621e8dc279370b3
2014-05-07 19:12:28 +09:00
Tadashi G. Takaoka 9d99a2edee Make KeyboardView style as a parent of SuggestionStripView style
With this CL, SuggestionStripView can refer an icon asset in a
keyboard theme.

Bug: 14419121
Change-Id: I30d595c08ce02b8c7d3f111e1edab2820c0b602e
2014-05-07 12:13:02 +09:00
Tadashi G. Takaoka 2035cec9bc More meaningful Emoji descriptions
Bug: 11452158
Change-Id: I3e7c2c935bc7c371869240487928160d5ab850e2
2014-05-01 18:16:51 +09:00
Tadashi G. Takaoka d6d2a41be9 Merge "Add TalkBack spoken description of Emoji letters" 2014-05-01 08:37:25 +00:00
Jean Chalard bedef0b4f0 Merge "Introduce clustering punctuation" 2014-05-01 07:01:04 +00:00
Jean Chalard 29c00ff538 Introduce clustering punctuation
Bug: 10081730
Change-Id: If198fa3df68ecb267da0a278da41fd509d6165f1
2014-05-01 15:45:24 +09:00
Tadashi G. Takaoka 24536580bf TalkBack correct shift state
Change-Id: I3097805c6c8b4a4ac19fbe062f763e2639eb5cbf
2014-04-30 18:46:46 +09:00
Tadashi G. Takaoka 7203239b88 Add TalkBack spoken description of Emoji letters
This CL imports the official code point name from Unicode standard
6.3.0.

Bug: 11452158
Change-Id: I23f9c26420c7e26dc73d2d076bfa6ec646361b06
2014-04-30 17:21:21 +09:00
Tadashi G. Takaoka bfc998096b Add contentDescription to Emoji palette
This CL adds content descriptions of:
- Emoji Category icon/label.
- Delete key
- Space key

Bug: 11452158
Change-Id: Ic00592c560b6265c880cd25f2e18cfd349b4620b
2014-04-17 17:43:34 +09:00
Tadashi G. Takaoka 1c1d37caf9 Separate TalkBack description resources
Change-Id: Ib57c0e2faa67119b1c3a9bcf311828d71c2965d6
2014-04-17 12:58:14 +09:00
Tadashi G. Takaoka c3a19a5249 Remove GingerBread keyboard theme
This CL must be checked in together with I6a9ac172a5.

Bug: 14042743
Change-Id: Ic3f01f5d10097d743325df847bd7cd2959992487
2014-04-14 19:05:21 +09:00
Tadashi G. Takaoka 21eafd7910 Use KeyboardTheme id insteand of index
This CL must be checked in together with I771216f8bd.

Bug: 14042743
Change-Id: I45c3acf9242985fb03721a9a6d377fbccc8e2019
2014-04-14 18:59:54 +09:00
Tadashi G. Takaoka 58e830ec19 Refactor SubtypeLocaleUtils a bit
Change-Id: If8b7fd5ef0b4ff3791deeacc12abb256a10176bf
2014-04-10 17:24:58 +09:00
Tadashi G. Takaoka 9b46ddc1d5 Use platform default theme for activities and dialogs
Bug: 13698528
Change-Id: Ib904c911452525e3749c0eb287434b504576db5f
2014-04-04 17:13:54 +09:00
Tadashi G. Takaoka a3804e5e10 Add hindi_compact keyboard
Bug: 13779052
Change-Id: Ic7c17d96560501422a63340d7ce6bd8720e6c3c9
2014-04-03 19:47:31 +09:00
Tadashi G. Takaoka b9964b5fe2 Rename string resource to more generic name
Change-Id: I0a3386e921f3027114126ca4c8e09f41288d2d7c
2014-04-03 13:18:31 +09:00
Tadashi G. Takaoka a95e306d7f Suppress warnings related to string resource
Change-Id: I03073981313ae4f10a12b32ed9f524d0d50c2aa7
2014-03-26 19:05:29 +09:00
Tadashi G. Takaoka 37b9562fd7 Fix talk back of emoji key
Bug: 13629734
Change-Id: Ifff6f81c2ac99a32855cd333b3d9a01ad7155ffc
2014-03-25 11:58:59 +09:00
Tadashi G. Takaoka 44f144ab3a Remove reference of KeyboardTextsSet from SpacingAndPunctuations
Change-Id: I76a8fcbd2466bcaf9cd85501af270db5aa913999
2014-03-20 17:14:43 +09:00
Tadashi G. Takaoka 1aac375809 Add clarification to be able to use abbreviation
Bug: 13002703
Change-Id: I472ff9c2d3517b0c650e1f96eaacfa04a164637d
2014-03-19 12:26:44 +00:00
Ken Wakasa 783aee47e0 Remove string-arrays that are getting in the way
These empty string-arrays should not have been in this resource file.
They are in the translated files, and they are getting in the way of
the resource finding paths.

Fundamental fixes definitely should follow. For now, this CL should be
safe and acceptable for Cannellini.

bug: 13340486
Change-Id: I14c36babf9eb30cfc1c0adc5977136189a305f33
2014-03-08 22:37:27 +09:00
Keisuke Kuroyanagi e76c273502 Merge changes I20ce61c4,I2edab4e3
* changes:
  Remove "Use only personalization dictionary".
  Remove redundant creation of dictionary facilitator.
2014-03-03 04:00:24 +00:00
Keisuke Kuroyanagi 1aac28a2b9 Remove "Use only personalization dictionary".
Bug: 13216198
Change-Id: I20ce61c4a10c360e028bf6427f632cc5299763e4
2014-02-27 22:32:00 +09:00
Jean Chalard a0984662a1 [QRP3] Refactoring
Rename some variables for clarity and use constants
instead of immediates.

Change-Id: Ie07fbfcc3738ac4e67aefddc339fc54259172c39
2014-02-25 17:05:47 +09:00
Tadashi G. Takaoka da500b7ec3 Revert "Prepare for changing text color for functional keys"
This reverts commit 194e004e81.
Bug: 10786040

Change-Id: I4c5287d46cabe287abce5cba77635cf26d2cd192
2014-02-24 17:42:28 +09:00
Tadashi G. Takaoka fe39d576dc Support versioned important notice
This change must be checked in together with If38a754d00.

Bug: 10587358
Change-Id: I91580f9468bc5ee7ed1694d7852a60dc6793dac0
2014-02-21 09:54:08 +09:00
Tadashi G. Takaoka 1672ccbbb6 Change important notice version preference file
This CL also reset the notice version to 1.
This CL must be checked in together with Iea8d9ff038.

Change-Id: I838f7b5b295388d64d6aba90f50b06654eba16e5
2014-02-20 16:50:34 +09:00
Tadashi G. Takaoka f16d63c644 Tweak key popup animation parameters
Key popup show up start scale 98%
Key popup dismiss end scale 94%
Key popup show up duration 17ms
Key popup dismiss duration 53ms

Bug: 11518021
Change-Id: Icfde99969163f05cfaed1050ea074545d44db13b
2014-02-20 14:20:44 +09:00
Jean Chalard 1e9897b0c7 Merge "Consider non-breaking spaces separators." 2014-02-17 09:45:41 +00:00
Jean Chalard c051ee7025 Consider non-breaking spaces separators.
Bug: 13056209
Change-Id: I6100b3ee21cf143140398757d9f7e7445067877a
2014-02-17 18:20:46 +09:00
Tadashi G. Takaoka 4c680e7bcf Merge "Add go to "Settings" button to important notice dialog" 2014-02-17 06:13:26 +00:00
Tadashi G. Takaoka 28c02b400f Add go to "Settings" button to important notice dialog
This CL also
- removes icons on important notice title.
- changes the "Personalized suggestions" summary text.

This change must be checked in together with Id115d89ba9.

Bug: 10587358
Change-Id: I52ff26fa8ae12445e9014ba08253f69e1be609f4
2014-02-17 14:57:04 +09:00
Tadashi G. Takaoka c9072dc8da Remove key show up and dismiss animation
Bug: 11518021
Change-Id: I4a5eb0732f399612141f7c22d83e2210da612d7e
2014-02-17 12:10:09 +09:00
Tadashi G. Takaoka d508b676cf Special punctuations for Arabic and Persian
This change also removes duplications from tablet punctuation suggestions

Bug: 12640318
Change-Id: I221922484027d6b91e2f23a6bf60a18766f3a13c
2014-02-14 16:11:50 +09:00
Tadashi G. Takaoka a273319c59 Add PunctuationSuggestions class
This change must be checked in together with I366c477516.

Bug: 12640318
Change-Id: I8d3864b9d9649c9e3306e82b01a6327b11281b1f
2014-02-14 14:13:39 +09:00
Keisuke Kuroyanagi 29c92c40e0 Increase CHAR LIMIT for personalized setting.
Bug: 12189366
Change-Id: I19764b3aaf97319ac841460ac2a6ab1571d3ea2b
2014-02-12 12:23:22 +09:00
Tadashi G. Takaoka bd9887a574 Fix possible NPE while finding device override value from resource
Bug: 12949735
Change-Id: Iffda08db413b3b3d338ab9bf625bb0968c2e48dd
2014-02-10 14:38:53 +09:00
Tadashi G. Takaoka 1271da4679 Add example attribute to <xliff:g> elements in string resources
Bug: 8693729
Change-Id: Ide98ab83439cda43a8b84aaf64d0a9c18e44a8cc
2014-02-10 10:49:43 +09:00
Tadashi G. Takaoka 4f72923fa2 Merge "Rename Key.keyLabel attribute to KeySpec" 2014-02-07 09:53:43 +00:00
Tadashi G. Takaoka 4e85476740 Merge "Consolidate keyIcon and code with keyLabel attribute" 2014-02-07 09:53:35 +00:00
Tadashi G. Takaoka 9684b33b69 Rename Key.keyLabel attribute to KeySpec
Change-Id: Ida48cd9bdbc01fefad651a005084262c0f46c41c
2014-02-07 18:47:45 +09:00
Tadashi G. Takaoka a83a1feb62 Consolidate keyIcon and code with keyLabel attribute
Change-Id: I75fbd348fab5022606ca14552eb03b15af6684c8
2014-02-07 18:47:22 +09:00
Tadashi G. Takaoka 276b1a2ebc Add debug settings for keypress popup animations
Bug: 12928125
Change-Id: I49faab754c7d1dcf4a791dfc535d3a78b62ce67a
2014-02-07 18:09:41 +09:00
Tadashi G. Takaoka d6f147e142 Consolidate keyOutputText with keyLabel attribute
Change-Id: I90ea2c9d5ce42fabc79599995a2fae1f5f652a6b
2014-02-06 16:42:57 +09:00
Tadashi G. Takaoka 6193217f5c Parse keyLabel for icon, code, and outputText as well
Change-Id: I023915b68b4aabd056c2c1eb745876471556e15e
2014-02-06 16:42:17 +09:00
Keisuke Kuroyanagi 36c7a62dff Add dictionary dump buttons in debug settings.
Bug: 11736680
Bug: 12810574
Change-Id: I1f797b5ac6acf94b40d9698d4535e8f5da2bfb17
2014-02-04 21:29:09 +09:00
Tadashi G. Takaoka 8a296e43c9 Add important notice strip
This change is a groundwork to show important notice.

Bug: 10587358
Change-Id: I80aa70d30e2a529b37798f0df2183b41df3ac38a
2014-01-31 20:07:27 +09:00
Tadashi G. Takaoka 5b8ffad26c Move important notice version to resource
Bug: 10587358
Change-Id: Ie24fc6c53b15880f4ace991a25223056f03f5eda
2014-01-31 12:49:36 +09:00
Tadashi G. Takaoka c2ea3f7dd9 Remove suggestion_word and suggestion_info layout files
Change-Id: I37fea41cfc6e717ce7e5aa36ad331675fc9e8ce5
2014-01-28 19:38:35 +09:00
Tadashi G. Takaoka 08ce454aa5 Fix newline string resource
The newline string resource "\n" doesn't work off-device simulation.

Bug: 12623502
Change-Id: I3ad63d8afe50be174493d43f00f7191062c87cb7
2014-01-20 19:36:20 +09:00
Tadashi G. Takaoka 7504913807 Move phrase gesture related string resources to AOSP
This change must be checked in together with Ica8fc5135.

Change-Id: I288d7083391954f1266a9b77ee4ffc0bc9d4229d
2014-01-14 17:15:41 +09:00
Keisuke Kuroyanagi ba07df7fc1 Periodic wipe of the personalization dict.
Bug: 12216453

Change-Id: Ie59dd19c044e9b1eb9b8bd805366200737ea506a
2014-01-10 16:30:59 +09:00
Tadashi G. Takaoka 12ba821bfb Add description of disabled voice input key option
Bug: 12377179
Change-Id: I44d35c6fa82883710674ecca6f630d09076472fe
2014-01-06 12:11:55 +09:00
Keisuke Kuroyanagi 5c4bd20331 Remove "Boost personalization dictionary" from settings.
Change-Id: Iab05e42e947610f358472cd95d0319d0ab3f0b31
2013-12-25 19:02:49 +09:00
Tadashi G. Takaoka 9c4de1e5f7 Use config_screen_metrics resource in BogusMoveEventDetector
Change-Id: I6b957b43c6dd7ce4f639e46d248179662c1ee669
2013-12-20 17:35:19 +09:00
Keisuke Kuroyanagi d4bb7df412 Add option to enable personalization dictionaries.
Bug: 11757851

Change-Id: I4872c10793d4fd55c0bd9e5bc4650925de6d2c1d
2013-12-16 19:17:31 +09:00
Tadashi G. Takaoka a5b196e939 [FIX] Separate form factor dependent config resources
This is a cherry-pick of I668b55a514.

Change-Id: I00e9a74812d622c12af0337ba50e1b2f1d675cf1
2013-12-13 18:01:01 +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 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 978e2f67f7 Add key press vibration value for Motorola DVX
Bug: 10884131
Change-Id: Id6d5589f3528de05c7b346ce55e926c3e18f22cc
2013-11-22 17:25:57 -08:00
Baligh Uddin b4cc0ae075 Import translations. DO NOT MERGE
This is a manual cherry-pick of Ib0c14a756a.  This change also copied
some missing locales' strings.xml and strings-action-keys.xml from
jb-ub-latinimegoogle branch.

Bug: 11622614
Change-Id: Ibc9cde4662b15da63b73ac2b545e0e94c358de67
2013-11-21 11:28:47 +09:00
Jean Chalard 10581e68af Make the sentence separator a resource.
This will help handing correctly the armenian full stop.

Bug: 10082781
Change-Id: Id7bb219ebd89daba203216eab362d1cc26a65a36
2013-10-08 15:28:43 +09:00
Satoshi Kataoka 32cf6f85a2 Show Emoji key by longpressing the enter key
Bug: 11074625
Change-Id: I5fc57a2b68d7dcfb8dbebf5821b76b0895a947f9
2013-10-07 16:47:13 +09:00
Satoshi Kataoka 4deb824f3a Add navigateEmoji
Bug: 11074625
Change-Id: I1ef6b81ef923684b502c24fddb4ced8fe1691733
2013-10-07 15:28:39 +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
Ken Wakasa fba1bd0ec4 Suppress exceptions that have always been happening.
Change-Id: I5f85a7a0f94ea9ecbe0c4a8caebcf551fa9c9669
2013-10-04 19:10:26 +09:00
Alan Viverette afa565119c Merge "Update string comments for translation" 2013-10-03 20:34:24 +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
Alan Viverette 1240d28e57 Update string comments for translation
BUG: 11042719,11021829
Change-Id: I27c80d1a2489843a16bd2b055d2ae81797492d1c
2013-10-02 17:07:20 -07:00
Alan Viverette 458fb52b98 Merge "Speak auto-corrections for accessibility" 2013-09-30 18:14:13 +00:00
Alan Viverette 67319f92f3 Speak auto-corrections for accessibility
BUG: 8669376
Change-Id: Id71b2c2835daa7a8c9d6c92c57a7e302551c289d
2013-09-27 14:15:53 -07:00
Satoshi Kataoka b44efbdcc0 Reduce Emoji size
Change-Id: Ie9dec82c0edde70a75fffeb7c86c14e05f468207
2013-09-28 02:02:47 +09:00
Satoshi Kataoka 9204d11525 Implement delete key repeater
Bug: 10810844
Change-Id: Idbfe2196e8f0f8cf6dd1b77574eefb395c12807a
2013-09-24 18:23:38 +09:00
Ken Wakasa 2c4bbe2596 Keypress vibration default value for Xperia Z Ultra
bug: 10832066
Change-Id: I9ed107f192d65e792529699b30bb88de73a5788a
2013-09-23 18:01:22 +09:00
Satoshi Kataoka d764a0a0ad Update resources: Colors
bug: 10786040

Change-Id: Idee67e73096e1e31126dbf24e9608d3e6dba2b47
2013-09-20 17:03:32 +09:00
Satoshi Kataoka baa3121704 Update resources
Change-Id: Ia66f7181514ee1471e181e16d15622174cf72e79
2013-09-20 14:49:54 +09:00
Satoshi Kataoka 250a12f6c2 Show Emoji category page id indicator
Bug: 10538430
Change-Id: I767fa8d41c789125af266f2203b4bad7452bc0a5
2013-09-19 18:41:13 +09:00
Satoshi Kataoka cf08ddbdb7 Fix test in SubtypeLocaleUtilsTests
Change-Id: I4f7bf70ec7a0a67ad5d2129afed314b1b1a93a6c
2013-09-19 11:45:11 +09:00
Jean Chalard 73d607fb70 Merge "[AC5] Introduce the setting for phrase gesture." 2013-09-17 03:42:38 +00:00
Satoshi Kataoka c65f6c3001 Merge "Split Emoji categories fitting the pager" 2013-09-16 09:31:47 +00:00
Satoshi Kataoka 5dfbc8af24 Split Emoji categories fitting the pager
Bug: 10538430
Change-Id: Ic023ac0b9db8a1fe16c73ab5fd12dfcd7cbbe6a3
2013-09-16 18:27:20 +09:00
Ken Wakasa 187dd85a40 Additional fix for Lao; No spaces used between words
bug: 6911140
Change-Id: I1b1141c203175b9f9a818564272c0aa49df33888
2013-09-16 12:03:30 +09:00
Jean Chalard a37bee2805 [AC5] Introduce the setting for phrase gesture.
Bug: 9059617
Change-Id: I6fa0f675f4edac10bd19228cd2f0c8fca97cebd6
2013-09-13 20:44:37 +09:00
Satoshi Kataoka 2d3d415826 Change space key height in Emoji keyboard view
bug: 10538430

Change-Id: I724a8c92b49a64196c7da2af40f3d20758e0dbae
2013-09-12 19:18:41 +09:00
Satoshi Kataoka 741831d322 Add margin to the label of language
Change-Id: I48dc63475caf5cc1a1ac09b82b26fbeaef993fa1
2013-09-06 17:21:44 +09:00
Satoshi Kataoka e3150664ae Revert "Remove symbols shifted layout related code"
This reverts commit 1cd027850b.

Bug: 9059539

Change-Id: I1880b799e2d0f148ae913f13cffa1b8cac48be60
2013-09-04 16:27:34 +09:00
Satoshi Kataoka 5169937dd4 Revert "Revert "Support Emoji keyboard""
Window resizing junkiness is addressed in I605e657c9468

This reverts commit aabc972338.

Change-Id: I0bc0f1ad9a90799e643fe9ec35f5b4bbe94eee0d
2013-08-30 19:46:10 +09:00