aboutsummaryrefslogtreecommitdiffstats
path: root/java/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | Merge "Fix alarm bug"Kurt Partridge2013-04-181-19/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix alarm bugKurt Partridge2013-04-171-19/+6
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AlarmManager takes absolute times as an argument, not durations. Change-Id: I419434ba5908c5f4070608070bbecf753088ecc8
* | | | | | am 1019c630: am a1913301: Merge "Avoid duplicate MotionEvents"Kurt Partridge2013-05-151-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1019c630fafd4bffd3fb51a0b83dfc532dcd5306': Avoid duplicate MotionEvents
| * | | | | Merge "Avoid duplicate MotionEvents"Kurt Partridge2013-04-171-4/+6
| |\ \ \ \ \
| | * | | | | Avoid duplicate MotionEventsKurt Partridge2013-04-171-4/+6
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I9c3b352b738698f262f254e581bde34b060e258f
* | | | | | am a2a29050: am b903f103: Merge "Label logUnits after LatinImeOnEndBatchInput"Kurt Partridge2013-05-151-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a2a2905033d37784b84191eec8d1efa3cd5b4819': Label logUnits after LatinImeOnEndBatchInput
| * | | | | Merge "Label logUnits after LatinImeOnEndBatchInput"Kurt Partridge2013-04-171-0/+3
| |\ \ \ \ \
| | * | | | | Label logUnits after LatinImeOnEndBatchInputKurt Partridge2013-04-171-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only a commitText would cause a LogUnit to be labeled with the word that the data generates. In the case of gestured text, this information is available when LatinIME#onEndBatchInput is called. Labeling the LogUnit at this time means that the Log will have labeled words even if stop() is called before commit. Change-Id: Idb2f99a9c159a1b1aa00448a2ecddeca6c351c3e
* | | | | | am f5864fbb: am a5bfac5b: Merge "Fix NPE"Kurt Partridge2013-05-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5864fbb7a8703cb44a6e7bd77d7031ee271db12': Fix NPE
| * | | | | Merge "Fix NPE"Kurt Partridge2013-04-171-1/+1
| |\ \ \ \ \
| | * | | | | Fix NPEKurt Partridge2013-04-161-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I8a091fb63dab12a0d2ba69e2fe393249bc68d103
* | | | | | am f9c137aa: am 7da87f97: Merge "Clean up unnecessary log messages"Kurt Partridge2013-05-151-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9c137aa600aa804110437a9385de8b5338a28b8': Clean up unnecessary log messages
| * | | | | Merge "Clean up unnecessary log messages"Kurt Partridge2013-04-171-2/+0
| |\ \ \ \ \
| | * | | | | Clean up unnecessary log messagesKurt Partridge2013-04-161-2/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I6c3252f3b31c5874ea2f909f636f58b579c06b8d
* | | | | | am a9c2ff1b: am e9e4fe52: Merge "Fix logic error"Kurt Partridge2013-05-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9c2ff1b236624e7aefeecb2dbd2829e8217130c': Fix logic error
| * | | | | Merge "Fix logic error"Kurt Partridge2013-04-171-1/+1
| |\ \ \ \ \
| | * | | | | Fix logic errorKurt Partridge2013-04-161-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Ia36660c66504ba2fbb7f125704926a08726df87a
* | | | | | am b20c7ee7: am 1f99e04b: Merge "Fix JsonWriter bug"Kurt Partridge2013-05-151-3/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b20c7ee75093ae9c111daf64d9e4f8509d692824': Fix JsonWriter bug
| * | | | | Merge "Fix JsonWriter bug"Kurt Partridge2013-04-171-3/+13
| |\ \ \ \ \
| | * | | | | Fix JsonWriter bugKurt Partridge2013-04-171-3/+13
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JsonWriter requires that data be written to it, else close() will throw an exception. Change-Id: I596c5363e063cc75bcda55e0a506eefb3f17bd67
* | | | | | am 6c80e047: am dac3ee49: Merge "Small dot in corner was not visible"Kurt Partridge2013-05-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6c80e0475c8cde60fbadb9bab892a74dfa60132a': Small dot in corner was not visible
| * | | | | Merge "Small dot in corner was not visible"Kurt Partridge2013-04-171-1/+1
| |\ \ \ \ \
| | * | | | | Small dot in corner was not visibleKurt Partridge2013-04-161-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework change perhaps? Even if not, this makes it more visible Change-Id: Ib6d36b5a30136c4516adac666bdff36d1cd9b337
* | | | | | am abc8d564: am dd8c87a3: Merge "Include nanoTime in filename"Kurt Partridge2013-05-152-9/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'abc8d564eb0674887b5b1ebae3c1029935f4bb7b': Include nanoTime in filename
| * | | | | Merge "Include nanoTime in filename"Kurt Partridge2013-04-172-9/+11
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Include nanoTime in filenameKurt Partridge2013-04-162-9/+11
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System is fast enough that sometimes SystemClock.currentTimeMillis() is duplicated when used to make a unique filename. Change-Id: I9454fbb5e10265d36b8e17cba183a1591d52cc7b
* | | | | am e85e3c64: am 46420204: Add user feedback to setup action labels and iconsTadashi G. Takaoka2013-05-151-6/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'e85e3c64767552461debc0b1989f09033f7e3054': Add user feedback to setup action labels and icons
| * | | | Add user feedback to setup action labels and iconsTadashi G. Takaoka2013-04-171-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I46c77c31973ae492c2a12291f2e0b154f64d26c9
* | | | | am 0206339a: am 47a78aeb: Merge "Finalize setup wizard strings and mark as ↵Tadashi G. Takaoka2013-05-151-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translatable" * commit '0206339a2664d1cb05fff3ff20352cf04871bef1': Finalize setup wizard strings and mark as translatable
| * | | | Merge "Finalize setup wizard strings and mark as translatable"Tadashi G. Takaoka2013-04-171-5/+5
| |\ \ \ \
| | * | | | Finalize setup wizard strings and mark as translatableTadashi G. Takaoka2013-04-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I9f6f04b09b2cefdb7ece76a4f3c39ab56d0c8fab
* | | | | | am bb84fdd1: am bb5deb82: Fix singleton/utility classes initialization in ↵Tadashi G. Takaoka2013-05-152-7/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SettingsFragment * commit 'bb84fdd134e0a5aff268d5d475091e023778655d': Fix singleton/utility classes initialization in SettingsFragment
| * | | | | Fix singleton/utility classes initialization in SettingsFragmentTadashi G. Takaoka2013-04-172-7/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up of Ide3cd3acba. Bug: 8632344 Change-Id: Iafe51798a1a74eff5d8fcd6f0117d16b419d447d
* | | | | am 2101ba41: am 888a194c: Fix missing AudioAndHapticFeedbackManager ↵Tadashi G. Takaoka2013-05-151-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialization * commit '2101ba410c4fd12919b3b84e4e6bcc61b1897e70': Fix missing AudioAndHapticFeedbackManager initialization
| * | | | Fix missing AudioAndHapticFeedbackManager initializationTadashi G. Takaoka2013-04-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8632344 Change-Id: Ide3cd3acba3987317cff709fa591eadaa71834e8