Commit Graph

7519 Commits (a54b8b3f5d40b5b657ceafe5a0c9639c7812c28c)

Author SHA1 Message Date
Satoshi Kataoka f6a1a76524 Merge "Fix a possible NPE" 2013-06-06 05:02:46 +00:00
Satoshi Kataoka 6f9c6f2c64 Fix a possible NPE
Bug: 9301208
Change-Id: Id120c99ab9ef698d16cf7b8beea30c98c95d23a1
2013-06-06 12:01:22 +09:00
Baligh Uddin f93850f06f Import translations. DO NOT MERGE
Change-Id: I79a9506c568d47a7304ff55b75676fe02bfb22a1
Auto-generated-cl: translation import
2013-06-05 15:07:26 -07:00
Tadashi G. Takaoka cbd219a761 Move Base64Reader to utils package
Change-Id: Id46898c5cae268f05850d79938929b7707f27320
2013-06-05 19:39:36 +09:00
Tadashi G. Takaoka 9c440d1373 Merge "Remove unnecessary Drawable.setState" 2013-06-05 08:34:59 +00:00
Tadashi G. Takaoka 9d4e251826 Merge "Add CsvUtils that conform to RFC 4180" 2013-06-05 06:28:06 +00:00
Tadashi G. Takaoka 3201e98647 Remove unnecessary Drawable.setState
Change-Id: I362933ea4d5bcb1ccfebb5b22f6ccecf12337f4b
2013-06-05 14:30:16 +09:00
Tadashi G. Takaoka 3ceeb6bcc6 Add CsvUtils that conform to RFC 4180
Bug: 9070153
Change-Id: I66e55dd2f30fddfeb849edb97bc1cbda6b126d92
2013-06-05 12:26:22 +09:00
Tadashi G. Takaoka 0bfc2bc419 Merge "Add CODE_CAPSLOCK for long press shift key" 2013-06-05 02:19:02 +00:00
Tadashi G. Takaoka 9552badf3c Add CODE_CAPSLOCK for long press shift key
This change utilizes the no panel auto more key feature to implement
long press shift key for shift lock.

Change-Id: I3995d25dc35aea3c67b5aa29299815462eff9cad
2013-06-04 18:20:06 +09:00
Kurt Partridge 0dbae77496 Merge "Avoid an NPE" 2013-06-04 02:46:54 +00:00
Kurt Partridge 5fc9d6cc04 Avoid an NPE
Change-Id: I174eb8e92820fe6e7f8d3b89afae12d94063ef5d
2013-06-03 19:30:57 -07:00
Baligh Uddin 174f1b222f Import translations. DO NOT MERGE
Change-Id: I718dc281137ceca3015d7355238f91e16f4b9cbc
Auto-generated-cl: translation import
2013-06-03 15:18:17 -07:00
Tadashi G. Takaoka cbc7acb6f5 Merge "Expand suggestion strip when center suggestion is long" 2013-06-03 14:45:05 +00:00
Kurt Partridge 763fd9d5e9 Merge "Fix revert of committed words" 2013-06-03 13:03:26 +00:00
Tadashi G. Takaoka b4ae86f0de Merge "Rename methods for readability" 2013-06-03 09:57:48 +00:00
Tadashi G. Takaoka 2a529b85d0 Merge "Clear previous suggestions when gesture typing starts" 2013-06-03 09:27:55 +00:00
Tadashi G. Takaoka 9ff7354d78 Clear previous suggestions when gesture typing starts
Bug: 8651076
Change-Id: Ic65ed3e3696409edea4e35080c11e4d1869a5a7e
2013-06-03 17:59:26 +09:00
Tadashi G. Takaoka 2a9882a433 Rename methods for readability
Change-Id: I8fc2c90cf8d3dce11740f8e61edf6dfde9b1c116
2013-06-03 17:52:21 +09:00
Jean Chalard 3b94fd7b97 Merge "Update dictionaries" 2013-06-03 07:58:39 +00:00
Jean Chalard e73802f335 Update dictionaries
>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1366974711 <=> 1370244430
  MULTIPLE_WORDS_DEMOTION_RATE : 0 <=> 50
  version : 32 <=> 34
Body :
Deleted: МДА 2
Freq changed: а 0 -> 60
Freq changed: в 0 -> 60
Deleted: возбужденные 0
Freq changed: гей 92 -> 0
Freq changed: жид 80 -> 0
Freq changed: зареган 0 -> 50
Freq changed: и 0 -> 60
Freq changed: к 0 -> 60
Deleted: клевом 0
Freq changed: куи 29 -> 0
Freq changed: лох 69 -> 0
Freq changed: о 0 -> 60
Freq changed: ребут 0 -> 50
Freq changed: с 0 -> 60
Freq changed: у 0 -> 60
Freq changed: хуй 77 -> 0
Freq changed: хукера 38 -> 0
Freq changed: широко 0 -> 144
Deleted: щеткой 70
Freq changed: щёткой 69 -> 70
Freq changed: я 0 -> 60
Added: жены 134
Added: звони 100
Added: клёвом 50
Added: мда 0

>>> java/res/raw/main_ru.dict
Header :
  date : 1366974711 <=> 1370244430
  version : 32 <=> 34
  MULTIPLE_WORDS_DEMOTION_RATE : 0 <=> 50
Body :
(same changes)

Change-Id: Ie10bdd1f33cac43c5be35e99faef7cfdfe877d2b
2013-06-03 16:41:12 +09:00
Tadashi G. Takaoka 043273b00f Expand suggestion strip when center suggestion is long
Bug: 9059710
Change-Id: I7fa2658cc6442e86f69c991f1e99db6fb1ef909c
2013-06-03 16:12:59 +09:00
Tadashi G. Takaoka 0e66ab7433 Merge "Fix ArrayIndexOutOfBoundException" 2013-06-03 07:12:07 +00:00
Tadashi G. Takaoka 72ac390ce6 Fix ArrayIndexOutOfBoundException
Change-Id: I243fc4965365680615eed834efe9ae0240e7f2a8
2013-06-03 15:35:49 +09:00
Kurt Partridge c4119c8063 Merge "Uncommit an extra LogUnit" 2013-06-03 05:38:43 +00:00
Kurt Partridge a2f3f17de6 Merge "Compare scrubbed strings when uncommitting LogUnits" 2013-06-03 03:03:58 +00:00
Kurt Partridge 743302888b Merge "Uncommit separator LogUnits" 2013-06-03 03:01:23 +00:00
Kurt Partridge 3d20946272 Merge "Uncommit LogUnits when reverting textInput" 2013-06-03 02:58:20 +00:00
Kurt Partridge 4efb5c3b65 Merge "Remove uncommit on reverting batch input" 2013-06-03 02:54:33 +00:00
Kurt Partridge 94ef54321e Fix revert of committed words
Now that separators are put into their own LogUnits, they must be handled
when going through a revert.

Bug: 9088919

Change-Id: Ibebd0752bb2fa38d74ac96001d63070dd419cee3
2013-06-02 19:22:35 -07:00
Kurt Partridge f07024e0fa Compare scrubbed strings when uncommitting LogUnits
A LogUnit is only uncommitted if the LogUnit's word matches what is
expected.  But a LogUnit never stores numbers, only scrubbed words that
replace numbers with a special character.  So when uncommitting, the
text from the TextView must also be scrubbed for the comparison to pass
correctly.

Bug: 9088919

Change-Id: I9b56f10afce6d0cc84eb9ead3b9a9b1e061ae39c
2013-06-02 19:17:31 -07:00
Kurt Partridge bdff287a0d Uncommit separator LogUnits
Now that separators have their own LogUnits, they must be uncommitted
from the LogBuffer when backspacing over them.

Bug: 9088919

Change-Id: Ib36cc94939b93abe18850a06bced17caf8aaa5b9
2013-06-02 19:15:57 -07:00
Kurt Partridge 8160a21c3a Uncommit an extra LogUnit
The period-generating double-space adds an extra LogUnit --
it must be removed when reverting.

Bug: 9088919

Change-Id: Ic148f40b4030a9b4a0651029bda87f7b94a52252
2013-06-02 00:02:38 -07:00
Kurt Partridge 720840851d Uncommit LogUnits when reverting textInput
Bug: 9088919

Change-Id: I17187aa0afc1c3e9d32269c65f66cfb3a08663cb
2013-06-01 23:42:35 -07:00
Kurt Partridge 4165ef031f Remove uncommit on reverting batch input
Currently when the user reverts a batch input, a LogUnit is uncommitted
from the LogBuffer.  It should not be, because the LogUnit containing the
batch input is never committed in the first place (it is only committed
to the LogBuffer when a key is pressed or a new batch input is entered).

Bug: 9088919

Change-Id: I323af453ce082437a663ccae977b21b775a964bc
2013-06-01 11:15:47 -07:00
Baligh Uddin d3ccd4bf22 Merge "Import translations. DO NOT MERGE" 2013-05-31 23:19:22 +00:00
Jean Chalard 26f489493e Fix the displayed status after download
Bug: 9166225
Change-Id: I7490593d88a5854b9e675b9ead89d2ea9b49315c
2013-05-31 20:28:15 +09:00
Jean Chalard f61999caba Merge "Make it easy to open several dictionaries from tests" 2013-05-31 11:21:37 +00:00
Tadashi G. Takaoka a0c3e02d71 Refactor SuggestionStripLayoutHelper a bit
Bug: 9059710
Change-Id: Ief12029bad75d4dc78090ab97555aece01b873de
2013-05-31 18:14:47 +09:00
Tadashi G. Takaoka 70c2dcffa3 am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
* commit '6f7e39a6827598492ffbfeedf4c47445519f272e':
  Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:49:07 -07:00
Tadashi G. Takaoka 6f7e39a682 am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
* commit 'e7514a6a8a9e59ea5cde9f2c3a198f35d111cdc2':
  Add vibration override values for Galaxy S4 and HTC One
2013-05-30 23:47:01 -07:00
Tadashi G. Takaoka e7514a6a8a Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev 2013-05-31 06:45:07 +00:00
Jean Chalard 1562fc91f0 Make it easy to open several dictionaries from tests
Bug: 9127175
Change-Id: I3f1840ee73b364df26dfddb5acb10001e0f2cb61
2013-05-31 15:36:05 +09:00
Tadashi G. Takaoka 723391c945 Merge "Tidy up Utils class a bit" 2013-05-31 06:29:24 +00:00
Kurt Partridge e6125db98d Merge "Catch a permission exception" 2013-05-31 00:30:14 +00:00
Kurt Partridge d63f756013 Catch a permission exception
This change catches a SecurityException if the DictionaryProvider is
unavailable.

Change-Id: I4f2d87327c40765383d8847fd4e934b3cf799488
2013-05-30 13:40:40 -07:00
Tadashi G. Takaoka cbb99c60be Tidy up Utils class a bit
Change-Id: Idc2feb84a902a6cbb7265d1efe06c34e7d63c2c7
2013-05-31 00:32:57 +09:00
Tadashi G. Takaoka 7097aa2d3d Merge "Cleanup unreadable variable names" 2013-05-30 13:09:27 +00:00
Tadashi G. Takaoka d67db32b30 Merge "Separate SuggestionStripLayoutHelper for readablity" 2013-05-30 13:09:17 +00:00
Jean Chalard 1a50999ed9 Merge "Tell the text view we reset state on finish input" 2013-05-30 11:53:50 +00:00
Jean Chalard e90d039e0c Fix two strict mode warnings.
Bug: 9052555
Change-Id: I86e90488679a78a9f6e901b640025619293765a0
2013-05-30 20:12:05 +09:00
Tadashi G. Takaoka 500a9752b1 Cleanup unreadable variable names
Change-Id: Ic97687c58e25e4b0c6833cc25d10854f5f513081
2013-05-30 19:49:51 +09:00
Tadashi G. Takaoka 653603b725 Separate SuggestionStripLayoutHelper for readablity
Change-Id: I82c749c6837c3af7ae290f4cd92f5426ca58b5c7
2013-05-30 19:49:20 +09:00
Jean Chalard 8eb214d7e1 Merge "Fix dictionary pack preference order." 2013-05-30 06:38:27 +00:00
Baligh Uddin 73787ceaa2 Import translations. DO NOT MERGE
Change-Id: I4cd9c57839fe06e2555232074f84d21a45224baa
Auto-generated-cl: translation import
2013-05-29 23:03:48 -07:00
Jean Chalard b3d150aa13 Fix dictionary pack preference order.
It turns out giving them in the right order is not enough, you
also have to actually give them a numeric priority.

Bug: 9165928
Change-Id: I2ecff38f65b70746feeeeb0ed2cc86a586a35363
2013-05-30 12:33:06 +09:00
Jean Chalard ec9670ac3d Merge "Rub some butter on dictionary list scrolling." 2013-05-30 03:31:05 +00:00
Baligh Uddin b4b72d438b Merge "Import translations. DO NOT MERGE" 2013-05-29 21:52:43 +00:00
Jean Chalard 68d9cb62e2 Tell the text view we reset state on finish input
This should be done in onFinishInput rather than onFinishInputView
but for an unknown reason onFinishInput never comes.

Bug: 9113167
Change-Id: Iafb40846a3ed8fad78bfc160d17cd431f81fe891
2013-05-29 18:44:40 +09:00
Jean Chalard 2b34b4eab6 Rub some butter on dictionary list scrolling.
The default implementation for preferences refuses to
cache the views for custom preferences at all. We can
do it, but the system won't do it for us, so this does it.
This makes the screen scrolling smooth again.

Incidentally it also fixes the bug where the button may
not animate on the first element.

Bug: 8882722
Bug: 8883108
Change-Id: I9b2306ac4bf93761a808ebfee3477a65f017cddf
2013-05-29 11:52:04 +09:00
Kurt Partridge 305509ed2f Merge "Remove unused method" 2013-05-29 01:36:27 +00:00
Kurt Partridge b536e2ace5 Remove unused method
The removed method was used in old versions of ALK, never in master.

Change-Id: I607009d4fcca7c7c8493fee51ecd923e6a6b3890
2013-05-28 16:51:19 -07:00
Kurt Partridge 215fabff52 Merge "Rename containsCorrection to containsUserDeletions" 2013-05-28 23:41:26 +00:00
Kurt Partridge 315ab98007 Rename containsCorrection to containsUserDeletions
This change renames containsCorrection to avoid confusion with
CorrectionInfo, and to better clarify its meaning.

Change-Id: I5d8f8e2b03133c15a60d4e8b0f395cda1fff5447
2013-05-28 09:43:04 -07:00
Tadashi G. Takaoka d99abf8cb1 Delete shared preference entry when user select default value
Change-Id: I3fbafd9024c26a99d87376f5d5e359e03988a30f
2013-05-28 20:44:25 +09:00
Tadashi G. Takaoka 39bd6ea0dc Merge "Rename StringUtils.parseCsvString to KeySpecParser.splitKeySpecs" 2013-05-28 11:40:10 +00:00
Tadashi G. Takaoka dbed20ad8d Rename StringUtils.parseCsvString to KeySpecParser.splitKeySpecs
Change-Id: I16e3f3ebc43772cfd96c824afeddfd225404b857
2013-05-28 20:23:37 +09:00
Tadashi G. Takaoka d69e4191b7 Merge "Refactor suggestion strip layout methods a bit" 2013-05-28 11:11:05 +00:00
Tadashi G. Takaoka 389d308fff Refactor suggestion strip layout methods a bit
Bug: 9059710
Change-Id: I8dc698c1d61ca51b65b232e6c586472588a4accb
2013-05-28 20:03:37 +09:00
Tadashi G. Takaoka 4c2ac9ee5f Merge "Rename commaConcatinatedText to commaSplittableText" 2013-05-28 10:58:16 +00:00
Tadashi G. Takaoka c47bc30db8 Rename commaConcatinatedText to commaSplittableText
This is a follow up of I5a32882a08.

Change-Id: I9f0cda2167811f6bba2af042fbde0a821b4cfecd
2013-05-28 19:17:15 +09:00
Tadashi G. Takaoka 68cf2cd931 Merge "Check all regexp patterns in ResourceUtils.getDeviceOverrideValue" 2013-05-28 10:13:43 +00:00
Keisuke Kuroyanagi e168a3c2a5 Merge "Adding additional feature settings." 2013-05-28 10:11:29 +00:00
Tadashi G. Takaoka 4c75ea858a Check all regexp patterns in ResourceUtils.getDeviceOverrideValue
This change also fixes a regexp error of Galaxy S III.

