aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* am 4e12347e: am 931e2530: (-s ours) am 37ac3b3a: am a559e767: (-s ours) Merge...•••* commit '4e12347e0313279d13a267bd827c025949447743': Baligh Uddin2013-05-1553-0/+1590
|\
* | am 40070707: am 7a172175: Merge "Fix user recording dialog"•••* commit '40070707d83fb2a105292a0683fa22a1094e58fe': Fix user recording dialog Kurt Partridge2013-05-151-28/+9
|\|
| * Merge "Fix user recording dialog"Kurt Partridge2013-04-181-28/+9
| |\
| | * Fix user recording dialog•••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 Kurt Partridge2013-04-171-28/+9
* | | am 72ca59bc: am 0833b3cb: Merge "Fix alarm bug"•••* commit '72ca59bc2a29eaadf0b557995a137c8f682d82bb': Fix alarm bug Kurt Partridge2013-05-151-19/+6
|\| |
| * | Merge "Fix alarm bug"Kurt Partridge2013-04-181-19/+6
| |\ \
| | * | Fix alarm bug•••The AlarmManager takes absolute times as an argument, not durations. Change-Id: I419434ba5908c5f4070608070bbecf753088ecc8 Kurt Partridge2013-04-171-19/+6
| | |/
* | | am 1019c630: am a1913301: Merge "Avoid duplicate MotionEvents"•••* commit '1019c630fafd4bffd3fb51a0b83dfc532dcd5306': Avoid duplicate MotionEvents Kurt Partridge2013-05-151-4/+6
|\| |
| * | Merge "Avoid duplicate MotionEvents"Kurt Partridge2013-04-171-4/+6
| |\ \
| | * | Avoid duplicate MotionEvents•••Change-Id: I9c3b352b738698f262f254e581bde34b060e258f Kurt Partridge2013-04-171-4/+6
| | |/
* | | am a2a29050: am b903f103: Merge "Label logUnits after LatinImeOnEndBatchInput"•••* commit 'a2a2905033d37784b84191eec8d1efa3cd5b4819': Label logUnits after LatinImeOnEndBatchInput Kurt Partridge2013-05-151-0/+3
|\| |
| * | Merge "Label logUnits after LatinImeOnEndBatchInput"Kurt Partridge2013-04-171-0/+3
| |\ \
| | * | Label logUnits after LatinImeOnEndBatchInput•••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 Kurt Partridge2013-04-171-0/+3
| | |/
* | | am f5864fbb: am a5bfac5b: Merge "Fix NPE"•••* commit 'f5864fbb7a8703cb44a6e7bd77d7031ee271db12': Fix NPE Kurt Partridge2013-05-151-1/+1
|\| |
| * | Merge "Fix NPE"Kurt Partridge2013-04-171-1/+1
| |\ \
| | * | Fix NPE•••Change-Id: I8a091fb63dab12a0d2ba69e2fe393249bc68d103 Kurt Partridge2013-04-161-1/+1
| | |/
* | | am f9c137aa: am 7da87f97: Merge "Clean up unnecessary log messages"•••* commit 'f9c137aa600aa804110437a9385de8b5338a28b8': Clean up unnecessary log messages Kurt Partridge2013-05-151-2/+0
|\| |
| * | Merge "Clean up unnecessary log messages"Kurt Partridge2013-04-171-2/+0
| |\ \
| | * | Clean up unnecessary log messages•••Change-Id: I6c3252f3b31c5874ea2f909f636f58b579c06b8d Kurt Partridge2013-04-161-2/+0
| | |/
* | | am a9c2ff1b: am e9e4fe52: Merge "Fix logic error"•••* commit 'a9c2ff1b236624e7aefeecb2dbd2829e8217130c': Fix logic error Kurt Partridge2013-05-151-1/+1
|\| |
| * | Merge "Fix logic error"Kurt Partridge2013-04-171-1/+1
| |\ \
| | * | Fix logic error•••Change-Id: Ia36660c66504ba2fbb7f125704926a08726df87a Kurt Partridge2013-04-161-1/+1
| | |/
* | | am b20c7ee7: am 1f99e04b: Merge "Fix JsonWriter bug"•••* commit 'b20c7ee75093ae9c111daf64d9e4f8509d692824': Fix JsonWriter bug Kurt Partridge2013-05-151-3/+13
|\| |
| * | Merge "Fix JsonWriter bug"Kurt Partridge2013-04-171-3/+13
| |\ \
| | * | Fix JsonWriter bug•••JsonWriter requires that data be written to it, else close() will throw an exception. Change-Id: I596c5363e063cc75bcda55e0a506eefb3f17bd67 Kurt Partridge2013-04-171-3/+13
| | |/
* | | am 6c80e047: am dac3ee49: Merge "Small dot in corner was not visible"•••* commit '6c80e0475c8cde60fbadb9bab892a74dfa60132a': Small dot in corner was not visible Kurt Partridge2013-05-151-1/+1
|\| |
| * | Merge "Small dot in corner was not visible"Kurt Partridge2013-04-171-1/+1
| |\ \
| | * | Small dot in corner was not visible•••Framework change perhaps? Even if not, this makes it more visible Change-Id: Ib6d36b5a30136c4516adac666bdff36d1cd9b337 Kurt Partridge2013-04-161-1/+1
| | |/
* | | am abc8d564: am dd8c87a3: Merge "Include nanoTime in filename"•••* commit 'abc8d564eb0674887b5b1ebae3c1029935f4bb7b': Include nanoTime in filename Kurt Partridge2013-05-152-9/+11
|\| |
| * | Merge "Include nanoTime in filename"Kurt Partridge2013-04-172-9/+11
| |\ \
| | * | Include nanoTime in filename•••System is fast enough that sometimes SystemClock.currentTimeMillis() is duplicated when used to make a unique filename. Change-Id: I9454fbb5e10265d36b8e17cba183a1591d52cc7b Kurt Partridge2013-04-162-9/+11
| | |/
* | | am e85e3c64: am 46420204: Add user feedback to setup action labels and icons•••* commit 'e85e3c64767552461debc0b1989f09033f7e3054': Add user feedback to setup action labels and icons Tadashi G. Takaoka2013-05-1517-9/+186
|\| |
| * | Add user feedback to setup action labels and icons•••Bug: 8159728 Change-Id: I46c77c31973ae492c2a12291f2e0b154f64d26c9 Tadashi G. Takaoka2013-04-1717-9/+186
* | | am 0206339a: am 47a78aeb: Merge "Finalize setup wizard strings and mark as tr...•••* commit '0206339a2664d1cb05fff3ff20352cf04871bef1': Finalize setup wizard strings and mark as translatable Tadashi G. Takaoka2013-05-152-17/+26
|\| |
| * | Merge "Finalize setup wizard strings and mark as translatable"Tadashi G. Takaoka2013-04-172-17/+26
| |\ \
| | * | Finalize setup wizard strings and mark as translatable•••Bug: 8159728 Change-Id: I9f6f04b09b2cefdb7ece76a4f3c39ab56d0c8fab Tadashi G. Takaoka2013-04-172-17/+26
* | | | am bb84fdd1: am bb5deb82: Fix singleton/utility classes initialization in Set...•••* commit 'bb84fdd134e0a5aff268d5d475091e023778655d': Fix singleton/utility classes initialization in SettingsFragment Tadashi G. Takaoka2013-05-152-7/+12
|\| | |
| * | | Fix singleton/utility classes initialization in SettingsFragment•••This is a follow up of Ide3cd3acba. Bug: 8632344 Change-Id: Iafe51798a1a74eff5d8fcd6f0117d16b419d447d Tadashi G. Takaoka2013-04-172-7/+12
| |/ /
* | | am 2101ba41: am 888a194c: Fix missing AudioAndHapticFeedbackManager initializ...•••* commit '2101ba410c4fd12919b3b84e4e6bcc61b1897e70': Fix missing AudioAndHapticFeedbackManager initialization Tadashi G. Takaoka2013-05-151-0/+2
|\| |
| * | Fix missing AudioAndHapticFeedbackManager initialization•••Bug: 8632344 Change-Id: Ide3cd3acba3987317cff709fa591eadaa71834e8 Tadashi G. Takaoka2013-04-171-0/+2
| * | Fix bug to update last interpolated index of GestureStroke•••Bug: 8556775 Change-Id: Ie12e0dc9bfeae45f6883580801e07d44be1d1d33 Tadashi G. Takaoka2013-04-171-5/+5
| |/
* | am 22e6a5c5: Import translations. DO NOT MERGE•••* commit '22e6a5c5b4c3fb486fd2605255081fc4b849f415': Import translations. DO NOT MERGE Baligh Uddin2013-05-092-5/+5
|\ \
| * | Import translations. DO NOT MERGE•••Change-Id: I189a4ad23e69f0abe515dad7e3c909a28fcfbf0b Auto-generated-cl: translation import Baligh Uddin2013-05-082-5/+5
* | | am 34a0dc5a: Import translations. DO NOT MERGE•••* commit '34a0dc5abe47b28b7ef681b30aa5c94349b57e0d': Import translations. DO NOT MERGE Baligh Uddin2013-05-063-5/+5
|\| |
| * | Import translations. DO NOT MERGE•••Change-Id: I2e89e3da74724731dc26f081c9d468200e90b31e Auto-generated-cl: translation import Baligh Uddin2013-05-063-5/+5
* | | am b55b15c3: Import translations. DO NOT MERGE•••* commit 'b55b15c3bd920842720dd97ffa33bb45f5e6e0cd': Import translations. DO NOT MERGE Baligh Uddin2013-05-063-6/+6
|\| |
| * | Import translations. DO NOT MERGE•••Change-Id: I5c8c885e2971d73ffa5a8ac45dd39dd836c935c8 Auto-generated-cl: translation import Baligh Uddin2013-05-033-6/+6
* | | am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev•••* commit 'f7e4057f22c5226c0a11b0aec2e30c387ab9f285': Import translations. DO NOT MERGE Baligh Uddin2013-05-012-17/+17
|\| |
| * | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-022-17/+17
| |\ \
| | * | Import translations. DO NOT MERGE•••Change-Id: I840f5e7a7f140fbf5ccf27371077b2d8c86506c2 Auto-generated-cl: translation import Baligh Uddin2013-05-012-17/+17