diff options
author | vadimt <vadimt@google.com> | 2019-03-19 12:16:39 -0700 |
---|---|---|
committer | vadimt <vadimt@google.com> | 2019-03-19 12:16:39 -0700 |
commit | 6fe4e93d4a6802433241b7030c33a2e162f9280d (patch) | |
tree | 244ef71de84be351fc91bf0036105e2e7087e882 /tests/tapl/com | |
parent | 0825e414f05c525e46a58c32d534989b20da6a41 (diff) | |
download | packages_apps_Trebuchet-6fe4e93d4a6802433241b7030c33a2e162f9280d.tar.gz packages_apps_Trebuchet-6fe4e93d4a6802433241b7030c33a2e162f9280d.tar.bz2 packages_apps_Trebuchet-6fe4e93d4a6802433241b7030c33a2e162f9280d.zip |
Stop using magic constant 0.6 for returning from all apps to overview
Bug: 123904290
Change-Id: If1b6caf562484649ee107532ffe21d25deff4b97
Diffstat (limited to 'tests/tapl/com')
3 files changed, 16 insertions, 5 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java b/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java index 264281502..dcc51b50b 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java +++ b/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java @@ -23,6 +23,8 @@ import android.graphics.Point; import androidx.annotation.NonNull; import androidx.test.uiautomator.UiObject2; +import com.android.launcher3.TestProtocol; + /** * Operations on AllApps opened from Overview. */ @@ -45,7 +47,11 @@ public final class AllAppsFromOverview extends AllApps { final UiObject2 qsb = mLauncher.waitForObjectInContainer( allAppsContainer, "search_container_all_apps"); final Point start = qsb.getVisibleCenter(); - final int endY = (int) (mLauncher.getDevice().getDisplayHeight() * 0.6); + final int swipeHeight = mLauncher.getTestInfo( + TestProtocol.REQUEST_ALL_APPS_TO_OVERVIEW_SWIPE_HEIGHT). + getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD); + + final int endY = start.y + swipeHeight + mLauncher.getTouchSlop(); LauncherInstrumentation.log("AllAppsFromOverview.switchBackToOverview before swipe"); mLauncher.swipe(start.x, start.y, start.x, endY, OVERVIEW_STATE_ORDINAL); diff --git a/tests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java index 7031cd34c..2cde8ecd2 100644 --- a/tests/tapl/com/android/launcher3/tapl/Background.java +++ b/tests/tapl/com/android/launcher3/tapl/Background.java @@ -22,8 +22,6 @@ import static com.android.launcher3.tapl.TestHelpers.getOverviewPackageName; import static org.junit.Assert.assertTrue; -import android.view.ViewConfiguration; - import androidx.annotation.NonNull; import androidx.test.uiautomator.By; import androidx.test.uiautomator.Until; @@ -67,9 +65,11 @@ public class Background extends LauncherInstrumentation.VisibleContainer { final int swipeHeight = mLauncher.getTestInfo( getSwipeHeightRequestName()). getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD); - final int slop = ViewConfiguration.get(mLauncher.getContext()).getScaledTouchSlop(); - mLauncher.swipe(centerX, startY, centerX, startY - swipeHeight - slop, expectedState); + mLauncher.swipe( + centerX, startY, centerX, + startY - swipeHeight - mLauncher.getTouchSlop(), + expectedState); } else { mLauncher.waitForSystemUiObject("recent_apps").click(); } diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index ce37348d3..e3850ff0f 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -32,6 +32,7 @@ import android.provider.Settings; import android.util.Log; import android.view.MotionEvent; import android.view.Surface; +import android.view.ViewConfiguration; import android.view.accessibility.AccessibilityEvent; import androidx.annotation.NonNull; @@ -468,4 +469,8 @@ public final class LauncherInstrumentation { float getDisplayDensity() { return mInstrumentation.getTargetContext().getResources().getDisplayMetrics().density; } + + int getTouchSlop() { + return ViewConfiguration.get(getContext()).getScaledTouchSlop(); + } }
\ No newline at end of file |