Change-Id: I42a4780bbfd2b083f4e27e61ec513aa875907344
2013-05-28 19:05:40 +09:00
Tadashi G. Takaoka 6d77ae9d81 Merge "Remove KeyboardStart.isInMomentarySwitchState" 2013-05-28 09:23:24 +00:00
Satoshi Kataoka 07e56e76a7 Merge "Implement KIND_OOV_CORRECTION" 2013-05-28 07:27:53 +00:00
Keisuke Kuroyanagi 1b100610b3 Adding additional feature settings.
Change-Id: I9fec0c03b7da9ce0305b494193f4cfe3fca144f3
2013-05-28 00:27:48 -07:00
Tadashi G. Takaoka 1b46738796 Rename "csv" in StringUtils to "commaConcatenatedText"
Change-Id: I5a32882a088e4ff5bfe973a86465d6ff839113d9
2013-05-28 16:13:36 +09:00
Tadashi G. Takaoka e7e7b3234c Remove KeyboardStart.isInMomentarySwitchState
Change-Id: I00f45d8dd7feb6c34c0a65a8545cddd2751796d0
2013-05-28 15:26:03 +09:00
Satoshi Kataoka 3d97b95b90 Implement KIND_OOV_CORRECTION
Bug: 9127749
Change-Id: I96db15a3138e6b522c4c6ad16cc7faad577d3772
2013-05-27 18:53:43 -07:00
Satoshi Kataoka c92e87faf3 Add smoothing utils / matrix libs
Bug: 8556775
Change-Id: I7e0516b344937b84b7d57cc4e5009b7f88e7dc98
2013-05-27 18:08:49 -07:00
Baligh Uddin b4a1c2b510 Import translations. DO NOT MERGE
Change-Id: I1f9b5cf9010256f04a132bb832c128174251d726
Auto-generated-cl: translation import
2013-05-27 15:20:20 -07:00
Baligh Uddin dee9d17c68 Import translations. DO NOT MERGE
Change-Id: Iccfbe700901fe89974beab377bea82d547a1478a
Auto-generated-cl: translation import
2013-05-27 15:08:39 -07:00
Tadashi G. Takaoka 2115f63cba Merge "Add contentDescription attribute to setup wizard video and image" 2013-05-24 22:28:36 +00:00
Keisuke Kuroyanagi 28b6262b54 Merge "Passing options to native suggestion method." 2013-05-24 22:27:19 +00:00
Tadashi G. Takaoka 740d829092 Merge "Use localized toLowerString in AutoCorrection.isValidWord" 2013-05-24 20:00:38 +00:00
Tadashi G. Takaoka 94027c7201 Use Locale.ROOT for locale neutral operations
Bug: 9112465
Change-Id: I6cd63007287b5a1a57cfbabff35d53f66fc5620e
2013-05-24 12:07:30 -07:00
Tadashi G. Takaoka 618407ab7e Use localized toLowerString in AutoCorrection.isValidWord
Bug: 9112465
Change-Id: I63eb4115f393444560e80220d4c90f0f7101b934
2013-05-24 11:47:36 -07:00
Tadashi G. Takaoka ebe0544fc8 Remove redundant method AutoCorrection.isInTheDictionary
Change-Id: I0737fb0b68f411f4db06014f2d94804935808922
2013-05-24 11:40:03 -07:00
Tadashi G. Takaoka b2a78977ba Add contentDescription attribute to setup wizard video and image
Bug: 9112276
Change-Id: I028371770bacd6d975dee5648230abc19f51f542
2013-05-24 11:13:21 -07:00
Keisuke Kuroyanagi 50db5f0fff Passing options to native suggestion method.
Change-Id: I6da180cfa1b9e5aa39600e78e3bc41209a40f583
Signed-off-by: Keisuke Kuroyanagi <ksk@google.com>
2013-05-24 10:21:04 -07:00
Kurt Partridge df8f0fb64b Merge "Fix layout" 2013-05-24 16:09:24 +00:00
Kurt Partridge c4fe29425c Merge "Fix misplaced xml namespace" 2013-05-24 13:54:46 +00:00
Kurt Partridge 89c66fc12e Fix layout
Children of ScrollViews should specify a wrap_content layout_height,
according to AndroidLint

Change-Id: I4f972535f0df6bda1ba48082b812ce80fb5cfdcc
2013-05-23 17:59:23 -07:00
Kurt Partridge 003ed9b36a Fix misplaced xml namespace
Change-Id: I891293c10afbbee0a73c7c98322bec248cc7afb3
2013-05-23 17:59:23 -07:00
Kurt Partridge 264fb9581c Merge "Log reasons for punting n-gram logging" 2013-05-24 00:19:24 +00:00
Tadashi G. Takaoka 02088f4497 Add vibration override values for Galaxy S4 and HTC One
Bug: 9109493
2013-05-23 17:03:42 -07:00
Kurt Partridge aaa23bc12c Log reasons for punting n-gram logging
Addresses b/9074239

Change-Id: I91a3bfcbd32b03e4891ff5f65be01383a3fb8975
2013-05-23 13:56:36 -07:00
Tadashi G. Takaoka 6f9105383a Remove unnecessary methods of KeyboardSwitcher
Change-Id: Idd3647bb1a1d40df8bb89eda715d45427a58d0cd
2013-05-22 10:49:53 -07:00
Tadashi G. Takaoka dc22b7226a Merge "Clean up unused return value" 2013-05-22 17:44:51 +00:00
Tadashi G. Takaoka d88353266a Merge "Haptick and audio feedback on key repeat" 2013-05-22 17:44:01 +00:00
Kurt Partridge 5fdea4775e Merge "Always record word boundaries" 2013-05-22 03:04:35 +00:00
Tadashi G. Takaoka 009488eaaf Haptick and audio feedback on key repeat
Bug: 6522943
Change-Id: I181f7e8722bf1b3042d7f384ae8ebf87f29458a9
2013-05-21 19:48:15 -07:00
Tadashi G. Takaoka d9a87eb857 Merge "Fix drawing debug points of gesture trails" 2013-05-22 00:39:22 +00:00
Keisuke Kuroyanagi 44f679bbd2 Merge "Fix running on device regression test and profile." 2013-05-22 00:18:14 +00:00
Tadashi G. Takaoka 96efb1252a Clean up unused return value
Change-Id: Ie59f08db947ca5314935c6b723cf498129b4515c
2013-05-21 16:42:07 -07:00
Tadashi G. Takaoka 9764397274 Fix drawing debug points of gesture trails
Bug: 7167303
Change-Id: I9a75b1b9b9127c5364da49b2a04b22c16a7ad535
2013-05-21 16:09:10 -07:00
Kurt Partridge 450d78b030 Always record word boundaries
Word boundaries are currently logged, but only if all the
details of a word pass the privacy filter and are logged.

This change records when a word is committed in all cases,
but does not disclose the word contents or any data used in
its construction.

Addresses b/9070768

