Commit Graph

1027 Commits (6b64a0fedc23d801696312909d57674f5cc43d56)

Author SHA1 Message Date
Ken Wakasa 758011a118 Tiny fix for access to cyrillic soft sign on Russian layouts
bug: 5151430
Change-Id: Id6e50398d087f62a305fad734432135c00329316
2011-08-12 17:52:35 +09:00
Jean Chalard 4ef448ac82 Externalize the dictionary pack's name and settings
Some changes downward the road need Latin IME to know the dictionary
pack by package name. This makes the name an external string.

Bug: 5095140
Change-Id: Ibebf5eb892af19681c18da38955e50dfb573330a
2011-08-11 21:48:59 +09:00
Ken Wakasa 39d2a4c005 Revert Idedaabd1 partially until we have the new auto-correction indicator in TextView
Change-Id: I492f1282590b3aa23682be24dea0bc5a00bd7749
2011-08-09 13:06:49 +09:00
Eric Fischer 0484758b0e Merge "Import revised translations." 2011-08-08 15:04:31 -07:00
satok c2b6a35e65 Add the spell checker configuration xml
Change-Id: I05fe12dbdef49cb41919023fad6b9df13dc5bd82
2011-08-08 19:21:24 +09:00
Tadashi G. Takaoka 8f79ffcff5 Merge "Remove suggestion pane controller from strip" 2011-08-08 00:22:11 -07:00
Tadashi G. Takaoka ae5c736e37 Remove suggestion pane controller from strip
This change also removes speacebar LED to represent auto correction.

Bug: 5023981
Change-Id: Idedaabd147ed608df35cb51769388578a05174a1
2011-08-08 00:15:49 -07:00
Tadashi G. Takaoka dbb6d12661 Update keyboard and suggestions strip background drawables
Bug: 5131686
Change-Id: Ideb49c3c55464721f21aecf97e2a20b95e3e09a6
2011-08-07 22:04:20 -07:00
Ken Wakasa cadb2128f5 Fix issues with long-pressing the spacebar
bug: 5114433
Change-Id: I18f2147724a08965147bafe93e11fc86c7c59d33
2011-08-06 16:49:32 +09:00
Tadashi G. Takaoka 60a004f78e Fixed count suggestions strip
Bug: 5023981
Change-Id: I434d23bdfb653989866d3822c978cd929a2b553c
2011-08-05 19:25:36 -07:00
Eric Fischer bf8aa9d348 Import revised translations.
Change-Id: Ibbe7e9a4a5543ad2627e8d05fcdf8cfa4a14e27d
2011-08-05 17:25:10 -07:00
Ken Wakasa 3889462439 Handle non word separators correctly even for the initial letter of a word
bug: 5101114
Change-Id: I0d804c9a500ff000dc06cadad46a2c6c6b8088b2
2011-08-04 12:24:45 +09:00
Tadashi G. Takaoka a0ac590c8d Merge "Support label with icon key" 2011-08-03 01:56:24 -07:00
Tadashi G. Takaoka 62d4a96497 Support label with icon key
Bug: 5108339
Change-Id: I7cd4258a95a7e25b8b1114b43ffcca5b77c5c1e3
2011-08-03 01:53:30 -07:00
Ken Wakasa 272dfe940d Merge "Replace ALT/More with more meaningful key labels" 2011-08-03 01:13:32 -07:00
Ken Wakasa 09578c895d Replace ALT/More with more meaningful key labels
bug: 5113471

Change-Id: I324d24ea28c0ff9246dde2494296dca1dddabb1b
2011-08-03 17:06:13 +09:00
Ken Wakasa 21fa416c43 Revive the missing Settings key on tablets
This is a follow up change to Ieb42fdfa.

bug: 5094401
Change-Id: If78c966ed02fbc9b8c6da726e00424a927349142
2011-08-03 17:00:14 +09:00
Ken Wakasa a1d2650a0e Fix the popup char order for Arabic layout
Change-Id: Ic4d8df7a8aa0ec59fee40eb7fadd8a7e49db4198
2011-08-03 12:50:13 +09:00
Eric Fischer 27f3c83ea8 Merge "Import revised translations." 2011-08-02 15:31:47 -07:00
Eric Fischer df4db22449 Import revised translations.
Change-Id: Idd149b6bec4a78bc7c5f95096bdc2d8e5eaf64c5
2011-08-02 11:40:09 -07:00
Ken Wakasa 047f63f559 "?123" should be up for translation for Arabic layouts
bug: 5108339
Change-Id: Ie1abcf50abba569683f76a136718ab24f5089677
2011-08-03 00:28:46 +09:00
Ken Wakasa 0b08a4b7c2 Add char limit for several key label resources
Change-Id: I7a63dce1e85282055b847c43a6e9b9b90a10fa98
2011-08-02 19:58:54 +09:00
Jean Chalard 20cb6e8078 Merge "Remove the systematic bias to the top." 2011-08-01 03:18:49 -07:00
Jean Chalard d8eceb1231 Remove the systematic bias to the top.
The keyboard used to introduce a systematic bias to the top.
This may have been to compensate an old driver flaw, but it
seems that it is now in the way and causes a lot of mistyped
spaces and backspaces.
This change removes the systematic bias.

