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

Commit 60f4c7ec authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Adding automated test for ag/14874758" into sc-dev am: e896d413 

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

Change-Id: I10f79a57ea2d60056ae4259dced2f2dc013583e7
parents 29e2ae40 e896d413

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    private KeyguardStatusBarView mKeyguardStatusBar;

    private KeyguardStatusBarViewController mKeyguarStatusBarViewController;

    private ViewGroup mBigClockContainer;

    private QS mQs;

    @VisibleForTesting QS mQs;

    private FrameLayout mQsFrame;

    private KeyguardStatusViewController mKeyguardStatusViewController;

    private LockIconViewController mLockIconViewController;

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java

+20 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import com.android.systemui.media.KeyguardMediaController; 
import com.android.systemui.media.MediaDataManager;

import com.android.systemui.media.MediaHierarchyManager;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.qs.QS;

import com.android.systemui.qs.QSDetailDisplayer;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;
@@ -129,6 +130,8 @@ import java.util.List; 
@TestableLooper.RunWithLooper

public class NotificationPanelViewTest extends SysuiTestCase {



    private static final int NOTIFICATION_SCRIM_TOP_PADDING_IN_SPLIT_SHADE = 50;



    @Mock

    private StatusBar mStatusBar;

    @Mock
@@ -290,6 +293,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
        when(mResources.getDisplayMetrics()).thenReturn(mDisplayMetrics);

        mDisplayMetrics.density = 100;

        when(mResources.getBoolean(R.bool.config_enableNotificationShadeDrag)).thenReturn(true);

        when(mResources.getDimensionPixelSize(R.dimen.notifications_top_padding_split_shade))

                .thenReturn(NOTIFICATION_SCRIM_TOP_PADDING_IN_SPLIT_SHADE);

        when(mResources.getDimensionPixelSize(R.dimen.qs_panel_width)).thenReturn(400);

        when(mResources.getDimensionPixelSize(R.dimen.notification_panel_width)).thenReturn(400);

        when(mView.getContext()).thenReturn(getContext());
@@ -666,6 +671,21 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
        verify(mTapAgainViewController).show();

    }



    @Test

    public void testNotificationClipping_isAlignedWithNotificationScrimInSplitShade() {

        mStatusBarStateController.setState(SHADE);

        QS qs = mock(QS.class);

        when(qs.getHeader()).thenReturn(mock(View.class));

        mNotificationPanelViewController.mQs = qs;

        enableSplitShade();



        // hacky way to refresh notification scrim top with non-zero qsPanelBottom value

        mNotificationPanelViewController.setTransitionToFullShadeAmount(200, false, 0);



        verify(mAmbientState)

                .setNotificationScrimTop(NOTIFICATION_SCRIM_TOP_PADDING_IN_SPLIT_SHADE);

    }



    private FalsingManager.FalsingTapListener getFalsingTapListener() {

        for (View.OnAttachStateChangeListener listener : mOnAttachStateChangeListeners) {

            listener.onViewAttachedToWindow(mView);