Change-Id: I573679d0685c088aca65af99e46337a2f429f816
2013-05-21 16:08:54 -07:00
Tadashi G. Takaoka 8a6a15e052 Merge "Clean up IntentCompatUtils a bit" 2013-05-21 22:17:24 +00:00
Tadashi G. Takaoka db7d4da3e5 Clean up IntentCompatUtils a bit
Change-Id: I803aa6c2160bfa1ffe992b28e7eb6e8a320c9762
2013-05-21 15:13:23 -07:00
Kurt Partridge ff80ee20b4 Merge "Modify isAllowedToLog" 2013-05-21 21:22:23 +00:00
Kurt Partridge 74a6196c6b Modify isAllowedToLog
Currently isAllowedToLog only checks the state of the
ResearchLogger, and does not consider which log the data is
going to.  This causes problems with the logs for Feedback.
The Feedback log should inhibit normal logging procedures,
but the system needs to be able to write specific data
directly to it.

This change renames to isAllowedToLogTo and adds the
destination ResearchLog as a parameter.  A FeedbackLog is also
added as a new class so it can be distinguished from other
ResearchLogs.

Change-Id: I5a1eea05bb040c26bf816b89179f44b3024fa2ad
2013-05-21 14:09:04 -07:00
Jean Chalard d96f63d2ed am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
* commit 'e2bee5b134aaefc69a680be8ea65e2d7640b3ead':
  Fix a crash on a secondary user
2013-05-20 21:32:21 -07:00
Jean Chalard e2bee5b134 am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
* commit 'ede3db51f0fb16559c27aa29a7cf07784bb9431c':
  Fix a crash on a secondary user
2013-05-20 21:29:50 -07:00
Jean Chalard ede3db51f0 Merge "Fix a crash on a secondary user" into jb-mr2-dev 2013-05-21 04:27:34 +00:00
Baligh Uddin 13d7d5684e am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '23bff513a97a71eacc6eadf694ce6f5a1e07967c':
  Import translations. DO NOT MERGE
2013-05-20 21:19:11 -07:00
Baligh Uddin 7f008a62d3 Merge "Import translations. DO NOT MERGE" 2013-05-21 04:18:40 +00:00
Baligh Uddin 23bff513a9 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-21 04:17:27 +00:00
Jean Chalard 05ea7c5d02 am 167ba345: am 89fe1f50: Add a method to work around apps broken by recorrection
* commit '167ba3459b0ce02b9add12ade9388bd2b1e6eb62':
  Add a method to work around apps broken by recorrection
2013-05-20 21:10:07 -07:00
Jean Chalard 167ba3459b am 89fe1f50: Add a method to work around apps broken by recorrection
* commit '89fe1f50881180730e451cbe6ec4d1f8dc67acf1':
  Add a method to work around apps broken by recorrection
2013-05-20 21:08:41 -07:00
Satoshi Kataoka 10e8b93977 Fix a crash on a secondary user
Bug: 9054063
Change-Id: I092ab6e0077578d0aca57d2e41dfbc00b46e1ba4
2013-05-21 12:27:16 +09:00
Keisuke Kuroyanagi adf82a97a9 Fix running on device regression test and profile.
Change-Id: Ie16d9514092d6d6f42881b975420e5d1431b776c
2013-05-20 20:14:13 -07:00
Tadashi G. Takaoka a66396369b Merge "Remove unnecessary @UsedForTesting annotation" 2013-05-21 03:07:59 +00:00
Jean Chalard 0013f97ddd am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds.
* commit '5906b05bb50c0a67bd4f03fcfae41db3daefe0bc':
  Extract a new class for app-specific workarounds.
2013-05-20 19:50:46 -07:00
Jean Chalard 5906b05bb5 am 7058b02a: Extract a new class for app-specific workarounds.
* commit '7058b02a9c798c21b169b778be2befc7739f4e9b':
  Extract a new class for app-specific workarounds.
2013-05-20 19:49:25 -07:00
Tadashi G. Takaoka 2532f72b94 Remove unnecessary @UsedForTesting annotation
Change-Id: I843fd6bc20da95e61d1a05b5b34d6e4c9db59dab
2013-05-21 10:45:59 +09:00
Jean Chalard 89fe1f5088 Add a method to work around apps broken by recorrection
Bug: 8944307
Change-Id: I8986622554f30aaf4f595099c4ab5652b75c972c
2013-05-21 07:53:31 +09:00
Jean Chalard 7058b02a9c Extract a new class for app-specific workarounds.
Bug: 8944307
Change-Id: Iaff9dd03d3d856a6bdaa2b16c4e71e95cd2b6349
2013-05-21 07:53:28 +09:00
Baligh Uddin 5914b8d4b6 Import translations. DO NOT MERGE
Change-Id: I1075741837c63b5bb93cf2b39aa707cf5afeb9e7
Auto-generated-cl: translation import
2013-05-20 15:29:34 -07:00
Baligh Uddin 6ac1a79f02 Import translations. DO NOT MERGE
Change-Id: I40c83f490ebab993d07fd92b78a6901f3ddbc2b2
Auto-generated-cl: translation import
2013-05-20 15:15:36 -07:00
Kurt Partridge 500dea6ad4 Fix punctuation logging
Punctuation is currently put into the same LogUnit as the
following word.  This is counter-intuitive and makes
post-processing more complicated.

This change causes punctuation to be put into its own
LogUnit.

A tricky case is the phantom space.  A phantom space is
inserted right before other text, whose MotionEvents have
already been collected and inserted into mCurrentLogBuffer.
Phantom spaces are handled by creating their own LogUnit and
inserting it into the LogBuffer right before
mCurrentLogBuffer is shifted in.

Change-Id: I102d7cd93982ad37ba0abb6c1ac0f66b85b5f95d
2013-05-17 09:47:40 -07:00
Kurt Partridge 17b63ba588 Merge "Remove unnecessary commit/uncommit" 2013-05-15 23:52:43 +00:00
Kurt Partridge 7af5300c7d Merge "Add claifying comment" 2013-05-15 23:31:31 +00:00
Jean Chalard d40b4729a5 am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
* commit 'b1e37e4a478a577c59930767148e50f8f45af21f':
  am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
2013-05-15 12:59:27 -07:00
Tadashi G. Takaoka ff0bd7dbfa am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
* commit '25f0c8089eecfcded7f41c66453bd874ba92219a':
  am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
