Commit graph

924 commits

Author SHA1 Message Date
Jean Chalard
bbbdab12be Move some editing methods to RichInputConnection.
Change-Id: I8527776a4bd8236a85bb77f9791f9b76977ad181
2012-06-08 20:23:13 +09:00
Jean Chalard
e091982868 Straighten batch edits, pass 1
Change-Id: I73acfee9098a87b9cde8aca720586ec748b2a82f
2012-06-08 20:09:41 +09:00
Jean Chalard
02308bec63 Merge RichInputConnection with EditingUtils
Change-Id: I9982ff325bef56694402caef28a77683c52ccd71
2012-06-08 20:04:09 +09:00
Jean Chalard
5475b38328 Make a wrapper for the input connection.
The goal is to simplify the code in LatinIME.java as well as having
a handy place to put debug calls to see interaction with TextView.

Change-Id: I255227e7e7343e0c2f3dcd1f185e5020d6186732
2012-06-08 19:50:12 +09:00
Jean Chalard
67fd0c240d Remove deprecated classes.
Should we maybe rename back *BinaryDict* to *Dict* in another
change for simplicity?

Change-Id: I8f7dcb78b9bdf1a13ce403a997fbb8619f2b453b
2012-06-08 17:12:15 +09:00
Jean Chalard
7214617622 Remove a slew of Eclipse warnings.
Change-Id: I03236386aea13fbd4fb8eaeee18e0008aa136502
2012-06-08 16:23:18 +09:00
Ken Wakasa
d418580a71 Fix typo
Change-Id: I264f829c1584a37995dbc5ee4ba6b6783d5d4834
2012-06-08 03:42:02 +09:00
Tom Ouyang
11dc22d964 Merge "Contacts binary dictionary updates with change in keyboard locale." 2012-06-07 01:19:44 -07:00
Tom Ouyang
2e8aa06002 Contacts binary dictionary updates with change in keyboard locale.
Bug: 6616436
Change-Id: I8d66a37f295134c5b9875b2a305a9be7442bd75d
2012-06-07 00:25:41 -07:00
Kurt Partridge
9b300f0caa Merge "add research log ui control" 2012-06-06 20:47:53 -07:00
Kurt Partridge
724bc479f7 add research log ui control
- lets users flag a particular time in the research log
- lets users delete the log for this session

also makes the UsabilityLog setting control whether the ResearchLog logs or not.

multi-project commit with I89067e7d3b8daca7179333f1dbe82224c26920fe

Bug: 6188932
Change-Id: I89864ef3ab53b0efe1ea8d75247be08712f0c399
2012-06-06 20:42:01 -07:00
Satoshi Kataoka
91c8c4f3a7 am e08cfda1: am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each language" into jb-dev
* commit 'e08cfda1ebea693c56681816076c419f23c51076':
  Cache UserHistoryDictionary for each language
2012-06-06 10:48:46 -07:00
Satoshi Kataoka
5a8d2fd1d3 Merge "Cache UserHistoryDictionary for each language" into jb-dev 2012-06-06 10:43:50 -07:00
Satoshi Kataoka
a836808f8b Cache UserHistoryDictionary for each language
Bug: 6603257
Change-Id: I73b65e921cff8337a00594525f67f6aec2178881
2012-06-06 20:02:00 +09:00
Tadashi G. Takaoka
876711930d am 2eb5eb4d: am be2fef4d: Merge "Fix backing view height calculation in landscape orientation" into jb-dev
* commit '2eb5eb4d447cb326b4c10cff2cae64df4e431ffd':
  Fix backing view height calculation in landscape orientation
2012-06-05 17:58:59 -07:00
Tadashi G. Takaoka
b94f4cc71c Fix backing view height calculation in landscape orientation
This logic has been dropped by Ib814c07f.

Bug: 6610497
Change-Id: Id89ad3280b73a31d8c9c6826e9ee297791624db1
2012-06-05 17:41:01 -07:00
Tadashi G. Takaoka
9895b815a8 am e2832daf: am 8cf3654a: Merge "Use calculated backing view height instead of the view\'s height" into jb-dev
* commit 'e2832daf4c289f94d68c546c485fc06bbf6aefd6':
  Use calculated backing view height instead of the view's height