Change-Id: Ib65ffba99cbd053d1085d3e6eeaf10a815289fc0
2011-08-01 19:14:14 +09:00
Tadashi G. Takaoka 49e00258b9 Remove '(' from the label of "to symbol" on phone layout
Change-Id: I9261cbba9a04fc25b67dfd5ce4188b7e32f5d8e0
2011-08-01 02:47:03 -07:00
Tadashi G. Takaoka 48dda9e028 Merge smiley key style into return key style for phone
Bug: 4340933
Change-Id: If2b586e5fade1610489e4a53cddafb89834bba07
2011-07-31 20:06:39 -07:00
Tadashi G. Takaoka e00d44d0c8 Show settings and tab key accordingly
Instead of showing a tab key at the position of "period" key, this
change places a tab key on the left side of the space key or on the
mini popup keyboard of the mic/comma key accordingly.

Bug: 4340933
Change-Id: If3cbc6d0b36f74fbc9320d6f433c65c66051dc09
2011-07-31 20:00:00 -07:00
Tadashi G. Takaoka 35e675b196 Rename settingsPopupStyle to f1PopupStyle
Bug: 4340933
Change-Id: Ic026089123988940dca58a0aaac07f613ad45aff
2011-07-31 19:19:32 -07:00
Tadashi G. Takaoka 3712231600 Rename key label and alternates string resource names
Bug: 4340933
Change-Id: I7c80c0b6a8a9082c52b57a858e2b6740c05366ec
2011-07-31 19:00:19 -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 e50733d196 Rename popupSettingsStyle to f2PopupStyle
Bug: 4340933
Change-Id: I4fbd8f7a4175e0e3fde326f40fd1b84312d81b89
2011-07-31 18:37:25 -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
Jean Chalard 4d94a99bab Match the new name of the dictionary settings activity.
Bug: 5094660
Change-Id: I13c734791265ed25eac3c9b4861dd0cffdb12c52
2011-07-29 15:57:54 +09:00
Tadashi G. Takaoka 60ccbe16ee Clean up keyboard loading and switching
Bug: 4311428
Change-Id: Ia72de23634f824d82b7b5f2267d439ce922a3b57
2011-07-27 13:34:16 -07:00
Tadashi G. Takaoka df0696f8d2 Update tab key icon image
Bug: 4948171
Change-Id: Id7dcebc4f1174cabfe872bc36edbe294ddaf081d
2011-07-26 15:20:26 -07:00
Tadashi G. Takaoka 596600d4ac Tweak long press timeout of language switcher
Previously 1200ms, down to 400ms that is the same value of system
default.

Change-Id: Ia94c6b729893d528ec3f2b961bf2ad22b47fdbb1
2011-07-26 15:02:47 -07:00
Eric Fischer c02a1617c8 Merge "Import revised translations." 2011-07-26 13:09:39 -07:00
Eric Fischer a953a3c137 Import revised translations.
Change-Id: I6686b5c714afab6b4ca2534b1bbd24205005220a
2011-07-26 11:49:54 -07:00
Jean Chalard f50aa19337 Purge quick fixes option.
This change removes everything related to the quick fixes
Latin IME option item.
Note that Autotext is still used if the current subtype language
is the same as the system language.

Bug: 4985058
Change-Id: I51728a2190543ffb9e004470674ef6257b14f6c2
2011-07-26 16:25:57 +09:00
Ken Wakasa 3d7c4eace8 Add the rtl attribute to Arabic/Hebrew keyboards
A follow up to I18b9962c

bug: 5047217
Change-Id: Iea72182a80e69b2a631f23b825430ebfbfc2f560
2011-07-26 09:52:09 +09:00
satok 2c18ffb97f Merge "[step3] Add spell checker service." 2011-07-25 13:48:47 -07:00
satok 022c1cc203 [step3] Add spell checker service.
Change-Id: Ib13b3a524e0f0b90de40a3e255040b3158d49258
2011-07-25 11:05:24 +09: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
Ken Wakasa 8f98cdef0e Tidy up the subtype names
Change-Id: I5dbdc6c006fab01fa389f0796b6c87aa2a90132e
2011-07-23 17:42:23 +09:00
Tadashi G. Takaoka f2e3db7c72 Fix ALT key on symbols shifted keyboard
Bug: 5068615
Change-Id: I4c38befd14ae59390dfb23357fdb9e8388f0a6d8
2011-07-22 18:24:35 -07:00
Tadashi G. Takaoka 22ed2d3c49 Fix popup mini keyboard of comma key on symbols layout
Bug: 5058762
Change-Id: Ic2d48358b0aceb1d55b3e12bb32b4423ff41ccf3
2011-07-21 00:56:51 -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 8507589085 Merge "Remove Key edge flags from XML" 2011-07-20 17:00:33 -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 81ff3ba343 Update Keyboard background drawable
Bug: 4948171
Change-Id: I0f408ff67c7f2eef3830a43d2919b943dab74235
2011-07-20 14:20:33 -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 7c2b3a474f Add Arabic percent sign
Bug: 5046333
Change-Id: I7be8c465ce6be2b78d9e8ece4dc4119941230d97
2011-07-19 18:28:54 -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 4fc4a7f567 Merge "Bring "comma" key back to symbol layout" 2011-07-15 17:06:45 -07:00
Eric Fischer 303077bcb0 Import revised translations.
Change-Id: Id17475b42f5037de6c27d40e3c4ba57cbad64287
2011-07-15 16:52:04 -07:00
Tadashi G. Takaoka 7c1660b4d7 Bring "comma" key back to symbol layout
Bug: 5035197
Change-Id: Ia931305b9dd2ee9eb51deef6b2477fbf351ac479
2011-07-15 15:36:32 -07:00
Tadashi G. Takaoka e895d85a8e Add Arabic comma to phone keyboard
Bug: 4161983
Change-Id: I2b1f2539cbe3b5686e77b9b0d46167394c3db64c
2011-07-14 13:52:54 -07:00
Tadashi G. Takaoka b033828e2e Merge "Import new drawables" 2011-07-14 01:26:23 -07:00
Tadashi G. Takaoka 0085d44220 Import new drawables
Bug: 4948171
Change-Id: I899063ea5ad4508fd4f5786dbb75bcd6909c331f
2011-07-14 01:09:43 -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 1a55286738 Update Hebrew keyboard
Bug: 4170083
Change-Id: I977d7f6cce08e35fe9bed46fe5f4fdedd1f12e9c
2011-07-14 00:30:32 -07:00
Tadashi G. Takaoka f7f2e82e8b Merge "Make Russian layout for 7 inch table compatible with other locale" 2011-07-13 22:55:26 -07:00
Tadashi G. Takaoka 26afa553bd Fix settings key icon
This is the followup change of Ife9a9333