2013-05-15 12:59:26 -07:00
Tadashi G. Takaoka d6a7a26d63 am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"
* commit 'd59c1f8324d568fa05a0ba660c602357b8f68958':
  am 50259c70: Merge "Tune layout parameters of setup wizard"
2013-05-15 12:59:25 -07:00
Tadashi G. Takaoka e7ef9669d6 am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset)
* commit '7d9bd6f54e5ebed4b4a1657c44e5731a2d182560':
  am 66b87269: Update welcome fallback image (using xhdpi asset)
2013-05-15 12:59:23 -07:00
Tadashi G. Takaoka 883905f45b am 7fe67544: am 769427cf: Adjust aspect ratio of setup image
* commit '7fe675440e5ecc3da872803dae60bec8bd66c9e5':
  am 769427cf: Adjust aspect ratio of setup image
2013-05-15 12:59:22 -07:00
Kurt Partridge 39afaf3dc3 am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
* commit '6d0f0347013fbd59d967b438c9f2754141d35f85':
  Remove FeedbackLog instance variables.
2013-05-15 12:59:19 -07:00
Tadashi G. Takaoka 46bf9f493c am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"
* commit '4e3a8afd173b23f8f73fd18d0b23a3cc8f3226b4':
  Revise welcome screen video and still image
2013-05-15 12:59:17 -07:00
Ken Wakasa acb37023b2 am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit."
* commit '23bfac83c25f7635d539cdb85d923a03c44c0a8d':
  Adjust sampling interval for gesture stroke drawing a bit.
2013-05-15 12:59:11 -07:00
Ken Wakasa 5ee11c5d9a am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
* commit '2e0fc8bf33411de82c8110878878ec1d6c392fe3':
  Revert "Fix isSuggestionsStripVisible when keyboard hidden"
2013-05-15 12:59:09 -07:00
Tadashi G. Takaoka 8e7b173936 am 3fff5179: am 41016aca: Back to previous keyboard layout by canceling sliding input
* commit '3fff5179d5020123c5bae7a1c83591afd45ace58':
  Back to previous keyboard layout by canceling sliding input
2013-05-15 12:59:08 -07:00
Tadashi G. Takaoka 03f2ca6d50 am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
* commit 'f46eafe2555a8d405ce7171bc4a2977a9aecf2b9':
  Fix PointerTrackerQueue.releaseAllPointerOlderThan
2013-05-15 12:59:06 -07:00
Jean Chalard 95586abc11 am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
* commit 'dccad3efa4af41282857df5140e8ca6dc9ad99be':
  Fix isSuggestionsStripVisible when keyboard hidden
2013-05-15 12:59:05 -07:00
Tadashi G. Takaoka 2d86b73ffe am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds
* commit '035c68a19a4966fe1a0f5c4d1cc7990e41455f79':
  Tune maximum keypress duration to 100 milliseconds
2013-05-15 12:53:14 -07:00
Tadashi G. Takaoka 7e52c35dce am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"
* commit '94c54eca391b82cd174a5e80c19078ff62556b66':
  Fix keypress vibration duration of HTC One X
2013-05-15 12:53:13 -07:00
Tadashi G. Takaoka f197335027 am a70da988: am 5f857a35: Merge "Disable functional key while in sliding input mode"
* commit 'a70da988d78ffd20941dfaa34f7a6324e465808e':
  Disable functional key while in sliding input mode
2013-05-15 12:53:11 -07:00
Tadashi G. Takaoka c731457f8a am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
* commit 'f6b5484dcb2d69fe6a21a62fda31ff523936b492':
  Add device specific keypress vibration duration database
2013-05-15 12:53:10 -07:00
Tadashi G. Takaoka 73673b4c41 am f1708394: am 0efd8d1b: Fix landscape override value expression
* commit 'f17083941daefe146358dc39a3e8d0ca660c530d':
  Fix landscape override value expression
2013-05-15 12:53:09 -07:00
Tadashi G. Takaoka 7a876b3114 am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding input mode"
* commit '813ba9f5262c59ba99efdcf838036ae3b7e2dd0c':
  Disable long press timer while sliding input mode
2013-05-15 12:53:07 -07:00
Tadashi G. Takaoka 94ad2ef762 am 094447bd: am ad662ade: Disable delete key repeating while in slide input mode
* commit '094447bd4652f9ed038f0489ef4e4f5af1679143':
  Disable delete key repeating while in slide input mode
2013-05-15 12:53:06 -07:00
Tadashi G. Takaoka 66e5e05fbf am 6780e43d: am 18184eac: Support regular expression for condition pattern
* commit '6780e43d761b0cbe0ce54cfc017ac779509e1c61':
  Support regular expression for condition pattern
2013-05-15 12:53:04 -07:00
Tadashi G. Takaoka aaf7d70be7 am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"
* commit '6f6478422f8881e7692c99e3a3925266980099d0':
  Support multiple condition for getDeviceOverrideValue
2013-05-15 12:53:03 -07:00
Ken Wakasa 8738eeaf65 am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
* commit '01c133d72e5cbba33148ec478a3f1ab0c0c3ad5f':
  Rename GesturePreviewTrail.java -> GestureTrail.java
2013-05-15 12:53:02 -07:00
Kurt Partridge 7bc99237b3 am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error
* commit '03a32146458f3cd192fde2ff0e85e3a0271a7d2a':
  Avoid JsonWriter multi-write error
2013-05-15 12:53:00 -07:00
Kurt Partridge 1e0f8cffaf am 697f6abb: am 260df841: Merge "Remove unused code"
* commit '697f6abb5d6478e0e0493ee7f821522fa4411f18':
  Remove unused code
2013-05-15 12:52:59 -07:00
Kurt Partridge eaf5c22782 am 026b2645: am bb17034f: Merge "Remove ref to LatinImeLogger preference."
* commit '026b2645c8561b554aa4f127bc90f4805354dc7d':
  Remove ref to LatinImeLogger preference.
