Commit Graph

6359 Commits (97151f1a396291912f9374e8c057f183be33ed3d)

Author SHA1 Message Date
Jean Chalard d515f134f7 Refactoring
This creates a new DictionaryInfoUtils class and moves a bunch
of static methods there for later usage.

Change-Id: Iecb0643e6029a7be36bd6cb36aa918c40e6d8c6a
2013-01-29 19:16:21 +09:00
Tadashi G. Takaoka c6be8b5d8d am 83f173cc: Merge "Remove {max,min}keyboardHeight attribute from Keyboard"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '83f173cccd4cd6be0a9ab56ac2d199625ec03525':
  Remove {max,min}keyboardHeight attribute from Keyboard
2013-01-29 01:36:23 -08:00
Tadashi G. Takaoka 83f173cccd Merge "Remove {max,min}keyboardHeight attribute from Keyboard" 2013-01-29 09:34:19 +00:00
Tadashi G. Takaoka 17dae3057c Remove {max,min}keyboardHeight attribute from Keyboard
This change removes a DisplayMetrics reference from KeyboardBuilder.

Change-Id: I512694274e69e5281d5be47c3f938bcfd6571152
2013-01-29 18:32:04 +09:00
Tadashi G. Takaoka b6b7a37973 am f6aed4bd: Merge "Add summary text to sliding key input preview settings"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit 'f6aed4bdd2ba8814cbd4f7cdeead629b068f4a75':
  Add summary text to sliding key input preview settings
2013-01-29 00:59:08 -08:00
Tadashi G. Takaoka 84106a776b Add summary text to sliding key input preview settings
Bug: 8089491
Change-Id: I15801281a95b01c67ef23a9c1558d6cdf457d375
2013-01-29 17:53:38 +09:00
Baligh Uddin 56012e5ab9 Revert "Import translations. DO NOT MERGE"
broken build.

This reverts commit 2c77683281

Change-Id: I2abbb8f148990a7778c8782834b5996b52e45dbe
2013-01-28 19:12:04 +00:00
Baligh Uddin 2c77683281 Import translations. DO NOT MERGE
Change-Id: Ia29e0c424e5210919bc6f9c4683a2c96e2936cad
Auto-generated-cl: translation import
2013-01-28 09:49:30 -08:00
Baligh Uddin e7dec3592d Import translations. DO NOT MERGE
Change-Id: I38345ff37dbce7cf5323ddc14e77378e5f1631cc
Auto-generated-cl: translation import
2013-01-28 09:44:27 -08:00
Tadashi G. Takaoka 5e24367cbc am 8630cd9d: Remove keyboard layout description on the spacebar
# Via Tadashi G. Takaoka
* commit '8630cd9d1708d42b3ed5d07d89ade2f3c1f85e47':
  Remove keyboard layout description on the spacebar
2013-01-27 19:45:16 -08:00
Tadashi G. Takaoka 8630cd9d17 Remove keyboard layout description on the spacebar
Bug: 8056376
Change-Id: I33f07e7a044c2b5fc20de40c7a9777dab493e41c
2013-01-28 11:49:44 +09:00
Kurt Partridge 768a00a77f am f77e9d7e: Merge "Initialize ResearchLogger later to avoid NPE"
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit 'f77e9d7e3adcd89c00243f4215bebb3ece3b59dd':
  Initialize ResearchLogger later to avoid NPE
2013-01-25 09:19:21 -08:00
Kurt Partridge f77e9d7e3a Merge "Initialize ResearchLogger later to avoid NPE" 2013-01-25 17:17:34 +00:00
Jean Chalard 72a323a1eb am 5228745a: Merge "Remove pending update messages upon starting a gesture"
# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit '5228745ae025571d25062e12f5aedcd71ad08ebb':
  Remove pending update messages upon starting a gesture
2013-01-25 04:36:21 -08:00
Jean Chalard 5228745ae0 Merge "Remove pending update messages upon starting a gesture" 2013-01-25 12:34:46 +00:00
Tadashi G. Takaoka 0fcccea4d9 am ce875664: Clean up Settings and SettingsFragment a bit
# Via Tadashi G. Takaoka
* commit 'ce875664e0564f3e26d130a4d3e8b8e9a2e8a368':
  Clean up Settings and SettingsFragment a bit
2013-01-25 00:03:30 -08:00
Jean Chalard a280e56014 Remove pending update messages upon starting a gesture
Bug: 8064307
Change-Id: Ia623ab81b6d12eedc6b20bc4c1ce34ce72d5832f
2013-01-25 17:00:41 +09:00
Tadashi G. Takaoka ce875664e0 Clean up Settings and SettingsFragment a bit
Change-Id: I93bf3cb1ea7e8fc09f4ad34b0bdd74f5f5ff1a68
2013-01-25 16:23:29 +09:00
Tadashi G. Takaoka 606bb8f961 am 52a0d491: Merge "Add preliminary graphics of sliding key input preview"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '52a0d491b4cf72d55997410fa80af3de89c66422':
  Add preliminary graphics of sliding key input preview
2013-01-24 16:14:23 -08:00
Tadashi G. Takaoka 6d70d5f9d2 am 12f2fc71: Merge "Display custom input style name in system locale"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '12f2fc71f7faec34623826ba5c2156ca51046aeb':
  Display custom input style name in system locale
2013-01-24 16:14:22 -08:00
Tadashi G. Takaoka 56af7ef5fa am 0f1ccbff: Merge "Clean up SettingsFragment a bit"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '0f1ccbff179be0e31daf68a571c832ad5306b6b7':
  Clean up SettingsFragment a bit
2013-01-24 16:14:21 -08:00
Tadashi G. Takaoka 7b5fcc4721 am ef43cc9d: Fix dismissing gesture floating preview
# Via Tadashi G. Takaoka
* commit 'ef43cc9d1c78d051b3d2923ce3166e9703d4b2ce':
  Fix dismissing gesture floating preview
2013-01-24 16:14:13 -08:00
Kurt Partridge 10e1176102 am 2baa4b07: [Rlog83] Fix missing uses of hasWord() abstraction
# Via Kurt Partridge
* commit '2baa4b0701c6e02aa25b03881c8863b2d3856282':
  [Rlog83] Fix missing uses of hasWord() abstraction
2013-01-24 16:14:11 -08:00
Kurt Partridge 76cf1c9cd7 am edb5c463: Merge "[Rlog81a] Determine correction type of words"
# Via Android (Google) Code Review (1) and Kurt Partridge (1)
* commit 'edb5c4638b139d6908ceea724120e5a24b21c249':
  [Rlog81a] Determine correction type of words
2013-01-24 16:14:09 -08:00
Tadashi G. Takaoka 78ba90a424 am 9d514af4: Merge "Refactor SubtypeLocale to hold Resources"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '9d514af466915928ce20acf7cb42dfa1bf67c3c2':
  Refactor SubtypeLocale to hold Resources
2013-01-24 16:14:04 -08:00
Tadashi G. Takaoka d6a7e2e311 am 9dc85a67: Merge "Configurable key long press timeout"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '9dc85a673e6eb7c7f0c829e90e3f9fd744af3022':
  Configurable key long press timeout
2013-01-24 16:14:03 -08:00
Satoshi Kataoka f5970c4678 am f1074c50: Throw exception when invalid time stamps are detected in debug mode
# Via Satoshi Kataoka
* commit 'f1074c508e70b3489dc85c036f7ed49d3196ba47':
  Throw exception when invalid time stamps are detected in debug mode
2013-01-24 16:14:01 -08:00
Tadashi G. Takaoka 93cb314cc3 am 40651c8c: Fix activity flags to launch settings activity
# Via Tadashi G. Takaoka
* commit '40651c8cf7d4296927f9c49aaa57bcfc7b5372ca':
  Fix activity flags to launch settings activity
2013-01-24 16:13:59 -08:00
Kurt Partridge 63bc279596 Initialize ResearchLogger later to avoid NPE
Change-Id: I1b817dfbdc319ac9bbf2f08e094a007849ce767f
2013-01-24 11:13:20 -08:00
Tadashi G. Takaoka 52a0d491b4 Merge "Add preliminary graphics of sliding key input preview" 2013-01-24 09:23:28 +00:00
Tadashi G. Takaoka ff961ddf8c Add preliminary graphics of sliding key input preview
Bug: 7548583
Change-Id: Idde6a62f9e64458055c99c893b71c02d1adc7b04
2013-01-24 18:14:20 +09:00
Tadashi G. Takaoka 12f2fc71f7 Merge "Display custom input style name in system locale" 2013-01-24 08:53:46 +00:00
Tadashi G. Takaoka 8203f7afe7 Display custom input style name in system locale
Bug: 8032166
Change-Id: Ib9a6b63c4d540ce377892fb865e53abdd8adec16
2013-01-24 17:44:49 +09:00
Tadashi G. Takaoka f0b5fddcb8 Clean up SettingsFragment a bit
Change-Id: Ic0727003f2645f0c38200b67bb2f4046249c6273
2013-01-24 16:16:53 +09:00
Tadashi G. Takaoka ef43cc9d1c Fix dismissing gesture floating preview
Bug: 8063926
Change-Id: I3b5b29ea0d5e4833e10e830dbdb086c868cd4884
2013-01-24 12:07:01 +09:00
Baligh Uddin dbd518b2d1 Merge "Import translations. DO NOT MERGE" 2013-01-23 22:47:06 +00:00
Baligh Uddin ab54e47fbe Import translations. DO NOT MERGE
Change-Id: I2df467fe9c740e33d2346dd09f5696c95af99aa5
Auto-generated-cl: translation import
2013-01-23 13:00:15 -08:00
Baligh Uddin 0d6bb360fd Import translations. DO NOT MERGE
Change-Id: I9d41872b7ddf1905df41d06f33f922fa41218428
Auto-generated-cl: translation import
2013-01-23 12:55:16 -08:00
Kurt Partridge 2baa4b0701 [Rlog83] Fix missing uses of hasWord() abstraction
Change-Id: I78e286723b1b8c8bcc7aea0cc81ef2ee66a193ac
2013-01-23 09:21:56 -08:00
Kurt Partridge edb5c4638b Merge "[Rlog81a] Determine correction type of words" 2013-01-23 17:12:02 +00:00
Tadashi G. Takaoka 9d514af466 Merge "Refactor SubtypeLocale to hold Resources" 2013-01-23 08:37:57 +00:00
Tadashi G. Takaoka 9dc85a673e Merge "Configurable key long press timeout" 2013-01-23 08:37:36 +00:00
Tadashi G. Takaoka cc5e4a4445 Configurable key long press timeout
The default long presss timeout is 300msec (previous timeout was
400ms).