Change-Id: I6ebf2444642fe9ced7d40074fcc2bf050bbca7e0
2011-07-13 22:49:38 -07:00
Tadashi G. Takaoka 0ad80871df Make Russian layout for 7 inch table compatible with other locale
Related to Bug: 5024014

Change-Id: I149624e351f5c75323771ff90960d2fe00ca412b
2011-07-13 14:56:06 -07:00
satok 696ce577e6 Show a suggestion strip by default
Bug: 5024058

Change-Id: I5216e9a2e464c2bb3150b66779b6b1b5cd9027ff
2011-07-13 16:04:38 +09: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 4a0c343dbd Use InputMethodSettingsActivity
Bug: 4979539
Change-Id: Ib721814bfe80822ded7b0d801f6bc0c854588da4
2011-07-11 10:15:03 +09:00
satok 1a3bb54bb4 Use InputMethodSettingsFragment
Bug: 4979539

Change-Id: I4f2010f785eb29ccd42b488c402ef9957633e0c2
2011-07-09 11:25:54 +09:00
satok c3f4d55c59 Internal cleanup before using InputMethodSettingsFragment (Part 2)
Change-Id: I87751cf0e36b41e931b0712a09d114fd470f1001
2011-07-09 10:14:05 +09:00
Tadashi G. Takaoka c71854a661 Remove swipe gesture
Bug: 4971680
Change-Id: Ifff27f3bd3dd26417bfcb7072aaba074025b1bb7
2011-07-08 00:00:14 -07:00
Eric Fischer 895fc0e1b3 Merge "Import revised translations." 2011-07-07 14:51:19 -07:00
Eric Fischer ff53f0fd97 Import revised translations.
Change-Id: I6a63166506259331cd0481b41e97527d5133d52c
2011-07-07 11:50:08 -07:00
Tadashi G. Takaoka 16add4c886 Fix improperly scaled drawable
Bug: 4993127
Change-Id: Id16039058777b50f223458e190b32c1bc3b1fd53
2011-07-06 18:12:39 -07: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
satok 67b5180e85 Merge "Add SettingsActivity" 2011-07-04 02:11:38 -07:00
satok 1be5028dcf Add SettingsActivity
Change-Id: I26d9f90fe18bd7723f1c3c0c9fafbb659cb2f020
2011-07-04 18:08:26 +09:00
Tadashi G. Takaoka 7d3821c2b3 Merge "Use Key background for suggestions strip control" 2011-07-04 00:10:39 -07:00
Tadashi G. Takaoka e583371b13 Use Key background for suggestions strip control
Change-Id: I5e43c0919e89972283fd18eb29d69f96f1bd0290
2011-07-04 15:42:20 +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 e984fb55b1 Slightly larger key for ICS and phone combination
Compatible with Gingerbreada theme.

Change-Id: Id05bb8992dac47a23e12af7ab62924b5bc25b7ca
2011-07-01 22:40:19 +09:00
Tadashi G. Takaoka 3118277dd4 Tweak ICS theme a bit
Change-Id: Ib8f1a712a1fc3fd6f08b336617b4b6a17af11376
2011-07-01 21:11:34 +09:00
Justin Ho 71fbdc1ae7 Updated keyboard assets
Bug: 4948171

Change-Id: If1e8e5f2f0eafe29b36a10d5f5e9e1fb26d67597
2011-06-30 17:21:27 -07:00
Tadashi G. Takaoka 74b6897a12 Adaptive suggestions strip
Bug: 4903845
Change-Id: I9e2e17a9eee72df5c92414dcd4796ed7fe1655e1
2011-07-01 00:46:34 +09:00
Tadashi G. Takaoka a65d84ce81 Merge "Add key description for "fullwidth asterisk" used on phone/number layout" 2011-06-29 03:02:30 -07:00
Tadashi G. Takaoka 0464850e6c Add key description for "fullwidth asterisk" used on phone/number layout
This change also removes non-ASCII comment from strings.xml to
suppress resource compiler warning.

Change-Id: I96d3e8e2c7072816f32a15564745f8cdc3f91ee9
2011-06-29 18:51:22 +09:00
Tadashi G. Takaoka 73d377a953 Merge "Cleanup key drawing code" 2011-06-29 02:40:33 -07: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
satok 8b0f34dbd3 Remove sliding explanation
Change-Id: Iae35385a3fadd7acc8a67b6a8f9beda9cab96cc9
2011-06-29 18:08:31 +09:00
satok 284c32900b Merge "Show subtype settings preference for new design" 2011-06-28 22:10:20 -07:00
satok b9e56cde8b Show subtype settings preference for new design
Change-Id: I6164ab6ae3d97e2095778a4a6fd9f36c508af7b0
2011-06-28 21:33:17 +09:00
satok bdb4edf533 Merge "Add suppress ime swicher notification" 2011-06-28 01:56:58 -07:00
satok 1c23d771d1 Add suppress ime swicher notification
Change-Id: I2050df05483c0b97c14c99ee941607371c081176
2011-06-28 17:52:34 +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
Justin Ho f41e9f79eb Updated IME assets
Bug: 4948171

