Reset scroll deadzone for TV and Watch
A scroll deadzone percentage of 0 caused a test on TV to not be able to
scroll the PermissionController ScrollView. Reset scroll deadzone
percentage to the default of 0.1 that was used previously.
Bug: 202071915
Test: atest android.permission3.cts.PermissionTest22#testCompatRevoked
Change-Id: Ic074ca90a683fdd476cb4ad4f9e474d840b4c85b
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/UiAutomatorUtils.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/UiAutomatorUtils.java
index 4c07b75..639c871 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/UiAutomatorUtils.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/UiAutomatorUtils.java
@@ -35,6 +35,9 @@
public class UiAutomatorUtils {
private UiAutomatorUtils() {}
+ /** Default swipe deadzone percentage. See {@link UiScrollable}. */
+ private static final double DEFAULT_SWIPE_DEADZONE_PCT = 0.1;
+
private static Pattern sCollapsingToolbarResPattern =
Pattern.compile(".*:id/collapsing_toolbar");
@@ -75,7 +78,7 @@
if (view == null) {
final double deadZone = !(FeatureUtil.isWatch() || FeatureUtil.isTV())
- ? 0.25 : 0;
+ ? 0.25 : DEFAULT_SWIPE_DEADZONE_PCT;
UiScrollable scrollable = new UiScrollable(new UiSelector().scrollable(true));
scrollable.setSwipeDeadZonePercentage(deadZone);
if (scrollable.exists()) {