Bug: 7600340
Change-Id: Ia8b64784ac03588631cfcbad30e021d74f3fd0d8
2013-01-23 17:12:28 +09:00
Satoshi Kataoka f1074c508e Throw exception when invalid time stamps are detected in debug mode
Change-Id: I360b5bd09869bc85ab3bccb8a43a20fed0035d9b
2013-01-23 16:29:19 +09:00
Tadashi G. Takaoka 4b3cae9b0c Refactor SubtypeLocale to hold Resources
Change-Id: Ia667bc2d406d66c87215dd3b9569f36f4642cfe0
2013-01-23 16:23:11 +09:00
Tadashi G. Takaoka 40651c8cf7 Fix activity flags to launch settings activity
This change adds the following flags to the intent to lauch settings activity.
 - Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
 - Intent.FLAG_ACTIVITY_CLEAR_TOP

Bug: 8055342
Change-Id: I85284409bbba3fd284442e5ac4c7a55e58ad15ec
2013-01-23 15:08:35 +09:00
Kurt Partridge 0c16a5c6ee [Rlog81a] Determine correction type of words
Heuristic to determine whether a word was a typo correction or a complete
replacement by examining a correction to see if it falls within the list of
suggested words of the original.

Change-Id: Ieec4861a811e96aef0d14622e662b589ef8b4772
2013-01-22 11:41:52 -08:00
Baligh Uddin ad4cacafc6 Import translations. DO NOT MERGE
Change-Id: I46c30138504fab476bcca30cd4cc83ba108f959e
Auto-generated-cl: translation import
2013-01-22 10:40:33 -08:00
Baligh Uddin 02a2a11ad8 Import translations. DO NOT MERGE
Change-Id: Id03f543eee557ac2eae4333c411fc7d14fecdca7
Auto-generated-cl: translation import
2013-01-22 10:34:46 -08:00
Tadashi G. Takaoka ad7e0f9fe4 am f008a11c: Merge "Cache MoreKeysKeyboard instead of container view of it"
* commit 'f008a11ccef84916197b0031a8ed3353c87c10f1':
  Cache MoreKeysKeyboard instead of container view of it
2013-01-22 00:48:09 -08:00
Tadashi G. Takaoka f008a11cce Merge "Cache MoreKeysKeyboard instead of container view of it" 2013-01-22 08:45:52 +00:00
Tadashi G. Takaoka a729377395 Cache MoreKeysKeyboard instead of container view of it
This change also cleans up MoreKeysPanel related stuff.

Bug: 8047165
Change-Id: I4f2211e00c7d08469a7413568db039c1c597fb3c
2013-01-22 17:34:36 +09:00
Tadashi G. Takaoka 0390acf1ba am 8028c1c5: Merge "SeekBarDialogPreference supports minValue and stepValue"
* commit '8028c1c523b2b7a83ca3f887818bdf9399f20f9b':
  SeekBarDialogPreference supports minValue and stepValue
2013-01-21 23:42:19 -08:00
Tadashi G. Takaoka 8028c1c523 Merge "SeekBarDialogPreference supports minValue and stepValue" 2013-01-22 07:40:48 +00:00
Tadashi G. Takaoka c053293484 SeekBarDialogPreference supports minValue and stepValue
Change-Id: I7aaeeb2db85103708747ae318610bd4896ef96fd
2013-01-22 16:35:59 +09:00
Ken Wakasa 8a3e8dca21 am 6c22439b: Remove MAX_PROXIMITY_CHARS_SIZE_INTERNAL
* commit '6c22439bf80da08576e86c1282afc5cfa431e235':
  Remove MAX_PROXIMITY_CHARS_SIZE_INTERNAL
2013-01-21 20:28:10 -08:00
Ken Wakasa 6c22439bf8 Remove MAX_PROXIMITY_CHARS_SIZE_INTERNAL
Change-Id: I18a997503de4033b5341b564145bca862a872098
2013-01-22 13:18:49 +09:00
Kurt Partridge 86139412df am 4cb85319: [Rlog15] ResearchLogger option to include account name in feedback
* commit '4cb853191ca4e515c2291779aa6b21975d5711d6':
  [Rlog15] ResearchLogger option to include account name in feedback
2013-01-21 12:23:22 -08:00
Kurt Partridge 4cb853191c [Rlog15] ResearchLogger option to include account name in feedback
multi-project commit with I0a293f392bd605c8203dc9a62993345ad58dcfbe

Change-Id: Ief5b940a62dbaeaecdf1c55f2ffdd1e0fdaea2b9
2013-01-21 12:18:43 -08:00
Kurt Partridge 2464cd7f2d am 8b788374: Merge "[Rlog78b] Make log privacy filtering decisions on n-grams"
* commit '8b788374dee56dfe95e7af42a358923cfcb3668e':
  [Rlog78b] Make log privacy filtering decisions on n-grams
2013-01-21 11:41:25 -08:00
Kurt Partridge 8b788374de Merge "[Rlog78b] Make log privacy filtering decisions on n-grams" 2013-01-21 19:39:38 +00:00
Kurt Partridge 0c49e61ee7 am 08d9c996: Merge "[Rlog81b] Log more data with handleSeparator"
* commit '08d9c996dc31e767aca5c31df7ede80a36361060':
  [Rlog81b] Log more data with handleSeparator
2013-01-21 10:51:09 -08:00
Kurt Partridge 80685aa4b9 [Rlog78b] Make log privacy filtering decisions on n-grams
Previously, words were pushed out of a LogBuffer one at a time.  The receiving code had to keep
state to know whether a n-gram was safe to log.  This patch looks at the entire n-gram and makes a
single decision based on it alone.

mult-project commit with I3c40d7e02c77943d2668094ddb1d03efb942c74f

Change-Id: Id7d90bbd551b1a2f4e0e35f38852652f68f273f8
2013-01-21 10:50:32 -08:00
Kurt Partridge 08d9c996dc Merge "[Rlog81b] Log more data with handleSeparator" 2013-01-21 18:48:16 +00:00
Tadashi G. Takaoka b9da0332e7 am fb523d7f: Move AbstractDrawingPreview objects to MainKeyboardView
* commit 'fb523d7f5d40123a49a9128c455815db320c90fc':
  Move AbstractDrawingPreview objects to MainKeyboardView
2013-01-21 06:45:34 -08:00
Tadashi G. Takaoka fb523d7f5d Move AbstractDrawingPreview objects to MainKeyboardView
Change-Id: I0be72fba9a66f7c326028ec8e4670ca74a46053f
2013-01-21 23:25:18 +09:00
Tadashi G. Takaoka 3aa518acff am 22777330: Merge "Add GestureTrailsPreview class"
* commit '2277733048de3309a1ac7c7c766814f7294890f1':
  Add GestureTrailsPreview class
2013-01-21 05:45:32 -08:00
Tadashi G. Takaoka f0b99e446a am 86735948: Merge "Add SlidingKeyInputPreview class"
* commit '86735948306765d60dee811b31fabc1796129303':
  Add SlidingKeyInputPreview class
2013-01-21 05:45:30 -08:00
Tadashi G. Takaoka 0a1f3fb474 am 8aa9963a: Fix Apache license comment
* commit '8aa9963a895f9dd5bb1bc92ab2e4f461e058f87a':
  Fix Apache license comment
2013-01-21 05:45:27 -08:00
Tadashi G. Takaoka 2277733048 Merge "Add GestureTrailsPreview class" 2013-01-21 13:44:13 +00:00
Tadashi G. Takaoka 8673594830 Merge "Add SlidingKeyInputPreview class" 2013-01-21 13:43:41 +00:00
Tadashi G. Takaoka 470a5805e1 Add GestureTrailsPreview class
Change-Id: Ibf9dff6d834d34b4134dbe38a609fd983731eedc
2013-01-21 22:31:54 +09:00
Tadashi G. Takaoka a237cd4a02 Add SlidingKeyInputPreview class
Change-Id: Ided47b3420b0b1e34063f30d5142a1858af2718e
2013-01-21 22:30:14 +09:00
Tadashi G. Takaoka 8aa9963a89 Fix Apache license comment
Change-Id: Ic56167f952a7f4449da366e1e81610e72c966086
2013-01-21 22:23:37 +09:00
Jean Chalard 4412eb6603 am 0b51c06f: Merge "Update the Russian dictionary"
* commit '0b51c06fd042a6f3ea138fbcf0f858404795ac8d':
  Update the Russian dictionary
2013-01-21 03:21:14 -08:00
Jean Chalard 0b51c06fd0 Merge "Update the Russian dictionary" 2013-01-21 11:01:13 +00:00
Tadashi G. Takaoka dc860541cd am 78292e45: Fix missing super call in PreviewPlacerView.onDetachedFromWindow
* commit '78292e45cb914eb25f27342fedc235ecb4bf96af':
  Fix missing super call in PreviewPlacerView.onDetachedFromWindow
2013-01-21 02:35:15 -08:00
Tadashi G. Takaoka 78292e45cb Fix missing super call in PreviewPlacerView.onDetachedFromWindow
Change-Id: Iea79c0081cb66f54f161c0cf02cb365fcf88a07c
2013-01-21 19:31:05 +09:00
Jean Chalard be94d212e8 Update the Russian dictionary
The point is to get as close as possible to having the
golden Russian tests pass.

>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1355818916 <=> 1358763720
  version : 29 <=> 30
Body :
Deleted: НКТ 14
Freq changed: без 0 -> 140
Freq changed: бонус 94 -> 130
Freq changed: за 0 -> 140
Freq changed: на 0 -> 180
Freq changed: не 0 -> 140
Freq changed: парка 133 -> 110
Freq changed: про 0 -> 131
Freq changed: ручьи 93 -> 80
Freq changed: ура 86 -> 100
Freq changed: юрты 86 -> 60
Added: вечерком 100
Added: задачки 100
Added: сорри 100
Added: узнай 100
Added: учти 100

>>> java/res/raw/main_ru.dict
All the same above changes

Change-Id: I8685c34d9ab1dcbf8ae8e23d2e26380059684c95
2013-01-21 19:30:17 +09:00
Tadashi G. Takaoka 1ab8cdbe32 am 4987108f: Add surrounding drawing view to AbstractDrawingPreview constructor
* commit '4987108f34c08825ccb1c859c971bf232438c4aa':
  Add surrounding drawing view to AbstractDrawingPreview constructor
2013-01-21 01:58:53 -08:00
Tadashi G. Takaoka 4987108f34 Add surrounding drawing view to AbstractDrawingPreview constructor
Change-Id: If57e59f25fc3e29c0e7f46e8218d04fb233c27c6
2013-01-21 18:48:06 +09:00
Tadashi G. Takaoka c76bb6cbcf am 820b5e07: Merge "Add PointerTracker.isOldestPointerInQueue"
* commit '820b5e079c67dc95cd4b27d4d9f1afa5187b2d90':
  Add PointerTracker.isOldestPointerInQueue
2013-01-21 01:39:22 -08:00
Tadashi G. Takaoka 820b5e079c Merge "Add PointerTracker.isOldestPointerInQueue" 2013-01-21 09:37:59 +00:00
Jean Chalard e7ef116f11 am b56260b8: [AD4] Actually copy the file in place.
* commit 'b56260b8917233a902c8cce45364850afc0b99b2':
  [AD4] Actually copy the file in place.
2013-01-21 01:29:26 -08:00
Tadashi G. Takaoka ab334eb646 Add PointerTracker.isOldestPointerInQueue
Change-Id: Ic6f38253c94067ec7aa7b5add4452fa144fd9352
2013-01-21 18:26:46 +09:00
Jean Chalard b56260b891 [AD4] Actually copy the file in place.
This finally makes it work.

Bug: 7702011

Change-Id: I3508c88567f79598e4d1dff561b6ba7dc5c3808f
2013-01-21 17:58:38 +09:00
Tadashi G. Takaoka 2f6f5b8a8c am db906a7c: Merge "Rename AbstractDrawingPreview.onDraw to drawPreview"
* commit 'db906a7c9a8f2af79745d80abe439398ceb3d7be':
  Rename AbstractDrawingPreview.onDraw to drawPreview
2013-01-21 00:35:33 -08:00
Tadashi G. Takaoka 654dfd4670 am f3c4cd45: Move dimming keyboard to MainKeyboardView
* commit 'f3c4cd45a5df6f90b922ea44db259e53117bb25a':
  Move dimming keyboard to MainKeyboardView
2013-01-21 00:35:31 -08:00
Tadashi G. Takaoka db906a7c9a Merge "Rename AbstractDrawingPreview.onDraw to drawPreview" 2013-01-21 08:34:25 +00:00
Tadashi G. Takaoka 2ecbfe8e93 Rename AbstractDrawingPreview.onDraw to drawPreview
This is because the android lint warns calling a method onDraw(Canvas)
from View.onDraw(Canvas).

Change-Id: I4f54996da5454d9a8c4ef43fbbcaec37724fb20e
2013-01-21 17:00:47 +09:00
Tadashi G. Takaoka f3c4cd45a5 Move dimming keyboard to MainKeyboardView
Change-Id: Id44d4b758c8b92d1120d3a8b06812dc1fc26390c
2013-01-21 16:54:08 +09:00
Jean Chalard b094490e5f am bde94dd9: Merge "[AD3] Implement the interface to choose a local dictionary"
* commit 'bde94dd96f6dbceeb0a00cb02dfc8064bd6c46fa':
  [AD3] Implement the interface to choose a local dictionary
2013-01-20 23:43:51 -08:00
Jean Chalard bde94dd96f Merge "[AD3] Implement the interface to choose a local dictionary" 2013-01-21 07:41:48 +00:00
Tadashi G. Takaoka 99b5393422 am 9c968b62: Move gesture related XML attribute to MainKeyboardView
* commit '9c968b62d1b4049959b7b7b0f05388c90e31b46e':
  Move gesture related XML attribute to MainKeyboardView
2013-01-20 23:37:22 -08:00
Tadashi G. Takaoka fe4b3ff0a3 am 37598210: Move PointerTracker.DrawingProxy to MainKeyboardView (step 2)
* commit '375982106bf073971fccd14b2c65ec8e089bb2ae':
  Move PointerTracker.DrawingProxy to MainKeyboardView (step 2)
2013-01-20 23:23:32 -08:00
Tadashi G. Takaoka 3b9a11b301 am 0e4f0da4: Move PointerTracker.DrawingProxy to MainKeyboardView (step 1)
* commit '0e4f0da449d0fc4f0c4c6b49b4c24961da36a5d1':
  Move PointerTracker.DrawingProxy to MainKeyboardView (step 1)
2013-01-20 23:18:01 -08:00
Tadashi G. Takaoka 9c968b62d1 Move gesture related XML attribute to MainKeyboardView
Change-Id: Ia12f73a3d7d26596ee14a0aff23244ef72753d68
2013-01-21 16:16:48 +09:00
Tadashi G. Takaoka 375982106b Move PointerTracker.DrawingProxy to MainKeyboardView (step 2)
Change-Id: If15d5ee683b8026d1871a3fe438dba498944faa7
2013-01-21 16:09:25 +09:00
Tadashi G. Takaoka 0e4f0da449 Move PointerTracker.DrawingProxy to MainKeyboardView (step 1)
Change-Id: I86014de147416453503b6412eb862a2d172426aa
2013-01-21 16:06:50 +09:00
Jean Chalard fbc5e9b334 [AD3] Implement the interface to choose a local dictionary
Bug: 7702011
Change-Id: Id3b9c58dbbf5097e4d6ce986d20924eae19f9690
2013-01-21 15:40:46 +09:00
Tadashi G. Takaoka 6ede30353f am d9449ccf: Move MoreKeysPanel.Controller implementation to MainKeyboardView
* commit 'd9449ccf3ce9e5eabb022aed6a45bba680bce115':
  Move MoreKeysPanel.Controller implementation to MainKeyboardView
2013-01-20 22:32:29 -08:00
Tadashi G. Takaoka d9449ccf3c Move MoreKeysPanel.Controller implementation to MainKeyboardView
Change-Id: Iffa298d51ca21a7dcd1e77c633217532d96d2cf5
2013-01-21 15:28:17 +09:00
Tadashi G. Takaoka 11e1e8688d am 00f8474c: Merge "Remove unused Keyboard.purgeKeyboardAndClosing method"
* commit '00f8474c734d796faeea12f240e492983691222a':
  Remove unused Keyboard.purgeKeyboardAndClosing method
2013-01-20 21:50:06 -08:00
Tadashi G. Takaoka b9f219c935 Remove unused Keyboard.purgeKeyboardAndClosing method
Change-Id: Ia09ac04b0edca2a22d64ba83e054b115fe8851a6
2013-01-21 14:26:33 +09:00
Kurt Partridge 80375649d3 [Rlog81b] Log more data with handleSeparator
Change-Id: I4b2ebaa2398ac2f669e1e009e00842e55979e866
2013-01-18 11:51:26 -08:00
Jean Chalard 3cd6b223c8 am 1d15fe7e: [AD2] Add a helper method to read an arbitrary dict header
* commit '1d15fe7e51075e77b7cb477cf8de6569b8eefa2f':
  [AD2] Add a helper method to read an arbitrary dict header
