Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36704a0e authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Disable NotificationPanelViewControllerTest.*_returnSpaceAvailable"... 

Merge "Disable NotificationPanelViewControllerTest.*_returnSpaceAvailable" into tm-qpr-dev am: aa031de7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643660



Change-Id: I56a159dfe6193a6d2c789b3998f28611e9f85de5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a399bc26 aa031de7

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java

+4 −0
Original line number Diff line number Diff line
@@ -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,