Merge "Removing horizontal translation of shade for dual pane" into sc-dev (7a16dc90) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2926,7 +2926,8 @@ public class NotificationPanelViewController extends PanelViewController {
		* @param x the x-coordinate the touch event
		*/
		protected void updateHorizontalPanelPosition(float x) {
		if (mNotificationStackScrollLayoutController.getWidth() * 1.75f > mView.getWidth()) {
		if (mNotificationStackScrollLayoutController.getWidth() * 1.75f > mView.getWidth()
		\|\| Utils.shouldUseSplitNotificationShade(mFeatureFlags, mResources)) {
		resetHorizontalPanelPosition();
		return;
		}

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

+19 −5

Original line number	Diff line number	Diff line
		@@ -451,9 +451,7 @@ public class NotificationPanelViewTest extends SysuiTestCase {

		@Test
		public void testAllChildrenOfNotificationContainer_haveIds() {
		when(mResources.getBoolean(R.bool.config_use_split_notification_shade)).thenReturn(true);
		when(mFeatureFlags.isTwoColumnNotificationShadeEnabled()).thenReturn(true);

		enableDualPaneShade();
		mNotificationContainerParent.addView(newViewWithId(1));
		mNotificationContainerParent.addView(newViewWithId(View.NO_ID));

		@@ -482,8 +480,7 @@ public class NotificationPanelViewTest extends SysuiTestCase {

		@Test
		public void testSplitShadeLayout_isAlignedToGuideline() {
		when(mResources.getBoolean(R.bool.config_use_split_notification_shade)).thenReturn(true);
		when(mFeatureFlags.isTwoColumnNotificationShadeEnabled()).thenReturn(true);
		enableDualPaneShade();
		mNotificationContainerParent.addView(newViewWithId(R.id.qs_frame));
		mNotificationContainerParent.addView(newViewWithId(R.id.notification_stack_scroller));

		@@ -541,6 +538,23 @@ public class NotificationPanelViewTest extends SysuiTestCase {
		return view;
		}

		@Test
		public void testOnDragDownEvent_horizontalTranslationIsZeroForDualPaneShade() {
		when(mNotificationStackScrollLayoutController.getWidth()).thenReturn(350f);
		when(mView.getWidth()).thenReturn(800);
		enableDualPaneShade();

		onTouchEvent(MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN,
		200f /* x position */, 0f, 0));

		verify(mQsFrame).setTranslationX(0);
		}

		private void enableDualPaneShade() {
		when(mResources.getBoolean(R.bool.config_use_split_notification_shade)).thenReturn(true);
		when(mFeatureFlags.isTwoColumnNotificationShadeEnabled()).thenReturn(true);
		}

		private void onTouchEvent(MotionEvent ev) {
		mTouchHandler.onTouch(mView, ev);
		}