| Chunk |
|---|
| Conflicting content |
|---|
*/
private static float SCROLL_FRICTION = 0.015f;
<<<<<<< HEAD
=======
/**
* Max distance to overscroll for edge effects
*/
private static final int OVERSCROLL_DISTANCE = 0;
/**
* Max distance to overfling for edge effects
*/
private static final int OVERFLING_DISTANCE = 4;
>>>>>>> 0354f0cad59fd87a2756d3949213fe54ac2a50f0
private final int mEdgeSlop;
private final int mFadingEdgeLength;
private final int mMinimumFlingVelocity; |
| Solution content |
|---|
*/
private static float SCROLL_FRICTION = 0.015f;
private final int mEdgeSlop;
private final int mFadingEdgeLength;
private final int mMinimumFlingVelocity; |
| File |
|---|
| ViewConfiguration.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |