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

Remove unnecessary waits in TouchUtil's drag

Browse Source 
TouchUtil's drag method tries to sync after sending
each event which is not necessary. Sync are slow so
removing them greatly improves test running time.

Bug: 17323559
Change-Id: Ia4ed02b2af44da0d821d93d28f963005d9d7ea79
This commit is contained in:
Yigit Boyar
2014-09-22 15:22:45 -07:00
parent fdb35f0526
commit de8d78906d
1 changed files with 57 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
test-runner/src/android/test/TouchUtils.java
View File

@@ -120,19 +120,13 @@ public class TouchUtils {
*/
public static void scrollToBottom(InstrumentationTestCase test, Activity activity,
ViewGroup v) {
View firstChild;
int firstId = Integer.MIN_VALUE;
int firstTop = Integer.MIN_VALUE;
int prevId;
int prevTop;
ViewStateSnapshot prev;
ViewStateSnapshot next = new ViewStateSnapshot(v);
do {
prevId = firstId;
prevTop = firstTop;
prev = next;
TouchUtils.dragQuarterScreenUp(test, activity);
firstChild = v.getChildAt(0);
firstId = firstChild.getId();
firstTop = firstChild.getTop();
} while ((prevId != firstId) || (prevTop != firstTop));
next = new ViewStateSnapshot(v);
} while (!prev.equals(next));
}
/**
@@ -160,19 +154,13 @@ public class TouchUtils {
* @param v The ViewGroup that should be dragged
*/
public static void scrollToTop(InstrumentationTestCase test, Activity activity, ViewGroup v) {
View firstChild;
int firstId = Integer.MIN_VALUE;
int firstTop = Integer.MIN_VALUE;
int prevId;
int prevTop;
ViewStateSnapshot prev;
ViewStateSnapshot next = new ViewStateSnapshot(v);
do {
prevId = firstId;
prevTop = firstTop;
prev = next;
TouchUtils.dragQuarterScreenDown(test, activity);
firstChild = v.getChildAt(0);
firstId = firstChild.getId();
firstTop = firstChild.getTop();
} while ((prevId != firstId) || (prevTop != firstTop));
next = new ViewStateSnapshot(v);
} while (!prev.equals(next));
}
/**
@@ -776,15 +764,12 @@ public class TouchUtils {
MotionEvent event = MotionEvent.obtain(downTime, eventTime,
MotionEvent.ACTION_DOWN, x, y, 0);
inst.sendPointerSync(event);
inst.waitForIdleSync();
for (int i = 0; i < stepCount; ++i) {
y += yStep;
x += xStep;
eventTime = SystemClock.uptimeMillis();
event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE, x, y, 0);
inst.sendPointerSync(event);
inst.waitForIdleSync();
}
eventTime = SystemClock.uptimeMillis();
@@ -792,4 +777,51 @@ public class TouchUtils {
inst.sendPointerSync(event);
inst.waitForIdleSync();
}
private static class ViewStateSnapshot {
final View mFirst;
final View mLast;
final int mFirstTop;
final int mLastBottom;
final int mChildCount;
private ViewStateSnapshot(ViewGroup viewGroup) {
mChildCount = viewGroup.getChildCount();
if (mChildCount == 0) {
mFirst = mLast = null;
mFirstTop = mLastBottom = Integer.MIN_VALUE;
} else {
mFirst = viewGroup.getChildAt(0);
mLast = viewGroup.getChildAt(mChildCount - 1);
mFirstTop = mFirst.getTop();
mLastBottom = mLast.getBottom();
}
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
final ViewStateSnapshot that = (ViewStateSnapshot) o;
return mFirstTop == that.mFirstTop &&
mLastBottom == that.mLastBottom &&
mFirst == that.mFirst &&
mLast == that.mLast &&
mChildCount == that.mChildCount;
}
@Override
public int hashCode() {
int result = mFirst != null ? mFirst.hashCode() : 0;
result = 31 * result + (mLast != null ? mLast.hashCode() : 0);
result = 31 * result + mFirstTop;
result = 31 * result + mLastBottom;
result = 31 * result + mChildCount;
return result;
}
}
}