2013-01-18 03:39:19 -08:00
Jean Chalard 1d15fe7e51 [AD2] Add a helper method to read an arbitrary dict header
Bug: 7702011
Change-Id: Ib88f6dc222892831ae6932635b65fd2595b16b43
2013-01-18 20:34:28 +09:00
Jean Chalard a8abd4df97 am babc71ee: Merge "[AD1] Add an option to read an arbitrary dictionary."
* commit 'babc71ee30e1e119dff3a2272a0de3aa793ecda6':
  [AD1] Add an option to read an arbitrary dictionary.
2013-01-18 03:32:50 -08:00
Jean Chalard babc71ee30 Merge "[AD1] Add an option to read an arbitrary dictionary." 2013-01-18 11:30:28 +00:00
Jean Chalard 753a457cc1 am fd80d1ad: Merge "Deactivate h/w keyboard when not an internal build."
* commit 'fd80d1ad482b7ee9d6dcdb3f4463bdf0d2bf2bfb':
  Deactivate h/w keyboard when not an internal build.
2013-01-18 03:30:27 -08:00
Jean Chalard fd80d1ad48 Merge "Deactivate h/w keyboard when not an internal build." 2013-01-18 11:28:24 +00:00
Jean Chalard b416d7e58d am 2e680c89: Merge "Trigger the set action when pressing hardware enter (C2)"
* commit '2e680c890d198f2f32d4ae1a46b0431b61227db2':
  Trigger the set action when pressing hardware enter (C2)
2013-01-18 03:20:34 -08:00
Jean Chalard 2e680c890d Merge "Trigger the set action when pressing hardware enter (C2)" 2013-01-18 11:18:32 +00:00
Jean Chalard 9058bc0df4 [AD1] Add an option to read an arbitrary dictionary.
Bug: 7702011
Change-Id: I76f52dd3fdb22824fc243ab3845ceec610469c81
2013-01-18 20:18:06 +09:00
Jean Chalard 2fc4d422e7 Deactivate h/w keyboard when not an internal build.
The implementation is not really ready yet, so we want to
disable it for normal builds for now.
This goes together with Ic1edc6ed

Bug: 7987492
Change-Id: Id81f417e200c118f24424943823665f0b8bd6849
2013-01-18 20:15:18 +09:00
Jean Chalard b4ac04ae48 Trigger the set action when pressing hardware enter (C2)
Bug: 7969231
Change-Id: I581212093df6f16fa9304e0b3e5b46714a7acdb3
2013-01-18 20:03:38 +09:00
Jean Chalard db31867678 am d5e869ce: Merge "Track handled events to consistently return handled status (C1)"
* commit 'd5e869ced838454ede1d813d6a289fafc31b0665':
  Track handled events to consistently return handled status (C1)
2013-01-18 02:52:14 -08:00
Tadashi G. Takaoka 881aaebdb7 Add SeekBarDialogPreference
This change removes SeekBarDialog class.

Change-Id: I437b1e554a5af264b8031ebe05b8250a831c8d3b
2013-01-18 02:52:11 -08:00
Tadashi G. Takaoka 2763fc22ce Correct GesturePreviewTrail.getWidth() implementation
Bug: 7981153
Change-Id: I20785b7f82329ce6f19c883e77a9716772cda290
2013-01-18 02:52:11 -08:00
Jean Chalard d5e869ced8 Merge "Track handled events to consistently return handled status (C1)" 2013-01-18 10:49:54 +00:00
Jean Chalard 976a42b873 Track handled events to consistently return handled status (C1)
Bug: 5037589
Change-Id: I92d5be669420f0b2fdeb8fcf85aefd3961bf84b4
2013-01-18 19:32:22 +09:00
Tadashi G. Takaoka 5d894dcfaa Merge "Correct GesturePreviewTrail.getWidth() implementation" 2013-01-18 10:26:05 +00:00
Tadashi G. Takaoka f420e506a0 Merge "Add SeekBarDialogPreference" 2013-01-18 10:25:13 +00:00
Tadashi G. Takaoka 2df0cf2c5a Add SeekBarDialogPreference
This change removes SeekBarDialog class.

Change-Id: I437b1e554a5af264b8031ebe05b8250a831c8d3b
2013-01-18 19:10:55 +09:00
Tadashi G. Takaoka 89a1755627 am 41afa87a: Merge "Remove automatic switch back to alphabet feature"
* commit '41afa87a72fab4f7f328569f5ebe86d2b6127641':
  Remove automatic switch back to alphabet feature
2013-01-18 02:04:17 -08:00
Tadashi G. Takaoka 41afa87a72 Merge "Remove automatic switch back to alphabet feature" 2013-01-18 10:03:02 +00:00
Tadashi G. Takaoka cc2636b4e1 Remove automatic switch back to alphabet feature
Change-Id: I4600c808f2ec31c18d3698a43afa7f4be9407e3e
2013-01-18 18:44:27 +09:00
Tadashi G. Takaoka 9e63ef89e3 Correct GesturePreviewTrail.getWidth() implementation
Bug: 7981153
Change-Id: I20785b7f82329ce6f19c883e77a9716772cda290
2013-01-18 17:55:24 +09:00
Jean Chalard 2d3858ab57 am 81a4b7f4: Merge "Fix a bug in gesture after a dash or apostrophe"
* commit '81a4b7f48e0649c1b984fd25398f45ce813f7cbf':
  Fix a bug in gesture after a dash or apostrophe
2013-01-18 00:42:59 -08:00
Jean Chalard 81a4b7f48e Merge "Fix a bug in gesture after a dash or apostrophe" 2013-01-18 08:39:58 +00:00
Jean Chalard 132b94dd07 am 889a5e14: Merge "Reset forgotten members (D3)"
* commit '889a5e1430a87ae5dc2c0e537b3f09462e081cc9':
  Reset forgotten members (D3)
2013-01-17 23:48:10 -08:00
Jean Chalard 889a5e1430 Merge "Reset forgotten members (D3)" 2013-01-18 07:46:41 +00:00
Jean Chalard e3ec5fcc88 Fix a bug in gesture after a dash or apostrophe
It would insert a space when it shouldn't when composing a
word ending in either dash or apostrophe and gesturing right
away.

Bug: 7889078
Change-Id: Ib3e2f6f5e551888cc081b464a641e2deac6f5ef7
2013-01-18 15:05:34 +09:00
Jean Chalard 22d271755e am 5a6b4f95: Merge "Insert into user dict in lower case if auto-caps (D2)"
* commit '5a6b4f953eb036c2d3e42316d0d62045686d2b30':
  Insert into user dict in lower case if auto-caps (D2)
2013-01-17 21:41:47 -08:00
Jean Chalard 5a6b4f953e Merge "Insert into user dict in lower case if auto-caps (D2)" 2013-01-18 05:39:18 +00:00
Kurt Partridge 4dc422aa51 am 345ef676: [Rlog78a] Annotate logUnits with corrections
* commit '345ef6762700cdb0fca25aa54b22ef83aaaac0ab':
  [Rlog78a] Annotate logUnits with corrections
2013-01-17 19:40:21 -08:00
Kurt Partridge 345ef67627 [Rlog78a] Annotate logUnits with corrections
If the user makes a correction to a word, this is now explicitly indicated
in the logUnit.

Change-Id: I8638aadd7b8c8e32bbc9c4b020548d786513d887
2013-01-17 14:05:02 -08:00
Kurt Partridge 6875081140 am e6a9655a: Merge "Consolidate SuggestedWords.getWordInfo and .getInfo"
* commit 'e6a9655a0362bebccdf0d51ebc3579573617c95a':
  Consolidate SuggestedWords.getWordInfo and .getInfo
2013-01-17 14:04:03 -08:00
Kurt Partridge e6a9655a03 Merge "Consolidate SuggestedWords.getWordInfo and .getInfo" 2013-01-17 22:01:26 +00:00
Kurt Partridge 9545bcfa76 am 937877b8: Merge "[Rlog14] Increase feedback buffer to cover whole session"
* commit '937877b8770173d209ac82c17a7e57917ea531fc':
  [Rlog14] Increase feedback buffer to cover whole session
2013-01-17 13:22:50 -08:00
Kurt Partridge 937877b877 Merge "[Rlog14] Increase feedback buffer to cover whole session" 2013-01-17 21:21:49 +00:00
Kurt Partridge 07c73c536a am 63ed9abb: Merge "[Rlog13] ResearchLogger fix feedback"
* commit '63ed9abbe881db72f84025a91025cc3e0c8f1c13':
  [Rlog13] ResearchLogger fix feedback
2013-01-17 11:58:10 -08:00
Kurt Partridge 63ed9abbe8 Merge "[Rlog13] ResearchLogger fix feedback" 2013-01-17 19:56:25 +00:00
Kurt Partridge 5189ab4017 am f881f10e: Merge "Fix commit partial text logStatement"
* commit 'f881f10e90e15c6f013c500d56fda9f8220570a7':
  Fix commit partial text logStatement
2013-01-17 11:17:42 -08:00
Kurt Partridge f881f10e90 Merge "Fix commit partial text logStatement" 2013-01-17 19:15:32 +00:00
Kurt Partridge 2335094eff am 34ecd12a: Merge "Add comment"
* commit '34ecd12a058cbc9756e7f323b264a27acb378206':
  Add comment
2013-01-17 09:52:56 -08:00
Kurt Partridge 34ecd12a05 Merge "Add comment" 2013-01-17 17:50:42 +00:00
Kurt Partridge b5ac8ef586 Consolidate SuggestedWords.getWordInfo and .getInfo
Change-Id: I959cf049f550b7be3ec002281ca7457e566b0214
2013-01-17 07:50:15 -08:00
Kurt Partridge 5213559e0e Fix commit partial text logStatement
- No longer suggests that it is called from a non-existent method
  in RichInputConnection

Change-Id: I25fe4a0f232a4320ca113598bbcdd029ca319944
2013-01-17 07:46:06 -08:00
Jean Chalard 8914555776 Reset forgotten members (D3)
Only resetting mCapitalizedMode is enough to fix bug#8013488,
but we may as well correctly reset both fields.

Bug: 8013488
Change-Id: Icb0d7c5b1e93368e8eb7848aa9137b45d5d3531e
2013-01-17 20:39:09 +09:00
Jean Chalard 96845ecff6 Insert into user dict in lower case if auto-caps (D2)
Also recapitalize afterwards if the word has been changed.

Bug: 7972124
Change-Id: I9306580bb4ed0ffa80cc4559ce1abcd2034d1905
2013-01-17 20:38:52 +09:00
Jean Chalard 5df7f0c8a2 am c665cbee: Merge "Forward the capitalized mode to the positional info (D1)"
* commit 'c665cbee7f136ea3cf334262f8dc1e7621f2004f':
  Forward the capitalized mode to the positional info (D1)
2013-01-17 03:19:16 -08:00
Jean Chalard c665cbee7f Merge "Forward the capitalized mode to the positional info (D1)" 2013-01-17 11:02:00 +00:00
Jean Chalard bf5f911f8b am 15ea1d40: Merge "Simplify the space-before and space-after logic."
* commit '15ea1d40967c25ab27849e1d8c0acf55d8f07e29':
  Simplify the space-before and space-after logic.
2013-01-17 01:09:45 -08:00
Jean Chalard 15ea1d4096 Merge "Simplify the space-before and space-after logic." 2013-01-17 09:07:20 +00:00
Jean Chalard ae3b96b26e Simplify the space-before and space-after logic.
Bug: 7889078
Bug: 7268000
Change-Id: I6c77b8c9e60ef69f02526b407124d2f5d02818ee
2013-01-17 17:52:46 +09:00
Tadashi G. Takaoka a4d1ab9bb9 am 40c59727: Merge "Add default button to vibration/volume settings dialog"
* commit '40c59727cf3c1b07a60c28f8df64876eb8ea03e3':
  Add default button to vibration/volume settings dialog
2013-01-17 00:43:31 -08:00
Tadashi G. Takaoka 40c59727cf Merge "Add default button to vibration/volume settings dialog" 2013-01-17 08:41:01 +00:00
Tadashi G. Takaoka dc5f40d704 am 1b1fa7a1: Merge "SeekBarDialog supports neutral and dismiss listener"
* commit '1b1fa7a18b7baeb8fbdb3fb7ed46cf13a75fbac1':
  SeekBarDialog supports neutral and dismiss listener
2013-01-17 00:29:11 -08:00
Tadashi G. Takaoka 1b1fa7a18b Merge "SeekBarDialog supports neutral and dismiss listener" 2013-01-17 08:27:27 +00:00
Jean Chalard 81731134fb am 22959faa: Merge "Stop relying on the soft keyboard to get the editor action."
* commit '22959faad4ad6a6284404ffc667ec823991f3710':
  Stop relying on the soft keyboard to get the editor action.
2013-01-16 23:19:04 -08:00
Jean Chalard 22959faad4 Merge "Stop relying on the soft keyboard to get the editor action." 2013-01-17 07:16:58 +00:00
Jean Chalard b6b7f5e39e Forward the capitalized mode to the positional info (D1)
Bug: 7972124
Change-Id: I3c74f3b075e698b9e9dd1d2c7b6f173073539063
2013-01-17 14:35:58 +09:00
Kurt Partridge 7f8c096bf2 [Rlog13] ResearchLogger fix feedback
The feedback string was not being inserted in the feedback logs.  Also changed the tag to
"UserFeedback" from "UserTimestamp" to better reflect the data recorded.

Change-Id: Iccf781b25e2573168c36e729419468f5bd73903e
2013-01-16 21:29:51 -08:00
Tadashi G. Takaoka 9246a68cf3 am 5e45fbf0: Merge "Fix bounding rectangle of gesture preview trail"
* commit '5e45fbf0be0b5cff1d82c862cb07272e2a258ff7':
  Fix bounding rectangle of gesture preview trail
2013-01-16 03:01:15 -08:00
Tadashi G. Takaoka 84ce64f2c0 Fix bounding rectangle of gesture preview trail
Bug: 7917443
Bug: 7987585
Change-Id: I99e6db1fe43d3a9b497e92330a6857e0454c428c
2013-01-16 19:51:01 +09:00
Jean Chalard d818f1e3b6 Stop relying on the soft keyboard to get the editor action.
Bug: 7969231
Change-Id: I9848c63c4c51550b5dc53c981eafa74e7fa95197
2013-01-16 18:22:00 +09:00
Kurt Partridge 14b800d858 [Rlog14] Increase feedback buffer to cover whole session
Change-Id: I55b61d9ca6eecd56181b8d2913f71559555cd89e
2013-01-15 18:34:13 -08:00
Kurt Partridge 87627df898 am 9579936b: [Rlog67] Renaming clarification
* commit '9579936bcf6bc5cecee315c5e40a30af77f47dfd':
  [Rlog67] Renaming clarification
2013-01-15 09:37:34 -08:00
Jean Chalard e988562ad6 am 34b88560: Merge "Distinguish action-enter/shift-enter/enter"
* commit '34b8856077220cfaa475a13d383bcc69ef470af4':
  Distinguish action-enter/shift-enter/enter
2013-01-15 09:37:32 -08:00
Kurt Partridge 9579936bcf [Rlog67] Renaming clarification
ResearchLogger.latinIME_handleSeparator wasn't doing anything really specific to
the separator, so its implementation has been renamed according to its role.

Change-Id: I24e8691c7dc440dd067e96d23e50463683e17cfc
2013-01-15 08:57:52 -08:00
Jean Chalard dcfceaff1b Distinguish action-enter/shift-enter/enter
Bug: 7969231
Change-Id: I75d495ee1ea126da9be4e269ee990ee0a97793c1
2013-01-15 19:12:41 +09:00
Ken Wakasa 2839333609 am c995dbcf: Merge "Remove MAX_WORD_LENGTH_INTERNAL"
* commit 'c995dbcf598730f138e59f989e813b83d585d40b':
  Remove MAX_WORD_LENGTH_INTERNAL
2013-01-14 19:48:20 -08:00
Ken Wakasa c995dbcf59 Merge "Remove MAX_WORD_LENGTH_INTERNAL" 2013-01-14 19:46:09 -08:00
Tadashi G. Takaoka f561eb86d5 am 722eeb14: Fix drawing Arabic diacritics
* commit '722eeb144f4a0af337784ffa311217432272e19d':
  Fix drawing Arabic diacritics
2013-01-14 19:44:55 -08:00
Ken Wakasa 5db594abba Remove MAX_WORD_LENGTH_INTERNAL
Change-Id: Ie11ff000675601acff5fbb00e9e9f48eb32c5071
2013-01-15 12:39:08 +09:00
Tadashi G. Takaoka 722eeb144f Fix drawing Arabic diacritics
Bug: 8001868
Change-Id: I0e5aab266bbaad8c68e4a900b8d5572977a0379d
2013-01-15 11:03:15 +09:00
Kurt Partridge 61d61e4606 am 019bcc62: Merge "[Rlog68] Logger; make filenames more unique to prevent filesys conflicts"
* commit '019bcc62b92d2a43057a00c2db0a2928966c6247':
  [Rlog68] Logger; make filenames more unique to prevent filesys conflicts
2013-01-14 10:04:16 -08:00
Kurt Partridge 019bcc62b9 Merge "[Rlog68] Logger; make filenames more unique to prevent filesys conflicts" 2013-01-14 10:02:16 -08:00
Kurt Partridge 46933eeb13 am 5b611e18: Merge "[Rlog63] Log whether a manual suggestion is a prediction"
* commit '5b611e184b44e479855ca45acd132ab9c592ba52':
  [Rlog63] Log whether a manual suggestion is a prediction
2013-01-14 09:32:38 -08:00
Kurt Partridge 5b611e184b Merge "[Rlog63] Log whether a manual suggestion is a prediction" 2013-01-14 09:30:12 -08:00
Kurt Partridge 50cb9eab28 am 939e3f31: Merge "[Rlog59d] Pass separatorString through revertCommit"
* commit '939e3f3152f7c2a1593b5ab4161597f4fe73315c':
  [Rlog59d] Pass separatorString through revertCommit
2013-01-14 09:28:01 -08:00
Kurt Partridge 0a292ad883 Add comment
Change-Id: If21222aa678a827c1fcad5cacac0fa20655e4e5e
2013-01-14 09:08:51 -08:00
Kurt Partridge 939e3f3152 Merge "[Rlog59d] Pass separatorString through revertCommit" 2013-01-14 08:59:04 -08:00
Kurt Partridge 67a61fc6be [Rlog68] Logger; make filenames more unique to prevent filesys conflicts
multi-project commit with If6b9f8990d7cdbf570740a81096513698d0e0f4c