2012-06-03 21:55:26 -07:00
Tadashi G. Takaoka
bc5b89cdff Use calculated backing view height instead of the view's height
This change removes the work around that was introduced by If4f24500.

Bug: 6596131
Change-Id: Ib814c07fdac7d0aa0d7fbc2764fda1af42b82ad5
2012-06-04 12:49:27 +09:00
satok
083fb024d7 am e6560252: am 72cd8466: Merge "Fix NPE in user history bigram dictionary" into jb-dev
* commit 'e656025282c0da28ed80b2604949092dbc5fb72e':
  Fix NPE in user history bigram dictionary
2012-05-31 20:29:43 -07:00
satok
4f96bb4520 Fix NPE in user history bigram dictionary
Bug: 6584882
Change-Id: Id0162bffc4f0f36239cdc68383f8a47d7a957397
2012-06-01 12:19:22 +09:00
Satoshi Kataoka
c5d4362b59 am 408fa1ac: am 961e676b: Merge "Set level 1 as the initial value of the valid words" into jb-dev
* commit '408fa1ac48a3eb6f378274d5dd0e490da0f453ae':
  Set level 1 as the initial value of the valid words
2012-05-29 04:49:33 -07:00
Satoshi Kataoka
c88f61215c Set level 1 as the initial value of the valid words
Bug: 4192129
Change-Id: I867e78ce79c78977d08e8b66881a25b6fe5bf41f
2012-05-29 20:39:39 +09:00
satok
1c69942683 am fff5cd6f: am aa064139: Merge "Forget user history" into jb-dev
* commit 'fff5cd6f767e248ecb5b30ea39cb9a22a476b953':
  Forget user history
2012-05-27 23:03:46 -07:00
satok
aa0641394b Merge "Forget user history" into jb-dev 2012-05-27 22:59:22 -07:00
satok
fd53b8cc2b Forget user history
Bug: 4192129

Change-Id: Ic98398e5383093a1c24373849eadc48fc4d3626f
2012-05-28 14:34:02 +09:00
Jean Chalard
1a31b4e484 am fac23787: am bed613cf: Merge "Simulate hardware enter/delete events if the app targets < 16" into jb-dev
* commit 'fac23787bbd7723acba4e7e344aa6f799d9584f6':
  Simulate hardware enter/delete events if the app targets < 16
2012-05-27 21:26:06 -07:00
Jean Chalard
4e1a558ee8 Simulate hardware enter/delete events if the app targets < 16
This will make text input buggy on all apps until they target
JB or superior.

Bug: 6537051
Change-Id: I726347db8c84d1582ad1962d3a910e698389e08c
2012-05-28 12:00:43 +09:00
Jean Chalard
f27ac2733c am d45e334f: am 7707e045: Merge "Cache application info." into jb-dev
* commit 'd45e334f5a73d2cc36800a81e1bbf881e633f026':
  Cache application info.
2012-05-25 04:11:15 -07:00
Jean Chalard
64766fbcaa am 6691bd67: am 9b93817b: Merge "Get information about the target application." into jb-dev
* commit '6691bd675a555163aa59c2ac791c6138c1d8a32c':
  Get information about the target application.
2012-05-25 03:34:46 -07:00
Jean Chalard
1b1243d61f Cache application info.
Bug: 6537051
Change-Id: Ieca891235df0d697bdeb0510651b703654fdef38
2012-05-25 18:54:53 +09:00
Jean Chalard
b224b60c94 Get information about the target application.
Bug: 6537051
Change-Id: I9fe7a07b5ddf2a423d5764840753ea70544206f1
2012-05-25 18:41:32 +09:00
satok
6d6c070eba am 925212ff: am c54d558e: Cancel adding user history bigram when autocorrection is cancelled
* commit '925212ff4b3d6ff4182a94a133c0e4a4f23dd6aa':
  Cancel adding user history bigram when autocorrection is cancelled