2013-05-15 12:52:57 -07:00
Kurt Partridge 4ee6df8d6e am 1f8b354c: am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization"
* commit '1f8b354c9e30963f48ddf6c08b9333bcdc0e0a6f':
  Avoid NPE by fixing ResearchLogger initialization
2013-05-15 12:52:56 -07:00
Tadashi G. Takaoka 941e8bbaa9 am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
* commit 'a01ab9ea3580d95e87f3357b2612fb84971b3bfd':
  Refactor StringUtils.findPrefixedString to findValueOfKey
2013-05-15 12:52:55 -07:00
Tadashi G. Takaoka e90fe9c3a4 am afc40e74: am 4705c0fa: Fix screen flash when launching settings activity
* commit 'afc40e74fe01f138155bec26733a413c1b83e0c7':
  Fix screen flash when launching settings activity
2013-05-15 12:52:54 -07:00
Tadashi G. Takaoka 05aa5e75f3 am 48002809: am 2b5c9726: Introduce another activity to launch setup wizard
* commit '480028095509458aeca91d6c887f7a01aec02774':
  Introduce another activity to launch setup wizard
2013-05-15 12:52:53 -07:00
Tadashi G. Takaoka 82e3ea9505 am e7de0ce7: am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher"
* commit 'e7de0ce7411faec1b9bcfc07bdffe5c59856d928':
  Keep SetupActivity alive to check re-launching from launcher
2013-05-15 12:52:51 -07:00
Jean Chalard 28eab9d57c am 07905b6a: am 2564bd09: Merge "Reuse old preferences if possible."
* commit '07905b6a0a3e67ffc5a803ddbe863c2c101846fe':
  Reuse old preferences if possible.
2013-05-15 12:52:50 -07:00
Satoshi Kataoka 1884044eb7 am 81662dd4: am ba35426f: Merge "Tweak a label in the personal dictionary settings"
* commit '81662dd41e6eb39f89d7f1a3779e31f164e3e002':
  Tweak a label in the personal dictionary settings
2013-05-15 12:52:48 -07:00
Tadashi G. Takaoka 1cb72a0939 am 384d4e5b: am 2ad7023c: Fix detecting out of keyboard area
* commit '384d4e5b5da940b1620c5b4da2b938a9134ed2ea':
  Fix detecting out of keyboard area
2013-05-15 12:52:47 -07:00
Satoshi Kataoka 32866cebf1 am 2a383bfe: am 341f1b23: Tweak gesture debug
* commit '2a383bfebd16c82473ddf1c5203e5bc2d68282d5':
  Tweak gesture debug
2013-05-15 12:47:08 -07:00
Satoshi Kataoka 41b21c470f am 45c925a9: am 52cb409a: Don\'t resize debug array if production
* commit '45c925a9be45ddfd9901c44f1e2dec46d22ff84e':
  Don't resize debug array if production
2013-05-15 12:47:07 -07:00
Satoshi Kataoka 99cccf3dd0 am 7f9b3e62: am b2c4c730: Add debug facilities for gesture
* commit '7f9b3e6286ad78594d68a44c90d01062109b0320':
  Add debug facilities for gesture
2013-05-15 12:47:05 -07:00
Satoshi Kataoka f5bb523125 am a8254f73: am b9021090: Fix usages of getEnabledInputMethodSubtypeList
* commit 'a8254f73c27202f8db27c1e93816963a4634eabb':
  Fix usages of getEnabledInputMethodSubtypeList
2013-05-15 12:47:04 -07:00
Tadashi G. Takaoka e8f68d2295 am 14c0e4e7: am 499cea94: Use revised Google Keyboard icon
* commit '14c0e4e782f45d51082e8822b4520f7805a5ec80':
  Use revised Google Keyboard icon
2013-05-15 12:47:03 -07:00
Tadashi G. Takaoka 3da7bdd34e am e868922e: am 3e375863: Launch setup wizard as single top activity
* commit 'e868922edcbdf0df9ac2695c63384efa32629e07':
  Launch setup wizard as single top activity
2013-05-15 12:47:01 -07:00
Jean Chalard 29177deb55 am 114ec4ac: am 71d52474: Merge "Optimizations and safeguards."
* commit '114ec4ac9f2731419b6e1167067a4baffbefa6ea':
  Optimizations and safeguards.
2013-05-15 12:47:00 -07:00
Satoshi Kataoka e3ca68aa51 am 9e5d7abe: am eab27c1e: Merge "Add account e-mail addresses to the user dictionary"
* commit '9e5d7abe33fcf68ef74fde6851ea6dd99beb5141':
  Add account e-mail addresses to the user dictionary
2013-05-15 12:46:57 -07:00
Tadashi G. Takaoka bd2aca0b77 am c6143574: am 5b8b76ba: Merge "Move gesture preview trail parameters to resource"
* commit 'c614357468c496db420c7b1d0a8a119f86620f8a':
  Move gesture preview trail parameters to resource
2013-05-15 12:46:56 -07:00
Satoshi Kataoka 1c7a15b508 am eecf34a9: am faa94a2d: Merge "Add owner\'s info to the dictionary"
* commit 'eecf34a9be6ffb20635d0807f16f9fe131cf7f63':
  Add owner's info to the dictionary
2013-05-15 12:46:54 -07:00
Satoshi Kataoka 7fdd34317d am 873f9b90: am 6435c800: Merge "Fix an issue on the transition between the setup and the settings"
* commit '873f9b90f78857b13328a4a518d1aa8fa4b4f4eb':
  Fix an issue on the transition between the setup and the settings
2013-05-15 12:46:53 -07:00
Satoshi Kataoka 7e5e4c857f am fe856be8: am f59c4f68: Fix labels in the personal dictionary settings
* commit 'fe856be87573cd2641c6cf71e9b5a03e8b5e2491':
  Fix labels in the personal dictionary settings
2013-05-15 12:46:51 -07:00
Satoshi Kataoka a5f0a52d7c am 778eabfe: am 244a24e3: Consolidate dummy proximity info to the spell checker info
* commit '778eabfe7476b64aaef614c6649d6798b2bbc3bf':
  Consolidate dummy proximity info to the spell checker info