Change-Id: I124aed24be0beb4c472869594184ecf003c2fed4
2013-01-14 07:11:42 -08:00
Kurt Partridge 31156c816e [Rlog59d] Pass separatorString through revertCommit
Change-Id: I5ef20476318979f99f543f9300cf6198d18f6244
2013-01-14 07:01:49 -08:00
Kurt Partridge 284730bae1 am 3e05370d: Merge "[Rlog59c] More detailed logging of backspace"
* commit '3e05370d53688e2c34cc26b7e5b6ca07f25fa839':
  [Rlog59c] More detailed logging of backspace
2013-01-13 11:16:04 -08:00
Kurt Partridge 3e05370d53 Merge "[Rlog59c] More detailed logging of backspace" 2013-01-13 11:13:37 -08:00
Kurt Partridge 9e472630a7 am 916c0a08: Merge "[Rlog60] Log if a logUnit is uncommitted"
* commit '916c0a08c679b12922cbf32b659d1e32ca4dc6cd':
  [Rlog60] Log if a logUnit is uncommitted
2013-01-12 12:58:50 -08:00
Kurt Partridge 916c0a08c6 Merge "[Rlog60] Log if a logUnit is uncommitted" 2013-01-12 12:57:19 -08:00
Kurt Partridge ef3936bc54 [Rlog59c] More detailed logging of backspace
- Normal delete events are recorded
- Includes number of characters deleted for both batch and normal delete

Change-Id: I422da3ddc94fa0ccd6c7586eaacf14c62dd16679
2013-01-12 12:54:59 -08:00
Kurt Partridge 09423749d4 am 343a852c: Merge "[Rlog59b] Log CodeInput and KeyCode properly"
* commit '343a852cd95a051bc54658d4cc78037361053f1f':
  [Rlog59b] Log CodeInput and KeyCode properly
2013-01-12 10:21:30 -08:00
Kurt Partridge 343a852cd9 Merge "[Rlog59b] Log CodeInput and KeyCode properly" 2013-01-12 10:18:57 -08:00
Kurt Partridge 966d03d60e am b75e2380: Merge "[Rlog58b] Log user pauses"
* commit 'b75e2380e2e4fb62aab71db59bdd19075af8c2eb':
  [Rlog58b] Log user pauses
2013-01-11 10:20:58 -08:00
Kurt Partridge b75e2380e2 Merge "[Rlog58b] Log user pauses" 2013-01-11 10:19:13 -08:00
Kurt Partridge 3338703a2f [Rlog63] Log whether a manual suggestion is a prediction
Change-Id: Ia6f793611d4b18aecb1a635655af5edb639e1ecf
2013-01-11 09:55:09 -08:00
Kurt Partridge 988a2d0c87 am 5523a681: Merge "[Rlog59a] Split logUnits correctly around separators"
* commit '5523a6818d77cd198e349f075bb1bb5acaff5b71':
  [Rlog59a] Split logUnits correctly around separators
2013-01-11 09:20:34 -08:00
Kurt Partridge 5523a6818d Merge "[Rlog59a] Split logUnits correctly around separators" 2013-01-11 09:18:10 -08:00
Ken Wakasa 53f9fe1b90 am f6870cc8: Remove BinaryDictionary.MAX_PREDICTION and MAX_SPACES, and rename MAX_WORDS to MAX_RESULTS
* commit 'f6870cc82ddf394e94155322fcc7e4e2256bea66':
  Remove BinaryDictionary.MAX_PREDICTION and MAX_SPACES, and rename MAX_WORDS to MAX_RESULTS
2013-01-11 03:52:00 -08:00
Ken Wakasa f6870cc82d Remove BinaryDictionary.MAX_PREDICTION and MAX_SPACES, and rename MAX_WORDS to MAX_RESULTS
Change-Id: Iab2a422b367e7521f346481c7fe5e2575f2e9de3
2013-01-11 20:47:42 +09:00
Kurt Partridge 99931201d0 [Rlog59b] Log CodeInput and KeyCode properly
- Fix function calls to happen at more resilient times
- In the case of phantom spaces, ensure that the logStatement goes to the
  correct logUnit

Change-Id: Ida8f6eba1e4f33d9f9b4735316e3c6316ed316c0
2013-01-10 23:39:11 -08:00
Kurt Partridge b4fe364b39 [Rlog60] Log if a logUnit is uncommitted
Normally logUnits are committed to a log when the word that their data
corresponds to is complete.   However, if the user reverts a word, or goes
back to edit it, then the system may "uncommit" the logUnit, and append
additional editing steps to the end of it.  When this happens, we want to
make a note of it in the log, which is what this patch does.

Change-Id: If2bbb948469824c76facf5f06ed8a6da8ff9777c
2013-01-10 23:18:40 -08:00
Jean Chalard 93fd1ac4fc am d8590857: Fix spell checker subtype list.
* commit 'd8590857bdff7f30a93af07aef0362d9f7460a5a':
  Fix spell checker subtype list.
2013-01-10 22:05:52 -08:00
Jean Chalard d8590857bd Fix spell checker subtype list.
Remove the subtypes that don't get a dictionary any more in AOSP.
Also prepare for all downloadable-dictionary supported subtypes.

Bug: 7673670
Change-Id: I5b754a791233c270237b8f7e5e2208f7282ad294
2013-01-11 14:59:34 +09:00
Kurt Partridge 05ee6ad843 [Rlog58b] Log user pauses
Change-Id: I7802f07192a4cba4f3cfb5c08ce6d5d2d85a46c1
2013-01-10 19:54:40 -08:00
Kurt Partridge 9f962af541 am aa9db1e2: Merge "[Rlog] Fix some potential NPEs"
* commit 'aa9db1e2598e6a8c64844db4261e067e592a6f38':
  [Rlog] Fix some potential NPEs
2013-01-10 17:16:06 -08:00
Kurt Partridge aa9db1e259 Merge "[Rlog] Fix some potential NPEs" 2013-01-10 17:14:10 -08:00
Kurt Partridge 90aaa2d0a5 [Rlog59a] Split logUnits correctly around separators
Change-Id: I65ecdead7e7bdeb8a5f1748e27068ddbd5d3ce00
2013-01-10 16:36:18 -08:00
Kurt Partridge ef243ffa1a am 211103d7: [Rlog58a] Fix privacy leak of word in logUnitStart
* commit '211103d7fecc3d6df116ec677ae88cb6d70cce86':
  [Rlog58a] Fix privacy leak of word in logUnitStart
2013-01-10 16:08:47 -08:00
Kurt Partridge 211103d7fe [Rlog58a] Fix privacy leak of word in logUnitStart
Change-Id: Idcea4cd0256581e9868ac987fd1fa281ff074483
2013-01-10 16:06:01 -08:00
Kurt Partridge 4acdd3ad69 [Rlog] Fix some potential NPEs
Change-Id: I07b18b5db81784dca32683e5f208088181c5eed9
2013-01-10 16:04:23 -08:00
Kurt Partridge 564524067f am 75e69753: [Rlog57b] fix logging of reverts
* commit '75e69753b709c19d5a23baf88ec3ac2576ee9c24':
  [Rlog57b] fix logging of reverts
2013-01-10 15:04:46 -08:00
Kurt Partridge 75e69753b7 [Rlog57b] fix logging of reverts
Change-Id: I07c817061a0cc060197e0fea45195ca07a9bf276
2013-01-10 15:00:28 -08:00
Kurt Partridge e6bbfda9e0 am a0970042: Merge "[Rlog57a] include logUnit boundaries in output"
* commit 'a0970042642ef39c22149a896efe785ec1fcaf01':
  [Rlog57a] include logUnit boundaries in output
2013-01-10 12:06:57 -08:00
Kurt Partridge a097004264 Merge "[Rlog57a] include logUnit boundaries in output" 2013-01-10 12:04:32 -08:00
Kurt Partridge e3c0015b0d am 700ce8df: Merge "[Rlog56] Buffer words before pushing out LogUnit"
* commit '700ce8df07eb242ce93f4f5e3e0ceb78473938ab':
  [Rlog56] Buffer words before pushing out LogUnit
2013-01-10 10:52:54 -08:00
Kurt Partridge 700ce8df07 Merge "[Rlog56] Buffer words before pushing out LogUnit" 2013-01-10 10:51:17 -08:00
Ken Wakasa 7f83014a68 am 4da2ed7a: Fix too thick gesture trail width
* commit '4da2ed7a78c63284fa3869450a492ee7ae420ed9':
  Fix too thick gesture trail width
2013-01-10 05:40:13 -08:00
Ken Wakasa 4da2ed7a78 Fix too thick gesture trail width
Change-Id: If1b78183b24fa0029bc28e5f56a988372182903e
2013-01-10 22:18:23 +09:00
satok 9fa1bc4148 am 2ef0d3bf: Merge "fix possible NPE in DebugSettings"
* commit '2ef0d3bf8db57ebebcb1c10f5b378a36b33ba1eb':
  fix possible NPE in DebugSettings
2013-01-10 03:20:10 -08:00
satok 2ef0d3bf8d Merge "fix possible NPE in DebugSettings" 2013-01-10 03:00:24 -08:00
satok e8b4fd2644 fix possible NPE in DebugSettings
Change-Id: I44ec5bd3b2a00087603316f14d732164dbcf399f
2013-01-10 19:57:33 +09:00
Jean Chalard dce2cdad0a am d9c7a6b9: Merge "Move a method to a utility class (C1)"
* commit 'd9c7a6b9b32c52b773165f7e177b3511cdc21d2f':
  Move a method to a utility class (C1)