2012-05-23 20:19:46 -07:00
satok
c54d558e2e Cancel adding user history bigram when autocorrection is cancelled
Bug: 6465474
Change-Id: Ifbfe0ddc2ce5fab070939ede3db7bf03a8535a45
2012-05-24 12:11:02 +09:00
Jean Chalard
008b528cbd am c4f66d32: am 6c034901: Fix an NPE
* commit 'c4f66d3233159ee224dd0b30dd117fe539af2be6':
  Fix an NPE
2012-05-22 20:18:01 -07:00
Jean Chalard
6c0349012e Fix an NPE
Bug: 6538761
Change-Id: Id85486ee93437cfec7db421d5c7f2d7980a7e32e
2012-05-23 12:05:36 +09:00
Kurt Partridge
8ccc875754 Merge "switch ResearchLogger output to json." 2012-05-22 10:32:23 -07:00
Jean Chalard
906857430b am 37105e86: am 09c4909c: Merge "Remove a high surrogate after a delete if any" into jb-dev
* commit '37105e8636fc84f9e903581443730a0bf6692996':
  Remove a high surrogate after a delete if any
2012-05-22 03:38:05 -07:00
Jean Chalard
978c96aa99 Remove a high surrogate after a delete if any
Bug: 6526328
Change-Id: Iae70cad7b3c114bc13af48ae0eadd52ab88e8471
2012-05-22 19:04:31 +09:00
Kurt Partridge
07cd1e1731 switch ResearchLogger output to json.
use multiple logging files, clean up internal nested class structure.

multi-project commit with I1813b6710ef586d96cf8936662f58b870040d6e5

Bug: 6188932
Change-Id: I438790e28f74747c4c1a48a20c1942a0fd818b6c
2012-05-21 18:45:21 -07:00
Tadashi G. Takaoka
d4577f738b am 82ffc9fe: am 16950d65: Reset automatic upper case when chroding key is pressed
* commit '82ffc9fe5f7255c902e371bb5353bdef97205fd6':
  Reset automatic upper case when chroding key is pressed
2012-05-21 14:29:59 -07:00
Tadashi G. Takaoka
865df41ba8 am 647827cc: am 78e3977e: Get rid of unused CODE_HAPTIC_AND_AUDIO_FEEDBACK
* commit '647827cc0171f7dc5d425dea5754fca3df49d036':
  Get rid of unused CODE_HAPTIC_AND_AUDIO_FEEDBACK
2012-05-21 14:29:25 -07:00
Tom Ouyang
cfec078d8b am 4bdb2bf3: am e1128687: Merge "Change to a binary version of the expandable user dictionary." into jb-dev
* commit '4bdb2bf3b9cceb99736a736de42088fcf3bd1a0f':
  Change to a binary version of the expandable user dictionary.
2012-05-21 14:10:54 -07:00
Tadashi G. Takaoka
6fbb8c8fc3 am 628a5745: am 75c60bf3: Merge "Change auto caps mode argument to int type" into jb-dev
* commit '628a5745e19d227cdff2370704a4958e2791eb5a':
  Change auto caps mode argument to int type
2012-05-21 14:10:50 -07:00
Jean Chalard
45befb946f am 9ad774d1: am 91492993: Merge "Close batch edit" into jb-dev
* commit '9ad774d1f68bf3d2a4c38e5b4c3a2fa03e371eff':
  Close batch edit
2012-05-21 12:44:10 -07:00
Jean Chalard
8717ad4cbd am 79daef2e: am 71b047e3: Merge "Don\'t deactivate the LastComposedWord on shift" into jb-dev
* commit '79daef2e9b29b67048cd052b33c88675a0c62220':
  Don't deactivate the LastComposedWord on shift
2012-05-21 11:52:11 -07:00
Tadashi G. Takaoka
16950d65c3 Reset automatic upper case when chroding key is pressed
Bug: 6501446
Change-Id: Idc3b88b5370c0d7968cc388885e9066f922cfcf3
2012-05-21 19:24:43 +09:00
Tadashi G. Takaoka
78e3977e90 Get rid of unused CODE_HAPTIC_AND_AUDIO_FEEDBACK
Bug: 6523953
Change-Id: Ibea6c74d00e956116f492a3bedfe40e580b4c316
2012-05-21 12:24:17 +09:00
Tom Ouyang
e1128687b1 Merge "Change to a binary version of the expandable user dictionary." into jb-dev 2012-05-18 10:05:11 -07:00
Tadashi G. Takaoka
553e2f19c1 Change auto caps mode argument to int type
Bug: 6501446
Change-Id: I3f7bc0fc39edd29ebf96107c3d43b9ccc9b8022e
2012-05-18 17:46:05 +09:00
Jean Chalard
d4cacb1e41 Close batch edit
This does the same thing as Ie30e1aff but differently

