Loading packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +1 −1 Original line number Diff line number Diff line Loading @@ -329,7 +329,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; Loading packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java +20 −0 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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 Loading Loading @@ -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()); Loading Loading @@ -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); Loading Loading
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +1 −1 Original line number Diff line number Diff line Loading @@ -329,7 +329,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; Loading
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java +20 −0 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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 Loading Loading @@ -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()); Loading Loading @@ -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); Loading