aboutsummaryrefslogtreecommitdiffstats
path: root/java/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am ceb3f293: am 0e96003e: Merge "Refactor SetupStepGroup"Tadashi G. Takaoka2013-05-152-34/+43
|\| | | | | | | | | | | | | | | | | | | * commit 'ceb3f293f010ae75ed5d3d3715a2807537e8b614': Refactor SetupStepGroup
| * | | Merge "Refactor SetupStepGroup"Tadashi G. Takaoka2013-04-242-34/+43
| |\ \ \ | | |/ / | |/| / | | |/
| | * Refactor SetupStepGroupTadashi G. Takaoka2013-04-242-34/+43
| | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I1ab846d0910aacbd2f979289d72bafea8a8e0378
* | | am 6a355d2d: am 197a2d32: Merge "[PB1] Cleanup"Jean Chalard2013-05-151-9/+2
|\| | | | | | | | | | | | | | * commit '6a355d2d189388833148cf3850429b38d57ae9e9': [PB1] Cleanup
| * | [PB1] CleanupJean Chalard2013-04-231-9/+2
| |/ | | | | | | | | | | | | | | This preference is not a DialogPreference any more, as it doesn't ever display a Dialog. Bug: 7600384 Change-Id: Ia5965617c83d3cb964010f9b40d833065dccef60
* | am dc079451: am 480284e2: Merge "Add edit personal dictionary settings menu"Tadashi G. Takaoka2013-05-152-0/+16
|\| | | | | | | | | * commit 'dc079451fc5bb10548d0d78c8db5e060e9a2f000': Add edit personal dictionary settings menu
| * Merge "Add edit personal dictionary settings menu"Tadashi G. Takaoka2013-04-232-0/+16
| |\
| | * Add edit personal dictionary settings menuTadashi G. Takaoka2013-04-222-0/+16
| | | | | | | | | | | | | | | Bug: 8600958 Change-Id: I303adfbe25a56cc9b5ee9f3b5169a5bca0ad6c4a
* | | am 1aab945b: am c3f47836: Add an additional ID to the client info.Jean Chalard2013-05-154-25/+110
|\| | | | | | | | | | | | | | * commit '1aab945b2ac1a1232f1cdcb843251f93ad1c3232': Add an additional ID to the client info.
| * | Add an additional ID to the client info.Jean Chalard2013-04-234-25/+110
| | | | | | | | | | | | | | | Bug: 8651863 Change-Id: I748f35726d72ede926d5b06ed87ff029317f1ac3
* | | am 434abe45: am 9b4e3db1: Legal noticeSatoshi Kataoka2013-05-155-12/+31
|\| | | | | | | | | | | | | | * commit '434abe450c8fd65789b6f8b04d62ad98287115dd': Legal notice
| * | Legal noticeSatoshi Kataoka2013-04-225-12/+31
| | | | | | | | | | | | | | | Bug: 8533258 Change-Id: I00e4916f86f29dd476c51a65e8fa5a6c136fd179
* | | am 34b00870: am 1a9bf159: Merge "Don\'t triger onPress and ↵Tadashi G. Takaoka2013-05-152-22/+30
|\| | | | | | | | | | | | | | | | | | | | startLongPressTimer when gesture is canceled" * commit '34b0087038eadf8efe1ce851ad3ba41c354152d1': Don't triger onPress and startLongPressTimer when gesture is canceled
| * | Merge "Don't triger onPress and startLongPressTimer when gesture is canceled"Tadashi G. Takaoka2013-04-222-22/+30
| |\ \ | | |/ | |/|
| | * Don't triger onPress and startLongPressTimer when gesture is canceledTadashi G. Takaoka2013-04-222-22/+30
| | | | | | | | | | | | | | | Bug: 8650846 Change-Id: Ice5ef07d6833422906b0b756206e097f75d1f2db
* | | am 80a98ee5: am 508ab248: Merge "Implement IMM.switchToNextInputMethod() for ↵Tadashi G. Takaoka2013-05-151-12/+115
|\| | | | | | | | | | | | | | | | | | | | ICS" * commit '80a98ee5c23024f3da7794f692a0ef69debe99d6': Implement IMM.switchToNextInputMethod() for ICS
| * | Merge "Implement IMM.switchToNextInputMethod() for ICS"Tadashi G. Takaoka2013-04-221-12/+115
| |\ \
| | * | Implement IMM.switchToNextInputMethod() for ICSTadashi G. Takaoka2013-04-221-12/+115
| | | | | | | | | | | | | | | | | | | | Bug: 8633367 Change-Id: Ifc0f97b1fdf5e5cc3601c24a503058c4822478dc
| * | | Don't kill suggestions with native score < 1Jean Chalard2013-04-221-1/+0
| | |/ | |/| | | | | | | Change-Id: I954856b7fec0b91e19a467f2a87978d49caa639d
* | | am bd99e8dc: am 41b34cf2: Merge "Allow LogUnits to hold >1 word"Kurt Partridge2013-05-154-86/+147
|\| | | | | | | | | | | | | | * commit 'bd99e8dc246faeafa5849078dce47fb379d23eb1': Allow LogUnits to hold >1 word
| * | Merge "Allow LogUnits to hold >1 word"Kurt Partridge2013-04-194-86/+147
| |\ \
| | * | Allow LogUnits to hold >1 wordKurt Partridge2013-04-194-86/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LogUnits have been annotated with the autocorrected words, but until now this was assumed to be a single word without spaces. But spaceless typing can result in spaces in the LogUnit label. With this change, the LogUnit inspects the autocorrected text to determine how many words were inserted, and counts them accurately. This change corrects a privacy problem, which was that if the word sampling algorithm chose a LogUnit that actually contained multiple words, then more than two successive words would be included in the log. Change-Id: I7c01c3dd3ac33d7e96c00836256bae9c14b124ed
* | | | am 6f6974e6: am 825da76c: Redisplay a hidden button after it entered the ↵Jean Chalard2013-05-151-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | screen again. * commit '6f6974e6e9a2b177cf1355395e52652b49a13c3a': Redisplay a hidden button after it entered the screen again.
| * | | Redisplay a hidden button after it entered the screen again.Jean Chalard2013-04-191-1/+4
| | | | | | | | | | | | | | | | | | | | Bug: 7600384 Change-Id: I6cd18fd7584b6e98260cb432956f08ba9886580b
* | | | am 6dc9933d: am f8014eea: Hide the correct button when pressing a new button.Jean Chalard2013-05-158-47/+55
|\| | | | | | | | | | | | | | | | | | | * commit '6dc9933d83c166b57dcfc42d5738423cde2e5bee': Hide the correct button when pressing a new button.
| * | | Hide the correct button when pressing a new button.Jean Chalard2013-04-198-47/+55
| | | | | | | | | | | | | | | | | | | | Bug: 7600384 Change-Id: Ic5dbbbbcf19d778dde1316ebb417f1a8ede2d25d
* | | | am b3663df5: am 68e4de1e: Add welcome screen to setup wizardTadashi G. Takaoka2013-05-152-2/+172
|\| | | | | | | | | | | | | | | | | | | * commit 'b3663df58238cc8e95e9b412964f6e8f43465d70': Add welcome screen to setup wizard
| * | | Add welcome screen to setup wizardTadashi G. Takaoka2013-04-192-2/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preliminary implementation because the welcome screen video is just a placeholder. Bug: 8159728 Change-Id: I6a2459a266babec2f078fc393b18c77b0b7992a8
* | | | am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screenTadashi G. Takaoka2013-05-151-8/+9
|\| | | | | | | | | | | | | | | | | | | * commit 'baa1e14da10fd1ab31780f08ffeb4f186124fc41': Groundwork to implement landscape and welcome screen
| * | | Groundwork to implement landscape and welcome screenTadashi G. Takaoka2013-04-191-8/+9
| | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I05ff6578980ec2e210ebb482ea51b1600e74a4f4
* | | | am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard"Tadashi G. Takaoka2013-05-151-4/+20
|\| | | | | | | | | | | | | | | | | | | * commit '82a7b185bb8a14e610950548d36fae7a06030236': Add finish action to setup wizard
| * | | Merge "Add finish action to setup wizard"Tadashi G. Takaoka2013-04-191-4/+20
| |\ \ \
| | * | | Add finish action to setup wizardTadashi G. Takaoka2013-04-191-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I1578fc31875a1edbfea213fb5e1a1b464d02e941
| * | | | am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-devJean Chalard2013-04-191-8/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1dde6a1bf659d182db5a2645515cc1efe74459c': Fix an NPE in recorrection
| * \ \ \ \ am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-devJean Chalard2013-04-191-2/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '3629605b7c14b5eea498ef9588f4fef788ef454c': Fix an NPE in recapitalize
* | | | | | am ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted ↵Tadashi G. Takaoka2013-05-151-20/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when activated" * commit 'ae19f170ba511d0bcb7632682b8f9ac45a91ece7': Make setup wizard step number highlighted when activated
| * | | | | Merge "Make setup wizard step number highlighted when activated"Tadashi G. Takaoka2013-04-191-20/+28
| |\ \ \ \ \
| | * | | | | Make setup wizard step number highlighted when activatedTadashi G. Takaoka2013-04-191-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I62ccbebaae0a0c4a93ad7c155fc3020a7f357f3c
| * | | | | | am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-devKen Wakasa2013-04-181-1/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55b306c9e0ea29a10dfd79d5478344fcc98ca184': Fix an infinite loop
| * \ \ \ \ \ \ am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputViewJean Chalard2013-04-182-5/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5d2da82a6a4486a4ef74e51ddd1c875f4c2d935': Initialize dictionaries at onStartInputView
* | | | | | | | | am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons"Tadashi G. Takaoka2013-05-152-13/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '64e87b3e660199b5dd7539fe413146e4dfbf977f': Update setup wizard icons
| * | | | | | | | Merge "Update setup wizard icons"Tadashi G. Takaoka2013-04-182-13/+11
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Update setup wizard iconsTadashi G. Takaoka2013-04-182-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: Ia5a14a35292b43dc1eaa2d4edd65134040355149
* | | | | | | | | am 8acab80a: am 56f35a10: Merge "Fix bug in counting words between samples"Kurt Partridge2013-05-152-20/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8acab80a8680956038b45912d3e00a1d6a5e3cdb': Fix bug in counting words between samples
| * | | | | | | | Merge "Fix bug in counting words between samples"Kurt Partridge2013-04-182-20/+23
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix bug in counting words between samplesKurt Partridge2013-04-172-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously MainLogBuffer#shiftOutWords() assumed it wouldn't be called if mNumWordsUntilSafeToSample was 0. This relaxes this assumption (which is in fact false in the current code). Change-Id: I8723248095e84a0d9d6f4639b4742cc7dda9716b
* | | | | | | | | | am 40070707: am 7a172175: Merge "Fix user recording dialog"Kurt Partridge2013-05-151-28/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40070707d83fb2a105292a0683fa22a1094e58fe': Fix user recording dialog
| * | | | | | | | | Merge "Fix user recording dialog"Kurt Partridge2013-04-181-28/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix user recording dialogKurt Partridge2013-04-171-28/+9
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking the "include recording" checkbox in the user feedback dialog did nothing. The code was relying on the state of the checkbox, rather than keeping its own state. Fixing this addresses the bug. Change-Id: I559d57a4e11f869f6e6f5e5de7878f765531a203
* | | | | | | | | | am 72ca59bc: am 0833b3cb: Merge "Fix alarm bug"Kurt Partridge2013-05-151-19/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72ca59bc2a29eaadf0b557995a137c8f682d82bb': Fix alarm bug