summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hawkwood Glazier <jglazier@google.com> 2022-12-09 21:17:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-09 21:17:43 +0000
commit36704a0e20cce5277478fa202d077ad58b173f1c (patch)
treead6a1856929f6b39c26a5bb8499fe663d8db6123
parenta399bc2630b170842047653f8d098ef9e1faf7e6 (diff)
parentaa031de794f8ef6edf64da20f0b81e15374bdf45 (diff)
Merge "Disable NotificationPanelViewControllerTest.*_returnSpaceAvailable" into tm-qpr-dev am: aa031de794
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643660 Change-Id: I56a159dfe6193a6d2c789b3998f28611e9f85de5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java
index 56a840cae267..0302dade0a8c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java
@@ -173,6 +173,7 @@ import com.android.wm.shell.animation.FlingAnimationUtils;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -611,6 +612,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
}
@Test
+ @Ignore("b/261472011 - Test appears inconsistent across environments")
public void getVerticalSpaceForLockscreenNotifications_useLockIconBottomPadding_returnsSpaceAvailable() {
setBottomPadding(/* stackScrollLayoutBottom= */ 180,
/* lockIconPadding= */ 20,
@@ -622,6 +624,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
}
@Test
+ @Ignore("b/261472011 - Test appears inconsistent across environments")
public void getVerticalSpaceForLockscreenNotifications_useIndicationBottomPadding_returnsSpaceAvailable() {
setBottomPadding(/* stackScrollLayoutBottom= */ 180,
/* lockIconPadding= */ 0,
@@ -633,6 +636,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
}
@Test
+ @Ignore("b/261472011 - Test appears inconsistent across environments")
public void getVerticalSpaceForLockscreenNotifications_useAmbientBottomPadding_returnsSpaceAvailable() {
setBottomPadding(/* stackScrollLayoutBottom= */ 180,
/* lockIconPadding= */ 0,