2013-01-10 00:05:01 -08:00
Jean Chalard 01b2510c7c am 9c75ad1a: Merge "Fix international tests"
* commit '9c75ad1adec6e7ce2f2b202795fc23e0a4ac5617':
  Fix international tests
2013-01-10 00:05:00 -08:00
Jean Chalard d9c7a6b9b3 Merge "Move a method to a utility class (C1)" 2013-01-10 00:04:11 -08:00
Jean Chalard 9c75ad1ade Merge "Fix international tests" 2013-01-10 00:03:05 -08:00
Tadashi G. Takaoka 1e1791cc6e am a80b8fc9: Merge "Show final suggested word when batch input is finished"
* commit 'a80b8fc98f321920bc045bb5fd9952680d0e439e':
  Show final suggested word when batch input is finished
2013-01-09 23:37:59 -08:00
Tadashi G. Takaoka a80b8fc98f Merge "Show final suggested word when batch input is finished" 2013-01-09 23:35:09 -08:00
Tadashi G. Takaoka 50d902ac6f Show final suggested word when batch input is finished
This change moves dismiss timer of gesture floating preview text from
PreviewPlacerView to KeyboardView.

Bug: 7967461
Change-Id: I0ca5beddc93cb4bc4a405f914d217d37b997402b
2013-01-10 16:25:05 +09:00
Jean Chalard 75c3bdd8fa am ae4c8199: Merge "Initial implementation for dead keys (B3)"
* commit 'ae4c81993c201f501791520b8cd3697ff1f29649':
  Initial implementation for dead keys (B3)
2013-01-09 23:17:23 -08:00
Jean Chalard ae4c81993c Merge "Initial implementation for dead keys (B3)" 2013-01-09 23:15:49 -08:00
Jean Chalard 6a26de1d7e Initial implementation for dead keys (B3)
Bug: 5037589
Change-Id: I9e1ff92df7d0c58eb7a0f33603adebc9efb86585
2013-01-10 15:47:21 +09:00
Kurt Partridge b74a0a78c2 [Rlog57a] include logUnit boundaries in output
Change-Id: I4d1647b971b0e7a4cf1a96f341236f6ab1d2ab16
2013-01-09 22:38:27 -08:00
Tadashi G. Takaoka 7f30ca072e am 433f54ce: Merge "Remove unused variables"
* commit '433f54ce9079588cb5b5c4ba4a9fd1a9f3e17eff':
  Remove unused variables
2013-01-09 22:34:56 -08:00
Tadashi G. Takaoka 433f54ce90 Merge "Remove unused variables" 2013-01-09 22:32:23 -08:00
Jean Chalard 5866ef99f5 am 424d76fb: Merge "Add a next Event (B2)"
* commit '424d76fbf59bea5f96694a31918568a7479b89be':
  Add a next Event (B2)
2013-01-09 22:23:59 -08:00
Jean Chalard 424d76fbf5 Merge "Add a next Event (B2)" 2013-01-09 22:23:05 -08:00
Jean Chalard 912ad4614f Fix international tests
Tests have been broken again by recent changes to subtype
choice within Latin IME. This fixes the problem and all tests
pass again.

This change also includes a small fix to one test that was
checking for something irrelevant.

Change-Id: I6a03dea24f99b0d2ad84c4161a8413f3060bb811
2013-01-10 15:12:17 +09:00
Tadashi G. Takaoka a7a7f4e002 Add default button to vibration/volume settings dialog
Change-Id: I7beb4517314efdefeb47d91b14a6b02c3075c19f
2013-01-10 15:11:30 +09:00
Jean Chalard 41f31d7813 am d8903f4b: Merge "Add words to Portuguese"
* commit 'd8903f4bf7e04ab5abc1c91bf81803e3629f3123':
  Add words to Portuguese
2013-01-09 22:06:49 -08:00
Jean Chalard d8903f4bf7 Merge "Add words to Portuguese" 2013-01-09 22:04:36 -08:00
Tadashi G. Takaoka 0e77caa1d0 am 6512cd28: Merge "Cancel update batch input timer only when point is added"
* commit '6512cd289d4d6bcc835b9da013c3098bf3807bc2':
  Cancel update batch input timer only when point is added
2013-01-09 21:50:02 -08:00
Tadashi G. Takaoka 6512cd289d Merge "Cancel update batch input timer only when point is added" 2013-01-09 21:47:46 -08:00
Tadashi G. Takaoka b2f5d15250 Cancel update batch input timer only when point is added
Bug: 7972004
Change-Id: Ie5db5910efba851976da2284cafc69be2910d354
2013-01-10 14:31:07 +09:00
Tadashi G. Takaoka 88df3d9239 SeekBarDialog supports neutral and dismiss listener
Change-Id: I652fd1a383ef4074c04d03a37ebc779d229474e6
2013-01-10 14:24:54 +09:00
Jean Chalard 84f932be73 Add words to Portuguese
>>> dictionaries/pt_BR_wordlist.combined.gz
Header :
  date : 1355802839 <=> 1357790917
  version : 29 <=> 30
Body :
Added: à 30
Added: é 30
Added: ò 30
Added: ô 30

>>> dictionaries/pt_PT_wordlist.combined.gz
Header :
  date : 1355802856 <=> 1357790930
  version : 29 <=> 30
Body :
Added: à 30
Added: é 30
Added: ò 30
Added: ô 30

>>> java/res/raw/main_pt_br.dict
Header :
  date : 1355802839 <=> 1357790917
  version : 29 <=> 30
Body :
Added: à 30
Added: é 30
Added: ò 30
Added: ô 30

Bug: 7966948
Change-Id: I71c0986cf616d67926d0a6a0e53099b04b0427d5
2013-01-10 14:14:17 +09:00
Kurt Partridge 5996550522 am 759506ef: Merge "[Rlog52z] Cleanup and small bug fixes"
* commit '759506ef2dad41bf53c65ff090e8f11275669cda':
  [Rlog52z] Cleanup and small bug fixes
2013-01-09 21:13:50 -08:00
Kurt Partridge 759506ef2d Merge "[Rlog52z] Cleanup and small bug fixes" 2013-01-09 21:12:13 -08:00
Kurt Partridge 403c423940 [Rlog56] Buffer words before pushing out LogUnit
Previously, a logbuffer only held an n-gram.  Data went in and out of it, FIFO, until privacy
conditions were met (i.e. data not collected too frequently), and then an n-gram was saved.
E.g., if n=2, and only 10% of data is collected, then 18 words went through the logbuffer before
it captured the next 2 words.

However, if a user then went back and edited the n-gram, these edits were not captured.

This change changes the logbuffer size to temporarily hold data about words that are not recorded,
so that if the user backs up over them, the edits to an n-gram that we do eventually capture are
stored.  If the example above, instead of a logbuffer holding 2 words, it holds 20.  The system
waits until all the words not needed for the n-gram have been gathered (i.e. the buffer is full),
so the user has adequate time to edit, before shifting out the n-gram.  The buffer is still flushed
when the user closes the IME.  See the comment for MainLogBuffer for an explanation.

multi-project commit with I45317bc95eeb859adc1b35b24d0478f2df1a67f3

Change-Id: I4ffd95d08c6437dcf650d866ef9e24b6af512334
2013-01-09 21:09:19 -08:00
Kurt Partridge 8bda35809b [Rlog52z] Cleanup and small bug fixes
Change-Id: Ia3fca4881370ffcdd5f2b14d2d1094c51f4330ae
2013-01-09 21:07:51 -08:00
Kurt Partridge 2ae3909b20 am f11c4a9a: Merge "[Rlog50] capture bigrams properly even with deletions"
* commit 'f11c4a9aeb9b08d6c0c29861c3d9832334834d90':
  [Rlog50] capture bigrams properly even with deletions
2013-01-09 19:54:33 -08:00
Kurt Partridge f11c4a9aeb Merge "[Rlog50] capture bigrams properly even with deletions" 2013-01-09 19:52:45 -08:00
Tadashi G. Takaoka 1aa547d94a Remove unused variables
Change-Id: I508679c2ad21b2624760d37a9503e21733964d4c
2013-01-10 12:34:35 +09:00
Tadashi G. Takaoka 868dc985cf am 95e3008d: Merge "Rename variables related to key preview popup"
* commit '95e3008d2503916a71cee322146d8a0097326000':
  Rename variables related to key preview popup
2013-01-09 19:34:09 -08:00
Tadashi G. Takaoka 100571d74e am 6ece8f71: Merge "Remove unused variable"
* commit '6ece8f718b50e5bb847152dabe290982efd42df2':
  Remove unused variable
2013-01-09 19:34:07 -08:00
Tadashi G. Takaoka 95e3008d25 Merge "Rename variables related to key preview popup" 2013-01-09 19:32:33 -08:00
Tadashi G. Takaoka 6ece8f718b Merge "Remove unused variable" 2013-01-09 19:32:18 -08:00
Tadashi G. Takaoka b84ca27070 am 3727a3fd: Merge "Clean up public helper methods of SettingsValues"
* commit '3727a3fd6137c3552dc299f60b1f1df41cb47059':
  Clean up public helper methods of SettingsValues
