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

Revert "Extand the long press duration"

Browse Source 
This reverts commit 8dc06e5335.

Reason for revert: b/258787797

Bug: 258787797
Change-Id: I417939d7d9f0344e4f260703cac9929d1e0633d1
This commit is contained in:
Victor Chang
2022-11-11 14:54:07 +00:00
committed by Android (Google) Code Review
parent 8dc06e5335
commit db82b37998
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SplitScreenUtils.kt
View File

@@ -41,7 +41,6 @@ import com.android.server.wm.traces.parser.toFlickerComponent
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
import com.android.wm.shell.flicker.LAUNCHER_UI_PACKAGE_NAME
import com.android.wm.shell.flicker.SYSTEM_UI_PACKAGE_NAME
import org.junit.Assert.assertNotNull
import java.util.Collections
internal object SplitScreenUtils {
@@ -51,7 +50,7 @@ internal object SplitScreenUtils {
private const val DIVIDER_BAR = "docked_divider_handle"
private const val OVERVIEW_SNAPSHOT = "snapshot"
private const val GESTURE_STEP_MS = 16L
private val LONG_PRESS_TIME_MS = ViewConfiguration.getLongPressTimeout() * 2L
private const val LONG_PRESS_TIME_MS = 100L
private val SPLIT_DECOR_MANAGER = ComponentNameMatcher("", "SplitDecorManager#")
private val notificationScrollerSelector: BySelector
@@ -276,6 +275,13 @@ internal object SplitScreenUtils {
}
}
fun longPress(instrumentation: Instrumentation, point: Point) {
val downTime = SystemClock.uptimeMillis()
touch(instrumentation, MotionEvent.ACTION_DOWN, downTime, downTime, TIMEOUT_MS, point)
SystemClock.sleep(LONG_PRESS_TIME_MS)
touch(instrumentation, MotionEvent.ACTION_UP, downTime, downTime, TIMEOUT_MS, point)
}
fun createShortcutOnHotseatIfNotExist(tapl: LauncherInstrumentation, appName: String) {
tapl.workspace.deleteAppIcon(tapl.workspace.getHotseatAppIcon(0))
val allApps = tapl.workspace.switchToAllApps()
@@ -347,11 +353,9 @@ internal object SplitScreenUtils {
Until.findObject(By.res(sourceApp.packageName, "SplitScreenTest")),
TIMEOUT_MS
)
assertNotNull("Unable to find the TextView", textView)
textView.click(LONG_PRESS_TIME_MS)
longPress(instrumentation, textView.visibleCenter)
val copyBtn = device.wait(Until.findObject(By.text("Copy")), TIMEOUT_MS)
assertNotNull("Unable to find the copy button", copyBtn)
copyBtn.click()
// Paste text to destinationApp
@@ -360,11 +364,9 @@ internal object SplitScreenUtils {
Until.findObject(By.res(destinationApp.packageName, "plain_text_input")),
TIMEOUT_MS
)
assertNotNull("Unable to find the EditText", editText)
editText.click(LONG_PRESS_TIME_MS)
longPress(instrumentation, editText.visibleCenter)
val pasteBtn = device.wait(Until.findObject(By.text("Paste")), TIMEOUT_MS)
assertNotNull("Unable to find the paste button", pasteBtn)
pasteBtn.click()
// Verify text