Change-Id: I70019a91a95166196aa8ae5142ea7a0f81d32349
2011-06-27 17:27:25 -07:00
Justin Ho 23ea680fba Cleaning up IME drawables
Bug: 4948171

Change-Id: Ief1a69478eacb13b6be03ab3923750cdf6ba25b6
2011-06-27 17:20:01 -07:00
Tadashi G. Takaoka cf9c6ccdc5 Remove unused and unnecessary drawables
Change-Id: I7db0ee5e2aa06bba9b9f340aa6f71412c5a22c9a
2011-06-28 02:39:43 +09: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 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 d8850ae1ab Merge "Draw phone/number keyboard layout witout icon" 2011-06-27 04:17:51 -07:00
Tadashi G. Takaoka b47319867e Show long suggestion in condensed and ellipsized text
Bug: 4903845
Change-Id: I75d58fb55f81594ebb2628ea21d00c2eb59fa70e
2011-06-27 20:17:08 +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
Tadashi G. Takaoka 717a8f50ae Use dedicated layout for "touch to save word" feature
Change-Id: Ie8c948476740a645d8b2d9a9d821236941d27adf
2011-06-27 18:04:22 +09:00
Tadashi G. Takaoka 7fb04fe007 Fix ragged suggestion strip baseline
Change-Id: I5fa9e2ad0993602e24f436e1d8ad0999209e5180
2011-06-26 02:07:07 +09:00
Ken Wakasa c79aa482a8 Tiny string fix.
Change-Id: I56dd023b770ffbb85d7be1440301596b77c8d8c2
2011-06-25 00:16:55 +09:00
Tadashi G. Takaoka 87a32135ab Merge "Remove spacebar preview and arrows" 2011-06-24 05:45:09 -07:00
Tadashi G. Takaoka 14daf66fc5 Remove spacebar preview and arrows
Change-Id: I07f1b7bbf222d90e95919304e82d7d054df2868d
2011-06-24 21:41:27 +09:00
satok 07a62cf3d6 Added very aggressive
Bug: 4905916

Change-Id: I7365dd417855c980a56ab3bc513e9bc824b3182e
2011-06-24 21:31:10 +09:00
Jean Chalard 4f3d5d3733 Add a link from Latin IME to the dictionary pack.
The link only shows up if the dictionary pack is installed.

Bug: 1752028
Change-Id: I4af0a0a63324c155609710064a25df0deeb82b4d
2011-06-24 20:17:38 +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
Tadashi G. Takaoka 703e7252ba Fix popup key preview on 7/11 inch tablet
Change-Id: I42b4c0c7a554089baa778205da0627daaff667c6
2011-06-24 08:44:11 +09:00
Tadashi G. Takaoka 2b9eb15c0d Fix extract mode visual
Bug: 4850051
Change-Id: Id30e15c6c1c341d3a7712165bd4fb0875d1ad8f1
2011-06-24 07:52:35 +09:00
Tadashi G. Takaoka 1bca5b6e83 Revert "Remove extra spacing from candidate strip to fix extract mode layout"
This reverts commit 177fc54d8c.
Bug: 4904733

Change-Id: I7ab48ea559a9aafa58b1a2847f4398d24e9b1cfb
2011-06-24 07:51:49 +09:00
Adam Powell 177fc54d8c Remove extra spacing from candidate strip to fix extract mode layout
Change-Id: Icb2b7d66196cd7d36bedb11eadad0d743f7c048e
2011-06-23 13:18:11 -07:00
Tadashi G. Takaoka c83d0f0c85 Fix stale key style reference
This is a followup change of Ie7413852.
Bug: 4586882

Change-Id: I3472b1dc718b0fd24f419cb559553f9133ed84f9
2011-06-24 02:21:33 +09:00
Tadashi G. Takaoka cd96a691b1 Fix "Show settings key" option on 7" device
Cherry-pic I993ac772 from Honeycomb-MR2.

Bug: 4586882
Change-Id: Ie74138523a3ae7958c7bec674c49aa0ab1a72d05
2011-06-24 00:08:42 +09:00
Tadashi G. Takaoka 9116bf18f9 New IceCreamSandwich assets and theme
This change instroduces new IceCreamSandwich assets and renames
Honeycomb theme to IceCreamSandwich.  Though checked only on
hdpi-phone and mdpi-10"-tablet.

File another bug (Bug: 4852048) to fine tune keyboard layout for all
possible combination of devices and themes.