2013-01-09 19:06:15 -08:00
Tadashi G. Takaoka 3727a3fd61 Merge "Clean up public helper methods of SettingsValues" 2013-01-09 19:04:46 -08:00
Tadashi G. Takaoka 813692c956 Rename variables related to key preview popup
Change-Id: I0161e5844dd325af9afba80ac54a569b16c80660
2013-01-10 11:47:18 +09:00
Tadashi G. Takaoka e0e0b04188 Remove unused variable
Change-Id: I7001d8b6200a5cefcf84630d663da8316422026f
2013-01-10 11:43:35 +09:00
Kurt Partridge 3b95eaf70b [Rlog50] capture bigrams properly even with deletions
multi-project commit with Ia4ec213e8356897807cb6a278fccdbaa945732f0

Change-Id: Ib3fe886dc889954a31586ab81d00a21d8d55efd2
2013-01-09 16:02:37 -08:00
Baligh Uddin 7132840b71 Import translations. DO NOT MERGE
Change-Id: I7513684783ad97339184b8db61ddd062cbd7a1c5
Auto-generated-cl: translation import
2013-01-09 13:12:57 -08:00
Baligh Uddin 6a2a7942f9 Import translations. DO NOT MERGE
Change-Id: I35be6cca9818f1ea08f3a23c76d19bfb945028b7
Auto-generated-cl: translation import
2013-01-09 13:08:09 -08:00
Jean Chalard 6c75253c11 Add a next Event (B2)
Change-Id: If2fe6f0f4f88a6ae1f22664ded61cec6942c18b9
2013-01-09 22:12:13 +09:00
Jean Chalard 02f580022d am 125ad223: Merge "Abandon the idea of an Event pool and make Event immutable (B1)"
* commit '125ad2237072745e4800b7a3907d5507024f35e5':
  Abandon the idea of an Event pool and make Event immutable (B1)
2013-01-09 05:11:26 -08:00
Jean Chalard 125ad22370 Merge "Abandon the idea of an Event pool and make Event immutable (B1)" 2013-01-09 05:07:42 -08:00
Jean Chalard 8da9c337db Move a method to a utility class (C1)
This is a preparatory change to fix bug 7969231

Change-Id: I44604ae75192a17b4e75a01f3e3d679d4901299e
2013-01-09 21:59:06 +09:00
Jean Chalard ae74b8cf67 Abandon the idea of an Event pool and make Event immutable (B1)
Change-Id: I750a07c0c564a95ceac734afa873ca3da9626a7f
2013-01-09 21:08:58 +09:00
Jean Chalard c5432a2db7 am b112a135: Merge "Fix a race condition with backspaces"
* commit 'b112a13518fd7479da4113d8e4f4f327ad8b9bbb':
  Fix a race condition with backspaces
2013-01-09 01:56:02 -08:00
Jean Chalard b112a13518 Merge "Fix a race condition with backspaces" 2013-01-09 01:53:47 -08:00
Jean Chalard 516b63db28 Fix a race condition with backspaces
And add a test to make sure it stays not-broken.

Bug: 7946604
Change-Id: I996da3d5507d591ec25a13fb57434f39843f1df5
2013-01-09 18:37:10 +09:00
Tadashi G. Takaoka b772cf7287 am e56686f4: Merge "Cancel update batch input timer whenever MotionEvent is received"
* commit 'e56686f43af81db965941a393c5e0231c26ec77b':
  Cancel update batch input timer whenever MotionEvent is received
2013-01-09 01:15:20 -08:00
Tadashi G. Takaoka e56686f43a Merge "Cancel update batch input timer whenever MotionEvent is received" 2013-01-09 01:12:59 -08:00
Tadashi G. Takaoka 915f348b35 Cancel update batch input timer whenever MotionEvent is received
Bug: 7911739
Change-Id: Id2cd98385371fd98435943ed66ec5381dfaa48e0
2013-01-09 17:55:42 +09:00
Tadashi G. Takaoka 473f8ab4a7 am 28772899: Merge "Don\'t cancel gesture typing while more keys keyboard is shown"
* commit '28772899d2fd0f452d1beca79c03123eaee53c0f':
  Don't cancel gesture typing while more keys keyboard is shown
2013-01-09 00:28:01 -08:00
Tadashi G. Takaoka 8353e751ca Don't cancel gesture typing while more keys keyboard is shown
Bug: 7964225
Change-Id: I4c572527b6f399282bdd963e38c147c7e69815ac
2013-01-09 16:56:59 +09:00
Tadashi G. Takaoka d3b0ecec22 Clean up public helper methods of SettingsValues
Change-Id: I6c6087580b67f497eaaf16900f8df7a4a895b8e3
2013-01-09 11:23:34 +09:00
Tadashi G. Takaoka be853639a4 am 8315e816: Merge "Clean up debug related preference keys"
* commit '8315e8168b135599237f5493f72e667f39503006':
  Clean up debug related preference keys
2013-01-08 16:58:00 -08:00
Tadashi G. Takaoka 8315e8168b Merge "Clean up debug related preference keys" 2013-01-08 16:56:13 -08:00
Baligh Uddin 4fdffc16d2 Merge "Import translations. DO NOT MERGE" 2013-01-08 10:23:18 -08:00
Baligh Uddin d6d40a0aec Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-01-08 10:22:51 -08:00
Kurt Partridge 05b6cda6ef am e9c64558: [Rlog48] Better logging of MotionEvents
* commit 'e9c6455881060c9f43a15a499582118b2ac2fa65':
  [Rlog48] Better logging of MotionEvents
2013-01-08 08:53:45 -08:00
Kurt Partridge e9c6455881 [Rlog48] Better logging of MotionEvents
- Now includes all historical data stored in a motionEvent
- Simpler API, refactored to move extraction code to JsonUtils

Change-Id: I52d9756ddbeaa14d1704787da59bf1aad18f0335
2013-01-08 08:50:06 -08:00
Kurt Partridge dfb1789d79 am 9bad176e: Merge "[Rlog32] ResearchLogger segment motion data around gestures correctly"
* commit '9bad176ebe4f6520db188b5498efbbf7e5fc2c4f':
  [Rlog32] ResearchLogger segment motion data around gestures correctly
2013-01-08 08:12:32 -08:00
Kurt Partridge 9bad176ebe Merge "[Rlog32] ResearchLogger segment motion data around gestures correctly" 2013-01-08 08:10:31 -08:00
Kurt Partridge f0cf9927ba am b7fb16e8: Merge "[Rlog27] Refactor LogBuffer"
* commit 'b7fb16e8ccbdd867221109e48a3a5b804f87b80d':
  [Rlog27] Refactor LogBuffer
2013-01-08 07:43:44 -08:00
Kurt Partridge b7fb16e8cc Merge "[Rlog27] Refactor LogBuffer" 2013-01-08 07:40:57 -08:00
Tadashi G. Takaoka a5ff9f0c77 Clean up debug related preference keys
Change-Id: Ib7129692c673b3bce253120ee709e0253aeafa52
2013-01-08 18:26:47 +09:00
Tadashi G. Takaoka 2389d37d07 am 0015ce8f: Merge "Make Settings class singleton to manage SettingsValues"
* commit '0015ce8feafba31d441c49268f0d333604c0b945':
  Make Settings class singleton to manage SettingsValues
2013-01-08 00:59:45 -08:00
Tadashi G. Takaoka ff0735ada8 Make Settings class singleton to manage SettingsValues
Change-Id: Id30828a141de86d9bcf8bce586d2adb468cc59e1
2013-01-08 17:48:47 +09:00
Tadashi G. Takaoka 153f5d2351 am 8873b5ae: Merge "Rename Settings to SettingsFragment"
* commit '8873b5ae31a5541913af40af6862542055e39ef8':
  Rename Settings to SettingsFragment
2013-01-07 23:02:28 -08:00
Tadashi G. Takaoka a1b08032a8 am 4b852d60: Merge "Consolidate VibratorUtils with AudioAndHapticFeedbackManager"
* commit '4b852d60447901ce2f6e9ffe03a35f44fbb96f44':
  Consolidate VibratorUtils with AudioAndHapticFeedbackManager
2013-01-07 23:01:15 -08:00
Tadashi G. Takaoka 8873b5ae31 Merge "Rename Settings to SettingsFragment" 2013-01-07 23:00:59 -08:00
Tadashi G. Takaoka 4b852d6044 Merge "Consolidate VibratorUtils with AudioAndHapticFeedbackManager" 2013-01-07 23:00:04 -08:00
Tadashi G. Takaoka cbee8a33d5 Rename Settings to SettingsFragment
Change-Id: If5bc53efc67be507663091de0f569f604c03e719
2013-01-08 15:59:16 +09:00
Tadashi G. Takaoka b17b887425 Consolidate VibratorUtils with AudioAndHapticFeedbackManager
Change-Id: Ica4e3193f369330da62a259c718b779ddf9fbde5
2013-01-08 15:13:19 +09:00
Jean Chalard 73d639243e am 26f2e453: Merge "Adjust the used frequency of the user dictionary words."
* commit '26f2e453a7bbdb41943254f0149d5ea1078125c7':
  Adjust the used frequency of the user dictionary words.
2013-01-07 22:02:42 -08:00
Jean Chalard 26f2e453a7 Merge "Adjust the used frequency of the user dictionary words." 2013-01-07 22:00:32 -08:00
Jean Chalard c79493a15f Adjust the used frequency of the user dictionary words.
Bug: 7656666
Change-Id: I4b271af636f6103cb5287336229581365841d778
2013-01-08 14:57:20 +09:00