Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java

Issue 901183002: Enable smooth scroll/pan through gamepad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/input/JoystickScrollProvider.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
index 5962363b16601a3e0a7d8ca95019077d4ef818e7..beb7334cf05830786ebe6de4a3d862fb259660cf 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
@@ -8,6 +8,7 @@ import android.content.res.Configuration;
import android.graphics.Canvas;
import android.os.SystemClock;
import android.test.suitebuilder.annotation.SmallTest;
+import android.view.InputDevice;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
@@ -145,6 +146,23 @@ public class ContentViewScrollingTest extends ContentShellTestBase {
});
}
+ private void scrollWithJoystick(final float deltaAxisX, final float deltaAxisY)
+ throws Throwable {
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // Synthesize joystick motion event and send to ContentViewCore.
+ MotionEvent leftJoystickMotionEvent =
+ MotionEvent.obtain(0, SystemClock.uptimeMillis(), MotionEvent.ACTION_MOVE,
+ deltaAxisX, deltaAxisY, 0);
+ leftJoystickMotionEvent.setSource(
+ leftJoystickMotionEvent.getSource() | InputDevice.SOURCE_CLASS_JOYSTICK);
+ getContentViewCore().getContainerView().onGenericMotionEvent(
+ leftJoystickMotionEvent);
+ }
+ });
+ }
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -244,6 +262,53 @@ public class ContentViewScrollingTest extends ContentShellTestBase {
assertWaitForScroll(false, false);
}
+ @SmallTest
+ @RerunWithUpdatedContainerView
+ @Feature({"Main"})
+ public void testJoystickScroll() throws Throwable {
+ scrollTo(0, 0);
+ assertWaitForScroll(true, true);
+
+ // No scroll
+ scrollWithJoystick(0f, 0f);
+ assertWaitForScroll(true, true);
+
+ // Verify no scrolling when X axis motion falls in deadzone.
+ // TODO(jdduke): Make the deadzone scroll checks non-racy.
+ scrollWithJoystick(0.2f, 0f);
+ assertWaitForScroll(true, true);
+
+ // Verify no scrolling when Y axis motion falls in deadzone.
+ scrollWithJoystick(0f, 0.2f);
+ assertWaitForScroll(true, true);
+
+ // Vertical scroll to lower-left.
+ scrollWithJoystick(0, 0.5f);
+ assertWaitForScroll(true, false);
+ // Send joystick event at origin to stop scrolling.
+ scrollWithJoystick(0f, 0f);
+
+ // Horizontal scroll to lower-right.
+ scrollWithJoystick(0.5f, 0);
+ assertWaitForScroll(false, false);
+ scrollWithJoystick(0f, 0f);
+
+ // Vertical scroll to upper-right.
+ scrollWithJoystick(0, -0.75f);
+ assertWaitForScroll(false, true);
+ scrollWithJoystick(0f, 0f);
+
+ // Horizontal scroll to top-left.
+ scrollWithJoystick(-0.75f, 0);
+ assertWaitForScroll(true, true);
+ scrollWithJoystick(0f, 0f);
+
+ // Diagonal scroll to bottom-right.
+ scrollWithJoystick(1f, 1f);
+ assertWaitForScroll(false, false);
+ scrollWithJoystick(0f, 0f);
+ }
+
/**
* To ensure the device properly responds to bounds-exceeding scrolls, e.g., overscroll
* effects are properly initialized.
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/input/JoystickScrollProvider.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698