Skip to content

Commit

Permalink
Changed the cancel call in the lock/unlock methods of the SliderPanel…
Browse files Browse the repository at this point in the history
… class to abort in effort to be more friendly about consuming touch events

See issue r0adkll#24
  • Loading branch information
r0adkll committed Jul 28, 2015
1 parent f06860a commit 4a79d9b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion library/library.iml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,15 @@ public void computeScroll() {
* Lock this sliding panel to ignore touch inputs.
*/
public void lock(){
mDragHelper.cancel();
mDragHelper.abort();
mIsLocked = true;
}

/**
* Unlock this sliding panel to listen to touch inputs.
*/
public void unlock(){
mDragHelper.cancel();
mDragHelper.abort();
mIsLocked = false;
}

Expand Down

0 comments on commit 4a79d9b

Please sign in to comment.