Merge "Initialize TvPipBoundsState.mTvPipGravity on creation" into main (4a98a8f2) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsState.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ public class TvPipBoundsState extends PipBoundsState {
		super(context, pipSizeSpecHandler, pipDisplayLayoutState);
		mContext = context;
		updateDefaultGravity();
		mTvPipGravity = mDefaultGravity;
		mPreviousCollapsedGravity = mDefaultGravity;
		mIsTvExpandedPipSupported = context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_EXPANDED_PICTURE_IN_PICTURE);

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/tv/TvPipGravityTest.java

+7 −17

Original line number	Diff line number	Diff line
		@@ -52,9 +52,8 @@ public class TvPipGravityTest extends ShellTestCase {

		@Before
		public void setUp() {
		if (!isTelevision()) {
		return;
		}
		assumeTelevision();

		MockitoAnnotations.initMocks(this);
		mPipDisplayLayoutState = new PipDisplayLayoutState(mContext);
		mPipSizeSpecHandler = new PipSizeSpecHandler(mContext, mPipDisplayLayoutState);
		@@ -100,20 +99,22 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void regularPip_defaultGravity() {
		assumeTelevision();
		checkGravity(mTvPipBoundsState.getDefaultGravity(), Gravity.RIGHT \| Gravity.BOTTOM);
		}

		@Test
		public void regularPip_defaultTvPipGravity() {
		checkGravity(mTvPipBoundsState.getTvPipGravity(), Gravity.RIGHT \| Gravity.BOTTOM);
		}

		@Test
		public void regularPip_defaultGravity_RTL() {
		assumeTelevision();
		setRTL(true);
		checkGravity(mTvPipBoundsState.getDefaultGravity(), Gravity.LEFT \| Gravity.BOTTOM);
		}

		@Test
		public void updateGravity_expand_vertical() {
		assumeTelevision();
		// Vertical expanded PiP.
		mTvPipBoundsState.setDesiredTvExpandedAspectRatio(VERTICAL_EXPANDED_ASPECT_RATIO, true);

		@@ -129,7 +130,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void updateGravity_expand_horizontal() {
		assumeTelevision();
		// Horizontal expanded PiP.
		mTvPipBoundsState.setDesiredTvExpandedAspectRatio(HORIZONTAL_EXPANDED_ASPECT_RATIO, true);

		@@ -145,7 +145,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void updateGravity_collapse() {
		assumeTelevision();
		// Vertical expansion
		mTvPipBoundsState.setDesiredTvExpandedAspectRatio(VERTICAL_EXPANDED_ASPECT_RATIO, true);
		assertGravityAfterCollapse(Gravity.CENTER_VERTICAL \| Gravity.RIGHT,
		@@ -163,7 +162,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void updateGravity_collapse_RTL() {
		assumeTelevision();
		setRTL(true);

		// Horizontal expansion
		@@ -176,7 +174,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void updateGravity_expand_collapse() {
		assumeTelevision();
		// Vertical expanded PiP.
		mTvPipBoundsState.setDesiredTvExpandedAspectRatio(VERTICAL_EXPANDED_ASPECT_RATIO, true);

		@@ -196,7 +193,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void updateGravity_expand_move_collapse() {
		assumeTelevision();
		// Vertical expanded PiP.
		mTvPipBoundsState.setDesiredTvExpandedAspectRatio(VERTICAL_EXPANDED_ASPECT_RATIO, true);
		expandMoveCollapseCheck(Gravity.TOP \| Gravity.RIGHT, KEYCODE_DPAD_LEFT,
		@@ -229,7 +225,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void updateGravity_move_regular_valid() {
		assumeTelevision();
		mTvPipBoundsState.setTvPipGravity(Gravity.BOTTOM \| Gravity.RIGHT);
		// clockwise
		moveAndCheckGravity(KEYCODE_DPAD_LEFT, Gravity.BOTTOM \| Gravity.LEFT, true);
		@@ -245,7 +240,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void updateGravity_move_expanded_valid() {
		assumeTelevision();
		mTvPipBoundsState.setTvPipExpanded(true);

		// Vertical expanded PiP.
		@@ -263,7 +257,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void updateGravity_move_regular_invalid() {
		assumeTelevision();
		int gravity = Gravity.BOTTOM \| Gravity.RIGHT;
		mTvPipBoundsState.setTvPipGravity(gravity);
		moveAndCheckGravity(KEYCODE_DPAD_DOWN, gravity, false);
		@@ -287,7 +280,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void updateGravity_move_expanded_invalid() {
		assumeTelevision();
		mTvPipBoundsState.setTvPipExpanded(true);

		// Vertical expanded PiP.
		@@ -317,7 +309,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void previousCollapsedGravity_defaultValue() {
		assumeTelevision();
		assertEquals(mTvPipBoundsState.getTvPipPreviousCollapsedGravity(),
		mTvPipBoundsState.getDefaultGravity());
		setRTL(true);
		@@ -327,7 +318,6 @@ public class TvPipGravityTest extends ShellTestCase {

		@Test
		public void previousCollapsedGravity_changes_on_RTL() {
		assumeTelevision();
		mTvPipBoundsState.setTvPipPreviousCollapsedGravity(Gravity.TOP \| Gravity.LEFT);
		setRTL(true);
		assertEquals(mTvPipBoundsState.getTvPipPreviousCollapsedGravity(),