2013-05-15 12:46:50 -07:00
Kurt Partridge 8facddba7d am 9b5965d4: am 1eb1af75: Merge "Fix looping logic bugs."
* commit '9b5965d452d55fd271dc14f2328b44da08c3cb67':
  Fix looping logic bugs.
2013-05-15 12:46:48 -07:00
Tadashi G. Takaoka 3c3828884a am d2dbbc41: am 104bb70c: Merge "Avoid drawing too long gesture preview trails"
* commit 'd2dbbc417484d3f5ef0f4617e037473c75926d4e':
  Avoid drawing too long gesture preview trails
2013-05-15 12:46:45 -07:00
Jean Chalard d942e6e675 am 0633a208: am 2afe88b8: Merge "Unify space-adding on gestures."
* commit '0633a208bcb66afdb32de5b36329c4d559008881':
  Unify space-adding on gestures.
2013-05-15 12:46:44 -07:00
Satoshi Kataoka 4334809ff6 am 1e7c0677: am a9dd74cf: refactor spell checker
* commit '1e7c067770b6406c762974406013db24561c2416':
  refactor spell checker
2013-05-15 12:46:41 -07:00
Tadashi G. Takaoka 55b98d2549 am 7b6b30df: am 9d71a6c9: Remove unused device form factor values
* commit '7b6b30dffcf027f50198f9588eaa4918b4e1cda2':
  Remove unused device form factor values
2013-05-15 12:46:39 -07:00
Tadashi G. Takaoka 710a12e36c am d192dd94: am 84ac8f31: Move empty listner to KeyboardActionListener.Adapter
* commit 'd192dd94ebfb08a6e432c0083ba74a5ea86dd7b1':
  Move empty listner to KeyboardActionListener.Adapter
2013-05-15 12:46:38 -07:00
Tadashi G. Takaoka 066a445fc4 am 0500edcc: am 40eb31be: Merge "Clean up unused static variable"
* commit '0500edccc2b0620ee4e531508052ae6d2a84cc9b':
  Clean up unused static variable
2013-05-15 12:46:36 -07:00
Tadashi G. Takaoka bbc91a0671 am c8dcf48e: am ce67b416: Record down point as gesture preview trail for sure
* commit 'c8dcf48e022f7964015807dd7d52905ce41bdbfb':
  Record down point as gesture preview trail for sure
2013-05-15 12:46:34 -07:00
Tadashi G. Takaoka 7afc241d03 am 7a926b3c: am 4ddf1e47: Remove unused gesture preview trail code
* commit '7a926b3ca7997920a8dc56c52935676ef787d5e5':
  Remove unused gesture preview trail code
2013-05-15 12:46:33 -07:00
Tadashi G. Takaoka 4e8fde004f am a36266dd: am a5be033d: Preserve setup wizard step while orientation change
* commit 'a36266dd5840d645e46b18e41ebcdbea4a21c0e4':
  Preserve setup wizard step while orientation change
2013-05-15 12:35:28 -07:00
Tadashi G. Takaoka 3c93fdc8e0 am 9bb189f6: am 7d19ab5c: Using int instead of booleans to save keyboard shift state
* commit '9bb189f6131eda218bd76a055a3f4c83fbd0d088':
  Using int instead of booleans to save keyboard shift state
2013-05-15 12:35:27 -07:00
Tadashi G. Takaoka 62dd1ee3aa am 3c1a18c6: am 7f8dd50b: Save automatic shift state while orientation changing
* commit '3c1a18c6a6540300aea96b3195920f5a1e159e09':
  Save automatic shift state while orientation changing
2013-05-15 12:35:25 -07:00
Baligh Uddin a8fb8b4bb4 am e351e10a: Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'e351e10a68ad6e934ee3cfdd6456f9474d76facb':
  Import translations. DO NOT MERGE
2013-05-15 12:29:35 -07:00
Jean Chalard e229cd9743 am d8e55277: am 83757d43: Merge "Pass blockOffensiveWords as a parameter"
* commit 'd8e5527701ffe1d9da2280bf7bcca7834387b1c6':
  Pass blockOffensiveWords as a parameter
2013-05-15 12:24:00 -07:00
Jean Chalard 6b93b185ef am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
* commit '3eee5cd24b259109b9b2122026a494a050a540e9':
  Fix a layout problem for pre-MR2
2013-05-15 12:23:55 -07:00
Baligh Uddin c363302eb7 Merge commit '3ac40c6a' into jb-mr2-dev-plus-aosp
Conflicts:
	java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java

Conflict resolved by matching code with jb-mr2-dev.
2013-05-15 11:40:41 -07:00
Tadashi G. Takaoka 1e08d3d259 am 6191026c: am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"
* commit '6191026ce4e4cc756f47135223f58318d35d3143':
  Introduce MoreSuggestionsListener class
2013-05-15 11:26:02 -07:00
Satoshi Kataoka d53fb22a97 am fcfa2cb2: am 6314b845: Merge "Add permissions for personalization"
* commit 'fcfa2cb24fe4151e28574d3da4397bcc04f3d50a':
  Add permissions for personalization
2013-05-15 11:26:00 -07:00
Tadashi G. Takaoka 2f6851d9da am f405dc87: am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed"
* commit 'f405dc87a8e61fe95c8e4ee5b81a2f4cd005dfd0':
  Override View.drawableStateChanged to detect state_pressed
2013-05-15 11:25:59 -07:00
Tadashi G. Takaoka 03fe0cf4dd am 3b892164: am 7b2114a4: Display still image when device can\'t play welcome video
* commit '3b8921646fb51b9bb91108cfc103a5feccbbbbe9':
  Display still image when device can't play welcome video
2013-05-15 11:25:56 -07:00
Ken Wakasa 45fe5c3429 am 761b5586: am a0b62ece: Merge "Cleanup an unused return value"
* commit '761b5586a74f86b269335884fef4ab23eadc69f1':
  Cleanup an unused return value
2013-05-15 11:19:48 -07:00