| Chunk |
|---|
| Conflicting content |
|---|
superMaxScale = SUPER_MAX_MULTIPLIER * maxScale;
setImageMatrix(matrix);
setScaleType(ScaleType.MATRIX);
<<<<<<< HEAD
setState(State.NONE);
setOnTouchListener(new TouchImageViewListener());
onDrawReady = false;
=======
setState(NONE);
super.setOnTouchListener(new TouchImageViewListener());
>>>>>>> f7d26fa9e8bc9ae6289a163624fcb5d9410fffdc
}
@Override |
| Solution content |
|---|
superMaxScale = SUPER_MAX_MULTIPLIER * maxScale;
setImageMatrix(matrix);
setScaleType(ScaleType.MATRIX);
setState(State.NONE);
onDrawReady = false;
super.setOnTouchListener(new TouchImageViewListener());
}
@Override |
| File |
|---|
| TouchImageView.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public boolean onDoubleTap(MotionEvent e) {
boolean consumed = false;
<<<<<<< HEAD
if (state == State.NONE) {
=======
if(doubleTapListener != null) consumed = doubleTapListener.onDoubleTap(e);
if (state == NONE) {
>>>>>>> f7d26fa9e8bc9ae6289a163624fcb5d9410fffdc
float targetZoom = (normalizedScale == minScale) ? maxScale : minScale;
DoubleTapZoom doubleTap = new DoubleTapZoom(targetZoom, e.getX(), e.getY(), false);
compatPostOnAnimation(doubleTap); |
| Solution content |
|---|
@Override
public boolean onDoubleTap(MotionEvent e) {
boolean consumed = false;
if(doubleTapListener != null) {
consumed = doubleTapListener.onDoubleTap(e);
}
if (state == State.NONE) {
float targetZoom = (normalizedScale == minScale) ? maxScale : minScale;
DoubleTapZoom doubleTap = new DoubleTapZoom(targetZoom, e.getX(), e.getY(), false);
compatPostOnAnimation(doubleTap); |
| File |
|---|
| TouchImageView.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |