Commit Graph

327 Commits (df1b8d5eec1909a7ff000825e20e1e45d6f39297)

Author SHA1 Message Date
Jean Chalard 72b1c93941 Reinstate the shortcut-only attribute
Also add the blacklist attribute

Bug: 7005742
Bug: 2704000
Change-Id: Icbe60bdf25bfb098d9e3f20870be30d6aef07c9d
2012-08-31 22:11:52 +09:00
Yuichiro Hanada 666a433802 add UserHistoryDictIOUtils.
Change-Id: I8a70e43b23f65b5fd5f0ee0b30a94ad8f5ef8a8a
2012-08-31 15:08:57 +09:00
Yuichiro Hanada b2a43a2ed4 add readUnigramsAndBigramsBinary.
Change-Id: I7967f11211221d4877bf0a0c30183af885f45390
2012-08-31 14:39:19 +09:00
Tadashi G. Takaoka 35ff94547c Separate inner classes of keyboard package out under internal package
Change-Id: Ia3969bd5ddec5aa5d81d05ad4cf676d818587922
2012-08-30 15:37:55 +09:00
Jean Chalard 5cc596160a Merge "Use ByteBuffer when reading FusionDictionary from file." into jb-mr1-dev 2012-08-23 21:56:02 -07:00
Yuichiro Hanada d4fe7fda30 Use ByteBuffer when reading FusionDictionary from file.
Change-Id: Ia71561648e17f846d277c22309ac37c21c67a537
2012-08-24 13:31:08 +09:00
Tadashi G. Takaoka 64a26b4389 Fix bug in InputPointers.append
Change-Id: I39825757bbae32b66c4b61cb6c4fbcaa2e0c9c47
2012-08-23 17:59:08 +09:00
Tadashi G. Takaoka 9fc6af325e Fix SubtypeSwitcher initialization path
This change also removes the reference of LatinIME from
SubtypeSwitcher.

Bug: 7026856
Change-Id: I78a266f3682b11f09b49bbcdcdb6aee713e6af37
2012-08-22 16:05:34 +09:00
Tadashi G. Takaoka 5f282ea9e4 Add CollectionUtils class to create generic collection easily
Change-Id: I6b4de9187e122298e5e9cd8ddc9070d062df6a89
2012-08-22 10:21:38 +09:00
Tadashi G. Takaoka ac78633be2 Rename and consolidate some constants
Change-Id: I7863936cca18b28bf0117afcbcf544a5fd7f185d
2012-08-21 17:54:53 +09:00
Tadashi G. Takaoka 6785b90727 Remove touch coordinate from pickSuggestionManually
Change-Id: I33b1b4bc6fdfd263c4b2bb7125c07b4bddcf3c9f
2012-08-21 17:13:45 +09:00
Yuichiro Hanada 0d35c159fe fix findWordInTree.
Change-Id: I8f42df28f76188677db9d4e55885e1fc6a40b53f
2012-08-17 10:23:01 +09:00
Yuichiro Hanada 66f338983b fix findWordInTree.
Change-Id: I9d81c815494a0670afa81219ad7bad82274d997e
2012-08-16 20:21:47 +09:00
Tadashi G. Takaoka 7ae1fd02d4 Use ArrayList to implement PointerTrackerQueue
Change-Id: Ie386e6c7869df4df940e09fccffc5cd661134557
2012-08-08 14:18:30 +09:00
Tadashi G. Takaoka 0cc425bd9c Add PointerTrackerQueue unit tests
This is a groundwork to elminate LinkedList from PointerTrackerQueue.

Change-Id: Ib77780537ceb0b4273fb8e483977ab76124c5ce7
2012-08-07 16:56:41 +09:00
Ken Wakasa bf505d9899 Add <uses-sdk> in manifest files of test apks
Change-Id: If5d0aeba8fadb25f67bcd9132dd6c56e5bf9899e
2012-07-31 19:53:31 +09:00
Jean Chalard f68fe7a9c9 Don't forward phantom space state on stripper input
Bug: 6890540
Change-Id: I923b24e3bc17e7b923be4940ad739b58dca24a1f
2012-07-31 01:48:10 +09:00
Tadashi G. Takaoka c8e45ddb03 Rename LatinKeyboardView to MainKeyboardView
Change-Id: I8f3123b8d727c7beb72e226f80c17794f89c8b60
2012-07-23 12:11:43 +09:00
Tadashi G. Takaoka 7abdcf1ed3 Implement ResizableIntArray.fill
Change-Id: I570641bc2f32d016c247db6c065a138d8235ab8c
2012-07-20 16:05:37 +09:00
Tadashi G. Takaoka c49c85f835 Implement ResizableIntArray.setLength and .get
This change revises ResizableIntArrayTests as well.
2012-07-20 12:02:38 +09:00
Tadashi G. Takaoka 9370ab9ada Make ScalableIntArray public as ResizableIntArray
Change-Id: Ibbbc117214912ffa192c694bde5b7d55154f40c4
2012-07-19 20:37:53 +09:00
Tadashi G. Takaoka f583098887 Update InputPointers unit test comments 2012-07-19 20:02:01 +09:00
Tadashi G. Takaoka 57f7de0ba6 Add default capacity parameter to InputPointers' constructor
Change-Id: I02f23096f0682d30effe4dfc1ca57881a1e4aedc
2012-07-19 12:06:00 +09:00
Tadashi G. Takaoka 7247bff6d6 Fix InputPointers.append
Change-Id: I6995f9b2ed00b9f948e1299e576a5e24725d58f8
2012-07-13 11:46:03 +09:00
Tadashi G. Takaoka 2ad6d12a30 A little optimization of InputPointers.copy
Change-Id: Id83b34e076ef91e06d7c1dd2b3ee7bb64d01b8cb
2012-07-10 13:05:43 +09:00
Jean Chalard d579f1aefc Consolidate methods that do the same thing (A74)
Change-Id: I6e7c3aba2b40ecefa483c9680978bc806368e96e
2012-07-09 15:06:16 +09:00
Jean Chalard 0e9e7e337d Cleanup (A57)
We stopped cancelling manual picks a few weeks ago. This code
is dead.

Change-Id: I4032fcc3c95e9379f1839fe860a1b8a9bd7d0bc7
2012-07-06 13:07:30 +09:00
Jean Chalard f254e3fec7 Fix a bug where the caps mode would not be changed
Bug: 6766059
Change-Id: I378f9d35c4904c4f373260bda5863235d833eb31
2012-07-06 11:08:20 +09:00
Jean Chalard 83f4a9866a Cleanup, part 10 : remove from the code obsolete options (C10)
Change-Id: Id0806ad3dc7ccb632713eebaca76f0bab26ece5d
2012-06-21 10:07:05 +09:00
Jean Chalard b0561ae980 Remove a member (B5)
The new call in the test ensures getCurrentInputEditorInfo actually
works.

Change-Id: I2ee407bd9927d22db537d12f339e2b977a38054a
2012-06-19 03:27:37 +09:00
Tadashi G. Takaoka 9a5bf1d12e Use InstrumentationTestCase and get rid of AndroidTestCase.getTestContext call
Bug: 6202480

Change-Id: I19e04f17614e70867f8383d08667e350d753cde9
2012-06-12 11:23:56 -07:00
Jean Chalard 02308bec63 Merge RichInputConnection with EditingUtils
Change-Id: I9982ff325bef56694402caef28a77683c52ccd71
2012-06-08 20:04:09 +09:00
Tadashi G. Takaoka 2033d9880e am 08c295c5: am 9a321180: Add unit tests for double tap shift key
* commit '08c295c5bb8d48b26a4486ed42a32a955b39ddd3':
  Add unit tests for double tap shift key
2012-05-29 03:31:09 -07:00
Tadashi G. Takaoka 8f3b46fc69 am c79a7104: am 2959fc0f: Delay shift lock transient until long pressed shift key is released
* commit 'c79a710445cca2a69dca9600a2c06eadcb253b62':
  Delay shift lock transient until long pressed shift key is released
2012-05-29 03:31:08 -07:00
Tadashi G. Takaoka 9a3211802b Add unit tests for double tap shift key
Bug: 6568746
Change-Id: I84db31ce86e3e043ac9f9bb971663a629fa3d3c7
2012-05-29 19:23:45 +09:00
Tadashi G. Takaoka d231d5d322 am 57da84da: am fb0a4ba8: Add unit tests for long press shift key
* commit '57da84dac4618c0848af02509b42cf913376f382':
  Add unit tests for long press shift key
2012-05-29 03:03:19 -07:00
Tadashi G. Takaoka 2959fc0f13 Delay shift lock transient until long pressed shift key is released
Bug: 5424586
Change-Id: Ib602af1b38b1b109bdac9cb0c53132169556db2f
2012-05-29 18:14:11 +09:00
Tadashi G. Takaoka 9afa42ddf0 am 7291fbce: am 16531ad5: Merge "More precise KeyboardState unit test" into jb-dev
* commit '7291fbce4776519f764a4a175951a9ae2a1c2a30':
  More precise KeyboardState unit test
2012-05-29 02:11:59 -07:00
Tadashi G. Takaoka fb0a4ba8fd Add unit tests for long press shift key
Bug: 5424586
Change-Id: I8465b7e2cebb07a135e24ea33eb7b7fb6752f7a2
2012-05-29 18:11:07 +09:00
Tadashi G. Takaoka 0d6d4c20ce More precise KeyboardState unit test
Bug: 5424586
Change-Id: I838c82e3fe4629929cbd6e21111d139e7becab55
2012-05-29 16:42:43 +09:00
Tadashi G. Takaoka 59f5f250cf am e03f6b39: am e0952029: Merge "Make KeySpecParser case sensitive again" into jb-dev
* commit 'e03f6b3917f71a7c9f9459765264b547cc80b751':
  Make KeySpecParser case sensitive again
2012-05-28 03:33:28 -07:00
Tadashi G. Takaoka 0a3362d264 Make KeySpecParser case sensitive again
Partially revert I76c3e917.

Bug: 6561272
Change-Id: I5649a8ecb44bd11c67785ea97ddbb67b0a019ccc
2012-05-28 19:07:51 +09:00
Tadashi G. Takaoka 1b6caa9fe6 am ee78fb26: am 7ab7f66c: Fix adjusting key\'s label/code case
* commit 'ee78fb2634e7bf74d3e21faf9630e5d8cd67cda0':
  Fix adjusting key's label/code case
2012-05-27 21:12:32 -07:00
Tadashi G. Takaoka 7ab7f66c2d Fix adjusting key's label/code case
With this fix, we may probably be able to revert I76c3e917 (Make
KeySpecParser case insensitive).

Bug: 6561272
Change-Id: Ic7571560d7b422ffc9a07f0acecd388e0b330d50
2012-05-28 12:34:49 +09:00
Jean Chalard 37e9eb2b56 am e0f8476f: am ab619812: Merge "Fix some of the input logic tests" into jb-dev
* commit 'e0f8476f71be89e78530f739bee91dd78cdbbc44':
  Fix some of the input logic tests
2012-05-22 02:40:08 -07:00
Jean Chalard ab619812a5 Merge "Fix some of the input logic tests" into jb-dev 2012-05-22 02:35:33 -07:00
Jean Chalard f83a6821bb Fix some of the input logic tests
This behavior has been changed for bug#6105732

Bug: 6516976
Change-Id: Ief8225b26d831cd92a051ce25cc005270b6b1776
2012-05-22 18:28:05 +09: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 4071470d69 am 168147fa: am 65331d6e: Merge "Add multi touch and shift chording unit tests" into jb-dev
* commit '168147fa11b275d4c21ba0ac909dd499f8252bfe':
  Add multi touch and shift chording unit tests
2012-05-21 14:29:47 -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
satok ef04186ce8 am 9a06a1e9: am 468ac358: Merge "Add utils for forgetting curve" into jb-dev
* commit '9a06a1e9eab191838a623aa074c65fd77a2ac7d9':
  Add utils for forgetting curve
2012-05-21 12:44:31 -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 2972ccb851 Add multi touch and shift chording unit tests
Bug: 6501446
Change-Id: Iac423d152702241adae77fe1c343541d70608269
2012-05-21 15:01:41 +09: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
satok 607a924486 Add utils for forgetting curve
Bug: 4192129
Change-Id: Iebb7ac355e1c1891da31c33754315bd76a61889b
2012-05-18 14:50:05 +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
Tadashi G. Takaoka ca93442026 Fix newly created custom input style display name
This will revert I4263632e

Bug: 6443665
Bug: 6410653
Change-Id: Id9ad1a204ed9802488abfc2c536a95d62d55afe0
2012-05-07 02:42:08 +09:00
Tadashi G. Takaoka 757c12556b Get subtype name string resource from its own locale
Bug: 6443655
Change-Id: Ib9ee55178f0d0f885aa0640b9cba4a179cf0c566
2012-05-07 00:44:54 +09:00
Tadashi G. Takaoka 27b42ced86 Fix "no language" subtype name (DO NOT MERGE)
* Move SubtypeLocale.get{Full,Middle,Short}DisplayName() to
  LatinLeyboardView and add unit tests (SpacebarTextTests).
* Add SubtypeLocale.getSubtypeDisplayName()

This is a cherry-pick of I57420c6a from Master.

