commit ee205a02922edf5df46a3e9450ccbebb929b267d
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Feb 08 09:35:35 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 08 09:35:35 2020 +0000
tree 403f45442b0e52edcd86461a7fad9ecff7e59b1f
parent 93d31172953af7ceb812ddfc5e5194f31b0dc882
parent 359cc2a5e523cb1ecf87c1a7aef711ee0f4e346e

Merge "Making some TAPL members public so that tests could use them directly" into ub-launcher3-master

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index e08c474..f7b4f2b 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -118,7 +118,7 @@
     public enum NavigationModel {ZERO_BUTTON, TWO_BUTTON, THREE_BUTTON}
 
     // Where the gesture happens: outside of Launcher, inside or from inside to outside.
-    enum GestureScope {
+    public enum GestureScope {
         OUTSIDE, INSIDE, INSIDE_TO_OUTSIDE
     }
 
@@ -147,7 +147,7 @@
         }
     }
 
-    interface Closable extends AutoCloseable {
+    public interface Closable extends AutoCloseable {
         void close();
     }
 
@@ -1020,7 +1020,8 @@
 
     // Inject a swipe gesture. Inject exactly 'steps' motion points, incrementing event time by a
     // fixed interval each time.
-    void linearGesture(int startX, int startY, int endX, int endY, int steps, boolean slowDown,
+    public void linearGesture(int startX, int startY, int endX, int endY, int steps,
+            boolean slowDown,
             GestureScope gestureScope) {
         log("linearGesture: " + startX + ", " + startY + " -> " + endX + ", " + endY);
         final long downTime = SystemClock.uptimeMillis();
@@ -1072,7 +1073,7 @@
                 0, 0, 1.0f, 1.0f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
     }
 
-    void sendPointer(long downTime, long currentTime, int action, Point point,
+    public void sendPointer(long downTime, long currentTime, int action, Point point,
             GestureScope gestureScope) {
         switch (action) {
             case MotionEvent.ACTION_DOWN:
@@ -1096,7 +1097,7 @@
         event.recycle();
     }
 
-    long movePointer(long downTime, long startTime, long duration, Point from, Point to,
+    public long movePointer(long downTime, long startTime, long duration, Point from, Point to,
             GestureScope gestureScope) {
         log("movePointer: " + from + " to " + to);
         final Point point = new Point();
@@ -1256,7 +1257,7 @@
         mStartRecordingTime = null;
     }
 
-    Closable eventsCheck() {
+    public Closable eventsCheck() {
         if ("com.android.launcher3".equals(getLauncherPackageName())) {
             // Not checking specific Launcher3 event sequences.
             return () -> {