Bug: 4436327
Change-Id: I4f8dc1dd6b798a39204702bbcbebf17a199dc82f
2011-06-23 21:06:17 +09:00
Alan Viverette 5ac4638f99 Added support for touch exploration to Latin IME.
Bug: 4379983
Change-Id: I97f22e54827c6229054b514801401ffa5b4ed3b8
2011-06-22 10:54:06 -07:00
Tadashi G. Takaoka a93d27d6b8 Remove colorScheme attribute from KeyboardView
Change-Id: I9de118e8be60b9a6fe1aecc00332ba08872db918
2011-06-22 22:45:03 +09:00
Tadashi G. Takaoka b947c73dcc Merge "Add German QWERTY keyboard" 2011-06-22 01:52:17 -07:00
Tadashi G. Takaoka e90fae82d6 Add German QWERTY keyboard
Bug: 3268561
Change-Id: I56a74dc04d337d8d5701d99e5c92493dbcc06e41
2011-06-22 17:46:56 +09:00
Tadashi G. Takaoka c2a21786e5 Move icon declaration to Keyboard theme
Bug: 4436327
Change-Id: I074014d28dcb323b60dbc8fd9e169c75c393e0b3
2011-06-22 17:44:49 +09:00
Tadashi G. Takaoka 0150be2a9b Merge "Use 2 arguments LinearLayout constructor" 2011-06-21 07:39:55 -07:00
Tadashi G. Takaoka f921129f9b Use 2 arguments LinearLayout constructor
To maintain backward compatibility back to Froyo, we can't call
3-argument constructor of LinearLayout.

Change-Id: I35310704f92812d2748d32f35820a5058fa2bf31
2011-06-21 22:09:19 +09:00
Tadashi G. Takaoka 35f20916e5 Support Turkish keyboard
I left TODOs in Suggest.java because we must pay attention to locale
when changing character's case. Filed another Bug: 4769095 to track
that.

Bug: 4768050
Change-Id: I1ae2c4ffd2208403a8c2a25dd3a56b71dcefc826
2011-06-21 17:50:17 +09:00
Eric Fischer cdc12db404 Import revised translations.
Change-Id: I5dc1e545c6d8964fe6d58552fce56ef4b8d048f0
2011-06-20 15:01:22 -07:00
Tadashi G. Takaoka c00ffa4ccf Make spacebar wider on phones
Bug: 4726951
Change-Id: I18e50d59cc6ba3670523a8979a274b14049ad815
2011-06-20 22:38:15 +09:00
Tadashi G. Takaoka ada37cb4d3 Make auto correction candidate displayed in bold font
Bug: 4724868
Change-Id: I0a77893f7894c4edb226f97c0acea24142c35949
2011-06-18 13:40:49 +09:00
Tadashi G. Takaoka c029e0f4a7 Merge "Support Spanish keyboard" 2011-06-17 09:17:55 -07:00
Tadashi G. Takaoka 6b7e6c9693 Support Spanish keyboard
Bug: 4312114
Change-Id: I3feca4e87bdca0e4b5304fc325188e7eac115328
2011-06-18 01:09:32 +09:00
Tadashi G. Takaoka 2c43ed179e Support Croatian keyboard
Basically Croatian keyboard is QWERTZ layout with extra letters such
as č, ć, đ, ž and š.  This change just introduces Croatian keyboard
subtype and QWERTZ layout which has the extra letters as popup mini
keyboard of base letter.

It might be great if we could have dedidated table layout.

Bug: 4309160
Change-Id: I0fc227295defa56029ca06e406f73833b992be0e
2011-06-18 01:05:54 +09:00
Tadashi G. Takaoka 1b580e3f1a Add Finnish and Hungarian keyboard subtype
There are already both languages keyboard layout. Finnish is based on
Scandinavian layout and Hungarian is based on QWERTZ.

Change-Id: I6c804495bf1ae56661bc5c714e0c500132cd55a8
2011-06-17 22:31:04 +09:00
Tadashi G. Takaoka 28a38fdfee Tab key is shown when editor navigation flag is set
Previously tab key is shown only when the input type variant says that
it is web input.  In addition to that, this change also shows tab key
when the IME option includes editor action (next and/or previous)
flag.

Bug: 3094312
Change-Id: I3f8841fdbcee918a0f93f3259090f24e70d96471
2011-06-17 19:08:49 +09:00
Tadashi G. Takaoka 4720808cdc Rename keyboard rows consistently
Change-Id: I7147cab36eee4b6fd9418ca36e8ece2360b59e45
2011-06-17 18:13:47 +09:00
Tadashi G. Takaoka 237af54df5 Tune up 7 inch keyboard layout
Bug: 4479212
Change-Id: I25c48ef474f6198dde9b670b23509c087acae149
2011-06-17 16:27:51 +09:00
Tadashi G. Takaoka 9d9522abdc Add Key.keyHintLabel and remove Key.keyHintIcon
This change also removes manualTemporaryUpperCaseCode and
manualTemporaryUpperCaseHintIcon.  Instead of these keyLabelOption now
has hasUppercaseLetter flag value.

Bug: 4436327
Change-Id: I88fdac1e888a7123735296f5ef45f5fdd565cd2e
2011-06-16 21:24:19 +09:00
Tadashi G. Takaoka a61967330e Make LatinKeyboard aware of theme
Bug: 4436327
Change-Id: Idecdd470cbb0720b96958039eb11f6978d39629e
2011-06-16 20:10:49 +09:00
Tadashi G. Takaoka 08a6f2aea7 Make CandidateView aware of theme
This change is needed to introduce new theme easily.

Bug: 4436327
Change-Id: Idc368b66d892d9c888ba7a26bfa3527c21678292
2011-06-15 20:02:45 +09:00
Tadashi G. Takaoka b7758d6f91 Make Keyboard aware of theme
This change is needed to introduce new theme easily. As a starter this
change introduces Keyboard.popupHintIcon attribute and
Key.keyLabelOption.popupHint flag to show popup hint icon that is
previously specified by Key.keyHintIcon attribute.