Bug: 6393865
Change-Id: I68748189c17c73984ac4ae05a5a40fb54bf46453
2012-04-26 11:50:28 +09:00
Tom Ouyang 0806bb01d9 Binary bigram lookup checks both uppercase and lowercase when previous word is uppercase.
Bug: 6363029
Change-Id: I71a1ed5b88f54fcc15bfaf89d3645b8f17ebb821
2012-04-22 17:48:00 -07:00
Tadashi G. Takaoka 38026b4f03 Predefined keyboard layouts are configurable via XML resource
Bug: 4460018
Change-Id: Ia03ec826fb3853ea814d9764686903dbe31a6507
2012-04-20 19:19:24 +09:00
Tadashi G. Takaoka 6bfd5f6319 Fix confusable "label" usage, use "text" instead
* Rename makelabel tool to maketext
* Rename KeyboardLablesSet class to KeyboardTextsSet
* Rename "!label/name" to "!text/name"

Change-Id: Ia9494a89fe56f20ca8e8fedb253adbcf8b771bd3
2012-04-20 15:48:30 +09:00
Tadashi G. Takaoka cf41aff251 Use string attribute for icon name
Change-Id: I336acf33c7e6bc993b9da9b17ec689975fa8127d
2012-04-20 15:31:42 +09:00
Tadashi G. Takaoka 050b577bfb Merge "Make KeySpecParser case insensitive" 2012-04-19 21:21:18 -07:00
Tadashi G. Takaoka 2f16fd40fa Make KeySpecParser case insensitive
Change-Id: I76c3e9179dd8777d3cf3138ad76513d83672debf
2012-04-20 13:20:08 +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 c27fe6253c Add custom subtype settings
Bug: 4460018
Change-Id: I4919d79516dcf574be2761bbaf9adcdc381b2ddc
2012-04-19 19:33:51 +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 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 9bfb620215 add logPoint for manual correction (inc touch pos)
Bug: 6188932
Change-Id: Ibcc4901bcfab6632ee4c59cb58d35452218a288d
2012-04-16 16:52:25 -07:00
Jean Chalard 9f7392ea9d Adjust a test for a new default setting
Bug: 6338940
Change-Id: I8f14ce0de768ddb0394eb2b584d8753e0df82a28
2012-04-16 18:34:30 +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
Jean Chalard f338f8b50d Add a test for umlauts
Change-Id: I2c15e9dc7a1cf846c92a1900d68f661aa70e77b9
2012-04-13 17:38:16 +09:00
Tadashi G. Takaoka 8abde7db6b Refatcor InputMethodSubtype related stuff a bit
Change-Id: Iaded72331660afbaeddda085f2b633b681d4b6df
2012-04-13 16:24:11 +09:00
Brett Chabot 5abbf24eb0 Remove format method from tests.
Will be added to superclass.

Bug 5826326

Change-Id: I61478661b822823112f774745a6642a6185366d3
2012-04-11 19:03:19 -07:00
Kurt Partridge fed44d08d8 Merge "change ResearchLoggerTests to check file" 2012-04-11 13:19:52 -07:00
Kurt Partridge b8e2ae3bc3 change ResearchLoggerTests to check file
multi-project commit with I587003f2

Bug: 6188932
Change-Id: I3d3f0c9d011301489473dc330338ea4a7ba61e9e
2012-04-11 11:17:44 -07:00
Tadashi G. Takaoka 2be51f4fd0 Generate KeyboardLabelsSet from donottranslate-more-keys.xml
This change introduces makelabel tool that reads all languages'
donottranslate-more-keys and generate KeyboardLabelsSet.java source
file. The makelabel command must be invoked prior to compile LatinIME.

Change-Id: I7515c7919c535e30f9c80a37bdc831d0f682cd43
2012-04-11 11:23:47 +09:00
Tadashi G. Takaoka 8834e3dbce Fix KeyboardCodesSet code mapping
This is a follow up for Icfd6d06f.

