| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.android_webview.test; | 5 package org.chromium.android_webview.test; |
| 6 | 6 |
| 7 import android.content.Context; | 7 import android.content.Context; |
| 8 import android.test.suitebuilder.annotation.SmallTest; | 8 import android.test.suitebuilder.annotation.SmallTest; |
| 9 import android.view.View; | 9 import android.view.View; |
| 10 | 10 |
| (...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 | 718 |
| 719 @Override | 719 @Override |
| 720 public void onPinchStarted() { | 720 public void onPinchStarted() { |
| 721 } | 721 } |
| 722 | 722 |
| 723 @Override | 723 @Override |
| 724 public void onPinchEnded() { | 724 public void onPinchEnded() { |
| 725 } | 725 } |
| 726 | 726 |
| 727 @Override | 727 @Override |
| 728 public void onFlingStartGesture( | 728 public void onFlingStartGesture(int scrollOffsetY, int scrollExtentY) {} |
| 729 int velocityX, int velocityY, int scrollOffsetY, int scrollExten
tY) { | |
| 730 } | |
| 731 | 729 |
| 732 @Override | 730 @Override |
| 733 public void onScrollUpdateGestureConsumed() { | 731 public void onScrollUpdateGestureConsumed() { |
| 734 mOnScrollUpdateGestureConsumedHelper.notifyCalled(); | 732 mOnScrollUpdateGestureConsumedHelper.notifyCalled(); |
| 735 } | 733 } |
| 736 } | 734 } |
| 737 | 735 |
| 738 @SmallTest | 736 @SmallTest |
| 739 @Feature({"AndroidWebView"}) | 737 @Feature({"AndroidWebView"}) |
| 740 public void testTouchScrollingConsumesScrollByGesture() throws Throwable { | 738 public void testTouchScrollingConsumesScrollByGesture() throws Throwable { |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 874 }); | 872 }); |
| 875 | 873 |
| 876 getInstrumentation().runOnMainSync(new Runnable() { | 874 getInstrumentation().runOnMainSync(new Runnable() { |
| 877 @Override | 875 @Override |
| 878 public void run() { | 876 public void run() { |
| 879 assertEquals(testContainerView.getScrollY(), scrolledYPix); | 877 assertEquals(testContainerView.getScrollY(), scrolledYPix); |
| 880 } | 878 } |
| 881 }); | 879 }); |
| 882 } | 880 } |
| 883 } | 881 } |
| OLD | NEW |