Skip to content

Commit d963dbf

Browse files
author
xiangdong.cheng
committed
fix ClickableViewAccessibility warning
1 parent c03901b commit d963dbf

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.animation.Animator;
55
import android.animation.AnimatorSet;
66
import android.animation.ValueAnimator;
7+
import android.annotation.SuppressLint;
78
import android.content.Context;
89
import android.content.res.TypedArray;
910
import android.graphics.Canvas;
@@ -206,25 +207,24 @@ public boolean performClick() {
206207
return super.performClick();
207208
}
208209

210+
@SuppressLint("ClickableViewAccessibility")
209211
@Override
210212
public boolean onTouchEvent(MotionEvent event) {
211213
if(!isEnabled()){
212214
return true;
213215
}
214216
switch (event.getAction()){
215217
case MotionEvent.ACTION_DOWN:
216-
mTouchX = event.getX();
217-
mTouchY = event.getY();
218-
playRippleAnimation(true);
219-
break;
218+
mTouchX = event.getX();
219+
mTouchY = event.getY();
220+
playRippleAnimation(true);
221+
break;
220222
case MotionEvent.ACTION_UP:
221-
case MotionEvent.ACTION_CANCEL:
222223
playRippleAnimation(false);
223-
performClick();
224-
return false;
224+
break;
225225
}
226226

227-
return super.onTouchEvent(event);
227+
return true;
228228
}
229229

230230
@Override
@@ -741,7 +741,7 @@ public void onAnimationEnd(Animator animator) {
741741
scaleAnimator.start();
742742
}
743743

744-
private void playRippleAnimation(boolean isTouchDown){
744+
private void playRippleAnimation(final boolean isTouchDown){
745745
setShadowDepth2();
746746
ValueAnimator rippleAnimator = ValueAnimator.ofFloat(isTouchDown ? 0 : width/2, isTouchDown ? width/2 : width);
747747
rippleAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {

0 commit comments

Comments
 (0)