Change-Id: I9a11c6f1c8d9654e3fb004940791055c2bcf9f17
2012-04-10 15:09:26 +09:00
Tadashi G. Takaoka 7f0c503afc Use !icon/<icon_name> notation for more keys spec
Change-Id: I616e6c1ac603d2eb7a5c99ec70d5411371d15f3e
2012-04-10 12:01:07 +09:00
Tadashi G. Takaoka ed3bac91f2 Introduce KeyboardCodesSet.java and remove keycodes.xml
Change-Id: Icfd6d06f47425aa037682d22c895548ba6f047d8
2012-04-10 11:53:58 +09:00
Tadashi G. Takaoka 11d9ee742f Use keyboardSet extra value of subtype to specify layout type
Change-Id: Ice1f345a08a8d760e3b847c885c4072e3e142c97
2012-04-05 17:25:15 +09:00
Tadashi G. Takaoka 234bf612ca Merge "Use "No language (QWERTY)" for language agnostic QWERTY keyboard name" 2012-04-03 21:03:10 -07:00
Tadashi G. Takaoka 3bf57a5624 Use "No language (QWERTY)" for language agnostic QWERTY keyboard name
Bug: 6010147
Change-Id: I401c2e3fcd639c0e1a03e64489a0d792810caa18
2012-04-04 12:58:42 +09:00
Tadashi G. Takaoka e0d06fa793 Merge "Use InputMethodInfo.getSubtypeAt() to list all subtype in test" 2012-04-03 20:27:06 -07:00
Tadashi G. Takaoka 52d50f9bd1 Use InputMethodInfo.getSubtypeAt() to list all subtype in test
Change-Id: Ie42effc1c67870d70d0b6a5daed44b811063942b
2012-04-04 11:57:16 +09:00
Tadashi G. Takaoka fab089dac5 Fix restoring debug mode in InputTestBase
Change-Id: I71f01b86c0e8b1e56d39d85795dc0a844cc6285f
2012-04-04 11:21:59 +09:00
Tadashi G. Takaoka 9cc2c94c8b Remove InputMethodSubtypeCompatWrapper
Bug: 6129704
Change-Id: I8f84f0f61a2205ac1fcd1cd40e3a586ee535282d
2012-04-03 15:31:26 +09:00
Ken Wakasa 25d59687c8 Fix the build. Corresponding to I0f1a0dee
Change-Id: Ibe31549a200f4c307fa4c1d4ef9ddac0a5952218
2012-03-30 23:30:57 +09:00
Tadashi G. Takaoka fb5b4c4fc3 Add language agnostic QWERTY subtype
Bug: 6010147
Change-Id: I705e38ac889172ae8b7c2a68e5c688f2ffc28320
2012-03-30 18:20:52 +09:00
Tadashi G. Takaoka 6aaa105a85 Fix coordinates of InputTestsBase.type
Bug: 6225317
Change-Id: I5c9adb3e65e5742680309b4f2d1a9f2b83ce546f
2012-03-28 20:21:26 +09:00
Ken Wakasa c166697e3f Optimization: Start making use of ProductionFlag.IS_EXPERIMENTAL for ResearchLogger
Move GodMode specific tests to relevant directories as well.

This goes along with I9dc4d469

Change-Id: I4a21c53846b26eede346cb1da13e6abbdf9ec27f
2012-03-27 11:55:23 +09:00
Kurt Partridge 2482e6c386 add tests for ResearchLogger
Bug: 6188932
Change-Id: Icf407f9d145d2b25b70d5d7bc30ee3d64561620c
2012-03-26 17:21:50 +09:00
Jean Chalard 0d708b0cf5 Separate input logic tests in several categories.
The intent is to make things easier to read.

Change-Id: Ida95ac8bd4119a2497d3e2a4d92485a96316962d
2012-03-23 14:22:47 +09:00
Jean Chalard 8592ed408e Split input logic tests to make creating new tests easier
This will allow easier reuse of the complicated set up code
and the various helper methods.

Change-Id: I864eb0da476cbf0fe087ddb1713af80d3c3eb850
2012-03-23 14:15:50 +09:00
Jean Chalard 109728193e Don't rely on spell checker proximity in tests
This fixes the input logic tests that were broken and suppresses
their dependency upon the spell checker proximity. Instead, it
gets the Keyboard instance from Latin IME and uses the actual
coordinates, which results in a test run closer to what actually
happens during typing.

Change-Id: I3a81d249ee7fb3ac6ae6940aa2e8b2421e829e5c
2012-03-22 18:08:23 +09:00
Jean Chalard 6ec1209a33 Fix a bug where quotes and dashes are considered letters
Bug: 6174065
Change-Id: I702760d44ead0eeb60d06360aa3bb03c2ec73325
2012-03-15 18:18:52 +09:00
Jean Chalard 274a0643b1 Give InputLogicTests the ability to change language
Also fix a typo, and increase the time allowed to load the main
dictionary to 2 secs instead of 1.

Bug: 6114326
Change-Id: I5f70b34fc4277c55977b18466253152aa98a2507
2012-03-08 16:39:29 +09:00
Jean Chalard 845b24d9d3 Fix a bug with successive manual picks
Bug: 6121571
Change-Id: Ib16fbef1087da3b7da5539901ec57156f242f089
2012-03-07 17:32:42 +09:00