Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch is not affected by touch when disabled"

Browse Source
This commit is contained in:
Gilles Debunne
2011-06-13 17:09:12 -07:00
committed by Android (Google) Code Review
parent 71afd5e53c c2ab0d665c
commit 8fa10d44e1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/Switch.java
View File

@@ -387,7 +387,7 @@ public class Switch extends CompoundButton {
case MotionEvent.ACTION_DOWN: {
final float x = ev.getX();
final float y = ev.getY();
if (hitThumb(x, y)) {
if (isEnabled() && hitThumb(x, y)) {
mTouchMode = TOUCH_MODE_DOWN;
mTouchX = x;
mTouchY = y;
@@ -460,7 +460,8 @@ public class Switch extends CompoundButton {
*/
private void stopDrag(MotionEvent ev) {
mTouchMode = TOUCH_MODE_IDLE;
boolean commitChange = ev.getAction() == MotionEvent.ACTION_UP;
// Up and not canceled, also checks the switch has not been disabled during the drag
boolean commitChange = ev.getAction() == MotionEvent.ACTION_UP && isEnabled();
cancelSuperTouch(ev);