Bug: 4436327
Change-Id: I6b1c5c1b88eece541141b2d2cedd164ee02e5c2a
2011-06-15 19:51:30 +09:00
Tadashi G. Takaoka 86e815a142 Implement expandable candidates pane
This change removes horizontal scroll from candidates strip. Instead
of that this change introduces "fixed 3 items candidates strip" and
"expandable candidates pane".

Bug: 4175031

Change-Id: Ia367d9074436fdea76d3b653d81798ce2749170e
2011-06-14 20:40:56 +09:00
Jean Chalard 90cb2e6296 Merge "Add an option to use or not the contacts dictionary." 2011-06-13 01:48:00 -07:00
Jean Chalard 699094f9b6 Add an option to use or not the contacts dictionary.
Bug: 4586840
Change-Id: If62cd57e5ab661e6a51a5442d09bf0af8f08f263
2011-06-13 17:33:04 +09:00
Tadashi G. Takaoka 070760dc5a Clean up candidate strip view hierarchy
Bug: 4175031
Change-Id: I8073739ac7624d2c0a111c5ef7043d8766162a83
2011-06-13 15:12:23 +09:00
Tadashi G. Takaoka 430dc5957e am ba6cd54a: am c636de2c: am 0ff8810b: Fix disabled mic icon temporally
* commit 'ba6cd54aefe9a28e26f5668fbf43845b8c6403aa':
  Fix disabled mic icon temporally
2011-06-09 11:52:27 -07:00
Tadashi G. Takaoka 1e273fa6d1 Separate debug information display from candidate view
This change is one of the preparations for suggestion strip redesign.

Bug: 4175031
Change-Id: I82675936773ed6cf132a52486909ff21af828256
2011-06-08 16:59:37 +09:00
Tadashi G. Takaoka 0ff8810bff Fix disabled mic icon temporally
This is a workaround until those drawables are updated by proper
image.

Bug: 4562738
Change-Id: Iabdf1736fd866cf8c6d976c895c2ddda637a50dc
2011-06-08 16:01:04 +09:00
Tadashi G. Takaoka 212ee95dbd Merge "Import 7 inch keyboard from Honeycomb-MR2" 2011-06-06 03:57:18 -07:00
Tadashi G. Takaoka 0d22fc4532 Import 7 inch keyboard from Honeycomb-MR2
Unfortunately current Master seems have bugs in resource
selection. The xml-en/kbd_qwerty.xml is added to avoide those issue as
work around, and must be removed if the issue is fixed.

Bug: 4442045
Change-Id: Ic43d66e8669fb63e2c3f0b8b9aae9178ca3c32b5
2011-06-06 19:31:13 +09:00
Tadashi G. Takaoka ddb61ea461 Separate candidate divider from candidate view
This change is one of the preparations for suggestion strip redesign.

Bug: 4175031
Change-Id: Ia0dc487c11c3005ef19b87ec0efcc18e48411f76
2011-06-06 18:21:08 +09:00
Eric Fischer 760247f9a5 Merge "Import revised translations." 2011-06-03 10:20:19 -07:00
Tadashi G. Takaoka abd7392d66 Keep tablet keyboard in sync with Honeycomb-MR2
This change removes Russian keyboard layout exceptions and make it
compatible with other Latin's.

Also tweaks some locales' keyboard layout to match with standard PC's
keyboard layout at most.

Change-Id: I305201fb850b4f94ae7e746ab4c039473d09da70
2011-06-03 21:44:57 +09:00
Tadashi G. Takaoka 5859205139 Implement logical or to Keyboard switch-case matching
Change-Id: Iab615459c21fa5799a7b30b8649d75347e46c804
2011-06-03 21:03:26 +09:00
Tadashi G. Takaoka 4f7cb70d22 Remove tab key from symbol and symbol shift layout
Bug: 4521421
Change-Id: I26c31c6b1a71de3366ca39e64f49bb911f0ef1a0
2011-06-03 15:30:12 +09:00
Eric Fischer 1b1b294c21 Import revised translations.
Change-Id: I465699895743a90144e24f5b95267012f72bb0cd
2011-06-02 16:59:02 -07:00
Tadashi G. Takaoka 044f000389 Update drawables
Keep in sync with Honeycomb-MR2

Change-Id: I2ecc0a945bd202e83b8c13879b3d22abc4287918
2011-06-02 17:23:32 +09:00
Tadashi G. Takaoka 48a00c409d Fix key label of switching alphabet and symbols key (DO NOT MERGE)
Bug: 4499754
Change-Id: I8048b5d7e0ec90a545dac0827b699d37698bebb5
2011-06-02 10:07:57 +09:00
Tadashi G. Takaoka cf93043d13 Update drawables (DO NOT MERGE)
Bug: 4442045
Change-Id: I97068cdd50cc24a72610aa087dd624484862fa06
2011-06-01 19:51:49 +09:00
Tadashi G. Takaoka 2f894882a8 Revised phone/number layout for 7 inch tablet
Bug: 4442045
Change-Id: I562d75436aec2057863f6a8252275a5e47ecea6e
2011-06-01 18:45:28 +09:00
Tadashi G. Takaoka fd2f1a1677 Remove number hint from 7 inch layout
Bug: 4442045
Change-Id: I55ad5ea45bc2a089486e69ca38a0e174dd7957d6
2011-05-31 20:31:00 +09:00
Tadashi G. Takaoka 9b4e897e98 Fix "." key code of number layout on 7 inch tablet (DO NOT MERGE)
Bug: 4442045
Change-Id: Ib3e4ac7f2fab84134e0c9c3fdbf107a91acad301
2011-05-31 18:30:37 +09:00
Tadashi G. Takaoka 75f812aff9 Updated IME drawables to support 7 inch devices
This change syncs all drawables from Honeycomb-MR2 into Master.