Bug: 6512086
Change-Id: I47ae990510d3f657abd45ad5f0e325d93dec83c0
2012-05-18 12:07:58 +09:00
Tom Ouyang
f6adff6227 Change to a binary version of the expandable user dictionary.
Bug: 6435677
Change-Id: If83409f699608d443796e64a3c65692ae81b98e6
2012-05-17 15:12:00 -07:00
Jean Chalard
125de3dfdf Don't deactivate the LastComposedWord on shift
Bug: 6495116
Change-Id: Ib86de02a1216146082bf58a033982ac37fefffe1
2012-05-17 17:05:30 +09:00
Jean Chalard
848081ad8b am 8dced70b: Merge "Read and use user dictionary shortcuts." into jb-dev
* commit '8dced70b062744a2c27e0cf6dcd0787cf598a97c':
  Read and use user dictionary shortcuts.
2012-05-15 11:37:54 -07:00
satok
d9c4aa83e1 am 76218b96: Merge "Do not set "SuggestionSpan"s for suggestions from the next word predicition" into jb-dev
* commit '76218b966a6a712f3baa72d95c6d125d414cdbd4':
  Do not set "SuggestionSpan"s for suggestions from the next word predicition
2012-05-15 11:37:52 -07:00
Kurt Partridge
0320c526c2 Merge "include text context in researchLogger" 2012-05-15 10:17:59 -07:00
Jean Chalard
8dced70b06 Merge "Read and use user dictionary shortcuts." into jb-dev 2012-05-14 20:38:23 -07:00
Jean Chalard
19ad9bf145 Read and use user dictionary shortcuts.
Bug: 4646172

Change-Id: I51002c73d5bad1a698110c5cda02253348be8eed
2012-05-15 12:23:43 +09:00
satok
0142b997bf Do not set "SuggestionSpan"s for suggestions from the next word predicition
Bug: 6294817
Change-Id: I5010eafa5ba7e947743706adf7e722f4f0cfb415
2012-05-15 12:08:31 +09:00
Kurt Partridge
aec44d50a7 include text context in researchLogger
when logging LatinIME.onUpdateSelection(), now include the current word and
preceding word.  no escaping of the word is performed; this is temporary
until the output format is cleaned up.

also fix EditingUtils.getWordRangeAtCursor to support supplementary
UTF-16 characters.

Bug: 6188932
Change-Id: If4612a2627537d5d8bb2f9585a3ad1b4e56c2e26
2012-05-14 09:55:26 -07:00
satok
9978953e29 am 6792a909: Merge "Output caps debug code" into jb-dev
* commit '6792a909cd0da3db6a957cb2576b4d08f46a53b7':
  Output caps debug code
2012-05-11 03:33:42 -07:00
satok
b6fb5eb391 Output caps debug code
Change-Id: I4a3399d9066bd28dab893ecebb720924110b871d
2012-05-11 17:37:14 +09:00
Tadashi G. Takaoka
46b26ed892 am c8bde75c: Merge "Optimize InputConnection.getCursorCapsMode calling" into jb-dev
* commit 'c8bde75cf455c02efc57c2e35bbe446b83c23739':
  Optimize InputConnection.getCursorCapsMode calling
2012-05-09 01:55:45 -07:00
Jean Chalard
9648b1674e am d5cd7e64: Small optimization
* commit 'd5cd7e64aa30096241f63e47a9169699bdd98231':
  Small optimization
2012-05-09 01:55:44 -07:00
Jean Chalard
4e02b1273b am 442ac5d0: Merge "Don\'t ask for surrounding characters for each keypress" into jb-dev
* commit '442ac5d0bb96ec257d26b28df2fabefdefe59b96':
  Don't ask for surrounding characters for each keypress
