nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,375 Commits
1 Branch
0 Tags
363 MiB
Commit Graph

7308 Commits (2d5e13ec31b2d1dfe9aca4c46aaad0dad10aba4b)

Author SHA1 Message Date
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
Tadashi G. Takaoka 24fc5ab65f am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video" 
* commit 'f4a03ddcf85a546a7ed9eb59840fd81e4c014de9':
  Catch error while playing welcome video
 2013-05-15 11:19:36 -07:00
Jean Chalard 9db1f6d9c6 am d618419d: am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar" 
* commit 'd618419d16865f9cc54ec893873bab514b321815':
  [PB14] Cosmetic fixes to the progress bar
 2013-05-15 11:19:35 -07:00
Satoshi Kataoka fa47814ca3 am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary" 
* commit 'f4d7c99cda24fb5747843a47cd8a4423c315f685':
  Fix the title of the fragment of the personal dictionary
 2013-05-15 11:19:28 -07:00
Jean Chalard bc81ac838a am 69e1e45c: am 01170ffe: [PB13] Actually update the progress bar 
* commit '69e1e45c012f5f1c1fa1ec8d096c806c99459ffe':
  [PB13] Actually update the progress bar
 2013-05-15 11:19:12 -07:00
Tadashi G. Takaoka 58434ae636 am 3bcc7545: am 965329c1: Fix missing string reference of spellchecker.xml 
* commit '3bcc75456fc01327e8358468131e8daf6095da98':
  Fix missing string reference of spellchecker.xml
 2013-05-15 11:19:00 -07:00
Jean Chalard 861d7cea30 am 27c91662: am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle" 
* commit '27c91662723f3b4252cff0ecef632156a2162316':
  [PB12] Implement the progress bar update lifecycle
 2013-05-15 11:18:43 -07:00
Jeff Sharkey f892099b3e am 238748d5: am 7a800e79: Merge "Avoid leaking AssetFileDescriptor." 
* commit '238748d57c8ba770be4c3e34fa6d704893de3d07':
  Avoid leaking AssetFileDescriptor.
 2013-05-15 11:17:59 -07:00
Jean Chalard 4779ea605a am 88f3e4ef: am fc26033c: [PB11] Add a skeleton class for a self-updating progress bar 
* commit '88f3e4efd49a0d39b01e37310ebaba2c4b40a040':
  [PB11] Add a skeleton class for a self-updating progress bar
 2013-05-15 11:05:23 -07:00
Jean Chalard e486427650 am eb34f710: am ab0c66b9: [PB10] Add a progress bar to display file download progress 
* commit 'eb34f71088215b7c6514b5f4150057c33f2069d3':
  [PB10] Add a progress bar to display file download progress
 2013-05-15 11:05:22 -07:00
Jean Chalard 33ccdd1cda am b312f4a8: am ae577ac1: Merge "Update dictionaries" 
* commit 'b312f4a8f78f423c5507785f5fbf79d6c786e5bc':
  Update dictionaries
 2013-05-15 11:05:20 -07:00
Jean Chalard 605e28c189 am 4e61cf71: am 739406bf: Merge "[PB9] Make buttons that animate-out unclickable" 
* commit '4e61cf7162c565e71e3aeb1a23d1b4f716392fa4':
  [PB9] Make buttons that animate-out unclickable
 2013-05-15 11:05:17 -07:00