Bug: 4442045
Change-Id: Ia539aa62bfc355ccc742cf5aa600463c7b604187
Cherry-pick: I98664b0c954be82eeda00c69e712da2e20ca606a
2011-05-31 18:19:19 +09:00
Tadashi G. Takaoka 327763e518 Adaptive keyboard width/position parser
This change introduces the following features to Keyboard XML format.

 * "keyXPos" can specify the key X coordinate directly.
 * "keyXPos" can be negative. The X coordinate will be calcluated from
    the right edge of the keyboard toward left.
 * "keyWidth" can be zero to be filled up to the right side.
 * "keyWidth can be negative. The key will be filled up to both sides.
 * Spacer's horizontalGap is renamed as keyWidth, and can be inherited
   from key-style.
 * Spacer can have keyXPos attribute.

Using these syntax, all keyboard layouts have been re-written.

Cherry-Pick: I314b2e8ca2aa145ff9506cbf927140a15685af42
Bug: 4442045
Change-Id: I048fe5eaef020d8472ab577e9d326042bae2f3fa
2011-05-31 17:52:32 +09:00
Tadashi G. Takaoka 2c187a7662 Remove voice key option from 7 inch tablet setting.
Bug: 4442045
Change-Id: I5e75e9e61a3be81295d4271d6302233c97e9ea5a
2011-05-31 10:55:00 +09:00
Tadashi G. Takaoka 6b38a5fd4c Adaptive keyboard width/position parser (DO NOT MERGE)
This change introduces the following features to Keyboard XML format.

 * "keyXPos" can specify the key X coordinate directly.
 * "keyXPos" can be negative. The X coordinate will be calcluated from
    the right edge of the keyboard toward left.
 * "keyWidth" can be zero to be filled up to the right side.
 * "keyWidth can be negative. The key will be filled up to both sides.
 * Spacer's horizontalGap is renamed as keyWidth, and can be inherited
   from key-style.
 * Spacer can have keyXPos attribute.

Using these syntax, all keyboard layouts have been re-written.

Bug: 4442045
Change-Id: I314b2e8ca2aa145ff9506cbf927140a15685af42
2011-05-28 10:01:00 +09:00
Tadashi G. Takaoka 88251a9555 Rename resource folder according to new naming scheme
Change-Id: I45a29d753103d82b625e55e78f1075497e94396f
2011-05-28 01:17:13 +09:00
Tadashi G. Takaoka fd8245b3f2 Merge "Add number password keyboard layout to phone" 2011-05-27 09:09:41 -07:00
Tadashi G. Takaoka a8fd3af67a Merge "Remove web mode and add webInput boolean" 2011-05-27 09:09:30 -07:00
Tadashi G. Takaoka c2a37c7392 Merge "Rename filename of hint icons for numbers" 2011-05-27 09:09:18 -07:00
Tadashi G. Takaoka fa847fe9b5 Add number password keyboard layout to phone
Bug: 4479212
Change-Id: I230371632d5ba0d940e576a9b8b6668079990004
Cherry-pick: Ia0a284a3
2011-05-27 22:13:06 +09:00
Tadashi G. Takaoka 9e2d810dc5 Remove web mode and add webInput boolean
Bug: 4490948
Change-Id: I6fe23c9ab4918eab6806cc621c4d6821c2e1baf9
Cherry-Pick: I4cd1af0b
2011-05-27 21:47:14 +09:00
Tadashi G. Takaoka c29c69a372 Rename filename of hint icons for numbers
Change-Id: Ibd844167199f5d884d97b8fe9f536f47fbe5bdcd
Cherry-Pick: I1f3bc846
2011-05-27 21:14:52 +09:00
Tadashi G. Takaoka ec8cb2eb53 Merge "Remove web mode and add webInput boolean (DO NOT MERGE)" into honeycomb-mr2 2011-05-27 00:06:46 -07:00
Tadashi G. Takaoka 38515ae577 Remove web mode and add webInput boolean (DO NOT MERGE)
Bug: 4490948
Change-Id: I4cd1af0b48d7ebcf8f4bd939e0e363e34dbfe8b7
2011-05-27 15:20:08 +09:00
satok 375f45cd19 Merge "Fix whitelist" 2011-05-26 20:26:13 -07:00
Eric Fischer 144e97f154 Import revised translations.
Change-Id: I03c7133e46f6067f1912e778b498bf1915f42441
2011-05-26 15:47:59 -07:00
Eric Fischer 01a12eb1d8 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-26 11:38:04 -07:00
Eric Fischer 5ea4c0cec3 Import revised translations. DO NOT MERGE
Change-Id: I1f50ea2efc93a69ccd27df5e2708bdd8384f0df1
2011-05-26 11:26:29 -07:00
Tadashi G. Takaoka ab9335e949 Merge "Update phone/number layout with new 7inch design (DO NOT MERGE)" into honeycomb-mr2 2011-05-26 10:38:52 -07:00
Tadashi G. Takaoka 37445e1136 Update phone/number layout with new 7inch design (DO NOT MERGE)
Bug: 4442045
Change-Id: I346489b62b424f6fb897b109310b62b2538ef397
2011-05-27 01:20:43 +09:00
Tadashi G. Takaoka a3eff88af6 Fix Russian keyboard input code
This is cherry pick from Honecyom-MR2 Iebeec413.