2012-05-09 01:55:43 -07:00
Tadashi G. Takaoka
3b0f0b57ff am f52aef84: Merge "Tab key preforms next action when EditorInfo.IME_ACTION_NEXT is specified" into jb-dev
* commit 'f52aef84a582197d6f8e580044b2d24d2a710cef':
  Tab key preforms next action when EditorInfo.IME_ACTION_NEXT is specified
2012-05-09 01:55:41 -07:00
Tadashi G. Takaoka
c8bde75cf4 Merge "Optimize InputConnection.getCursorCapsMode calling" into jb-dev 2012-05-09 00:24:00 -07:00
Tadashi G. Takaoka
03ca17c841 Optimize InputConnection.getCursorCapsMode calling
Bug: 6464226
Change-Id: I30c1b01be5e1719ded5f7f8a7e24a38e9bbc3637
2012-05-09 16:19:08 +09:00
Jean Chalard
d5cd7e64aa Small optimization
Change-Id: I067249976e557b60b606d2153deaeb3c8f1f38ac
2012-05-09 16:14:25 +09:00
Jean Chalard
736b109e16 Don't ask for surrounding characters for each keypress
Bug: 6464226
Change-Id: I03745bbcc21e5ec6ca57fa1257bf21c0cd26391a
2012-05-09 15:19:35 +09:00
Tadashi G. Takaoka
0b831ba2aa Tab key preforms next action when EditorInfo.IME_ACTION_NEXT is specified
Bug: 6435484
Change-Id: Iccca7d1b770c547efae0b5e5931cebd910083d40
2012-05-08 13:20:39 +09:00
Kurt Partridge
5a937aae99 Merge "record full text after finishing session" 2012-05-04 21:09:22 -07:00
Kurt Partridge
d67a248de4 record full text after finishing session
uses onWindowHidden() callback as proxy for finishing session.

Bug: 6188932
Change-Id: Ic63b47c946ca91fc35f80d71b2f9e24e2d0339ac
2012-05-04 10:57:50 -07:00
satok
9ec06c17d4 Fix build breakage
Change-Id: I22305137b336c9aab019d044a517ae8bc5fefe45
2012-05-02 18:14:40 +09:00
satok
57007ed582 Merge "Workaround return preserved backing view height when the backing view is not ready" into jb-dev 2012-05-02 01:42:00 -07:00
satok
f4cf5b9952 Workaround return preserved backing view height when the backing view is not ready
Change-Id: If4f24500ead516c46e6a93a95291e0897548c2f0
2012-05-02 17:40:10 +09:00
Tadashi G. Takaoka
ae2388c7f7 Fix checking if subtype belongs to this ime
Bug: 6422318
Change-Id: I5779c0e277444315191fa964a976dcb4316cc24a
2012-05-01 20:21:10 +09:00
Jean Chalard
551612dd9e Fix a bug where two spaces would be added instead of one
Bug: 6378291
Change-Id: Id2453333ae16146f816faf0eb68baa8ea1dd106a
2012-04-23 18:15:51 +09:00
Jean Chalard
96fb3094aa Fix a bug where a batch edit would not be started.
This would end up in TextView sometimes calling onUpdateSelection
multiple times (this is the correct behavior for TextView). We now
commit the space and the word in a batch edit, and we only get
onUpdateSelection once.

Bug: 6300527
Change-Id: I9579f3d8f5320c1cc24a7a42f19db8e105eb090d
2012-04-23 17:45:50 +09:00
Jean Chalard
29a1fc0f6b Don't allow cancelling manual pick.
Bug: 6347202
Change-Id: I30b53256e83c534436b0f0ff594fd4aaabf4558c
2012-04-20 15:55:45 +09:00
Kurt Partridge
48a7681e06 researchLogger detail on IME sessions
log device type, screen size, etc.  also simplification inside ResearchLogger
to use exceptions better, and fix ResearchLoggerTests to not change
preferences to specify the logfile.

multi-project change with Idfd193b16260215cca32886e288f03a0c12b2781