Change-Id: I11b292fe4469f1d0232948b57a93cd0f0275c87d
2011-05-26 23:35:54 +09:00
Tadashi G. Takaoka c4fc3b0266 Fix Russian keyboard input code (DO NOT MERGE)
Change-Id: Iebeec413f7f7d26fc00102a27c4eaec1fb63f8a1
2011-05-26 23:07:41 +09:00
Tadashi G. Takaoka d8638ff34b Introduce new 7" keyboard layout (DO NOT MERGE)
This change only changes QWERTY layout.  The phone/number and
AZERTY/QWERTZ/Russian/Scandinavia layouts will be fixed soon.

Bug: 4442045
Change-Id: Ib42c84e1d05fee513b1b7680ef0dcf755298d444
2011-05-26 20:33:17 +09:00
satok a0493fa070 Fix whitelist
Bug: 4090049
Change-Id: I1d57ddafcacb895196c65acaae198dad7499983b
2011-05-26 20:30:27 +09:00
Tadashi G. Takaoka f5d9649680 Introduce web and email mode (DO NOT MERGE)
This change introduces new keyboard mode "webEmail" to honor
InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS. In this mode, both
'@' key and TAB key appear on the keyboard.

The keyboard layouts will be modified with other change.

Bug: 4490948
Change-Id: I66f9bda4907da448db097e9c900199dfa700b16a
2011-05-26 19:47:47 +09:00
Justin Ho b0598460cf Updated IME assets and layouts to support 600dp devices
Bug: 4442045

Change-Id: I98664b0c954be82eeda00c69e712da2e20ca606a
2011-05-25 18:39:03 -07:00
Tadashi G. Takaoka 13a7419994 Use custom theme for Keyboard theme switch
This change reduces the number of layout files and make these
theme-generic.  This might be very helpful to re-design suggestion
strip.

Bug: 4175031
Change-Id: Idca10a4aa0bf7ac496eedd1879311e59780a423b
2011-05-25 18:59:00 +09:00
Tadashi G. Takaoka f71454fecb Slightly lower the keyboard height on 7" landscape (DO NOT MERGE)
Bug: 4479212
Change-Id: Ie3b1d82ee659c5f67eede936c079e99c1a4451b9
2011-05-24 16:10:54 +09:00
Tadashi G. Takaoka c150acc7c8 Move CandidateView into input view
Bug: 4175031
Change-Id: I95f379b9943d1dcab1dc5527b6e5ac5abd58e280
2011-05-24 15:37:53 +09:00
Tadashi G. Takaoka 5903e061ad Merge "Reorganize drawable for large and xlarge device (DO NOT MERGE)" into honeycomb-mr2 2011-05-23 23:11:48 -07:00
Tadashi G. Takaoka eef3b7b328 Add number password keyboard layout to phone (DO NOT MERGE)
Bug: 4479212
Change-Id: Ia0a284a365af99257ed47351bdd3387fd9a53eba
2011-05-24 12:31:52 +09:00
Tadashi G. Takaoka 83fdaddda8 Reorganize drawable for large and xlarge device (DO NOT MERGE)
Because the holo theme drawables have "holo" effect around 9-patch as
fixed size image, so we need dedicated drawables for each sw600dp-mdpi
and sw768dp-mdpi resolutions for visual designers.

 * drawable-mdpi         (fallback resources)
 * drawable-sw600dp-mdpi (7" tablet, phone style keyboard, placeholder for now)
 * drawable-sw768dp-mdpi (10" tablet, tablet style keybaord)

Note that:
 * Eventually sw600dp drawables will be updated by designers.
 * We need sw768dp drawable copies because, without these, 10" tablet
   will use updated sw600dp drawables wrongly.
 * We have to keep drawable-mdpi as final fallback resources.

Bug: 4436327
Change-Id: I93db87ee99c2abb8d18e869e5411e3cb5bec1020
2011-05-23 19:44:50 +09:00
Tadashi G. Takaoka 88100d3651 Rename filename of hint icons for numbers (DO NOT MERGE)
Bug: 4436327
Change-Id: I1f3bc846683edc4be666dce8ea89659225ef7301
2011-05-23 19:10:39 +09:00
Tadashi G. Takaoka 20920c0178 Remove unnecessary executable permission from drawable
Cherry-Pick: Ie8644396e1df8fbc16e4047808857c91aa2451ba
Bug: 4436327
Change-Id: I6917876995f20361358b6e6577fc646795f04d7e
2011-05-23 16:22:49 +09:00
Tadashi G. Takaoka 51139a6104 Merge "Remove unnecessary executable permission from drawable" into honeycomb-mr2 2011-05-22 23:51:04 -07:00
Tadashi G. Takaoka f4e2af842c Remove unnecessary executable permission from drawable
Bug: 4436327
Change-Id: Ie8644396e1df8fbc16e4047808857c91aa2451ba
2011-05-23 15:49:00 +09:00
Tadashi G. Takaoka f4911e4348 Rename resources with new scheme (DO NOT MERGE)
This change renames resources along with new naming scheme.
  * large to sw600dp  (7" tablet uses phone keyboard layout)
  * xlarge to sw768dp (10" tablet)

Bug: 4436327
Change-Id: I96678fa699d2abcb48022d8878557f1486e839aa
2011-05-23 13:16:08 +09:00
Tadashi G. Takaoka c142f5e48c Fix Android Keyboard crash on hdpi device
Cherry-pick: I9fcb970c214e92ad7711fbbf4a375a8c3c6d024b
Bug: 4436327
Change-Id: I0d1831783cbff7b9056f84819fbcb8a4a9a34d5d
2011-05-21 14:51:05 +09:00