Bug: 6188932
Change-Id: Idd3ca6eb8e8e3934f68234b241c7fd7d0cc3bcd5
2012-04-19 20:19:55 -07:00
Tadashi G. Takaoka
6a7019ff5d Move main dictionary availability check to LatinIME
Change-Id: Ib6183fec833d87bc32514b03bb691fec0a1e6ff8
2012-04-19 23:23:26 +09:00
Tadashi G. Takaoka
65e93e352f Fix SubtypeSwitcher to honor subtype
Bug: 6364170
Change-Id: I31f9a7c9b6b4ca04a1c78a4210dcaae0db9825db
2012-04-19 22:42:14 +09:00
Tadashi G. Takaoka
1cb08acaf3 Add Constants class to hold public constants
This change also gets rid of compiler warnings about "deprecations".

Change-Id: Id9b83483c453a81ebac34b684656db05e3599657
2012-04-19 19:45:19 +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
Tadashi G. Takaoka
f5a0bd2c28 Make predefined subtype configurable by XML resource
Change-Id: I1f8486a1fb652f1e06789e7bfd2cc57273092234
2012-04-18 22:45:26 +09:00
Tadashi G. Takaoka
55d28fd1b2 Cleanup InputMethodManagerCompatWrapper
Change-Id: Id3b84ee19bb504ed8fbb398e260cc663a5b5ae0d
2012-04-18 18:01:29 +09:00
Tadashi G. Takaoka
a58ebc73ae Fix typo of some methods' name
Also changes some methods' argument type from Locale to String.

Change-Id: Ib68b528a450dc68a01546483403230f76500bee4
2012-04-18 16:40:50 +09:00
Kurt Partridge
d442984e96 researchLogging for inputConnection events
Bug: 6188932
Change-Id: I596df68956abd879293cfb550e66e7d7d0ba74e9
2012-04-17 20:05:10 -07:00
Tadashi G. Takaoka
79e07e3f84 Remove useless key event handling methods
Change-Id: I8c42fba79aba643ab7a145e6fd54ef23855a3ad0
2012-04-18 11:55:11 +09:00
Tadashi G. Takaoka
69bcc15cb3 Add SubtypeUtils.setAditionalInputMethodSubtypes method
Change-Id: Ia3043346ed87297e01d505980555fdf29ce4f96f
2012-04-17 22:48:00 +09:00
Kurt Partridge
9bfb620215 add logPoint for manual correction (inc touch pos)
Bug: 6188932
Change-Id: Ibcc4901bcfab6632ee4c59cb58d35452218a288d
2012-04-16 16:52:25 -07:00
Tom Ouyang
a7352c8df4 Merge "Add a new binary contacts dictionary based on ExpandableBinaryDictionary and use locale for bigrams." 2012-04-13 18:30:19 -07:00
Tom Ouyang
18222f8c86 Add a new binary contacts dictionary based on ExpandableBinaryDictionary and use locale for bigrams.
Bug: 6188977
Change-Id: I753422eed1effaeb5fd01124cf1ddd1e31ee9d60
2012-04-13 17:54:39 -07:00
Kurt Partridge
2783c51e6d Merge "clean up researchLogging of autocorrection" 2012-04-13 10:47:19 -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
Kurt Partridge
60adb87574 clean up researchLogging of autocorrection
remove dependence of ResearchLogger on LatinImeLogger
for autocorrection

multi-project commit with I32cc134b

Bug: 6188932
Change-Id: Iaeda97eb43fa4782db2d1b2a6d8d09a93b395111
2012-04-12 22:59:21 -07:00
satok
cf6b2099be Add isDictionaryAvailable to SubtypeSwitcher
Change-Id: I534878d330b57bbfaa8b7711082456969771f4dc
2012-04-12 19:46:02 +09:00
Jean Chalard
e6269759d6 Read the dictionary resource in a more sensical place.
We don't need to pass this down all the way from LatinIME any more.
It fetched be done exactly where it needs to be.

Change-Id: I9f277f9c4f9de70ae755a1334d86c67bbb24c988
2012-04-11 21:03:21 +09:00
Tadashi G. Takaoka
78ab80844b Add language suffix to main dictionary
Bug: 6319377
Change-Id: Ie6a887fefa12e33c17bfeb5d22984e7c1a7bdb46
2012-04-11 16:11:34 +09:00