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

Commit cc4dc6b2 authored Apr 07, 2024 by Chris Li

Update EmbeddedActivityWindowInfo constructor

Update to remove the activity bounds.

Bug: 287582673
Test: pass presubmit
Flag: EXEMPT bugfix
Change-Id: I6584f67e31531305959f0e8f29f20c22150e6738

parent 2e58e2d9

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2998,11 +2998,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
	private static EmbeddedActivityWindowInfo translateActivityWindowInfo(		private static EmbeddedActivityWindowInfo translateActivityWindowInfo(
	@NonNull Activity activity, @NonNull ActivityWindowInfo activityWindowInfo) {		@NonNull Activity activity, @NonNull ActivityWindowInfo activityWindowInfo) {
	final boolean isEmbedded = activityWindowInfo.isEmbedded();		final boolean isEmbedded = activityWindowInfo.isEmbedded();
	final Rect activityBounds = new Rect(activity.getResources().getConfiguration()
	.windowConfiguration.getBounds());
	final Rect taskBounds = new Rect(activityWindowInfo.getTaskBounds());		final Rect taskBounds = new Rect(activityWindowInfo.getTaskBounds());
	final Rect activityStackBounds = new Rect(activityWindowInfo.getTaskFragmentBounds());		final Rect activityStackBounds = new Rect(activityWindowInfo.getTaskFragmentBounds());
	return new EmbeddedActivityWindowInfo(activity, isEmbedded, activityBounds, taskBounds,		return new EmbeddedActivityWindowInfo(activity, isEmbedded, taskBounds,
	activityStackBounds);		activityStackBounds);
	}		}

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1567,8 +1567,6 @@ public class SplitControllerTest {
	mSetFlagRule.enableFlags(Flags.FLAG_ACTIVITY_WINDOW_INFO_FLAG);		mSetFlagRule.enableFlags(Flags.FLAG_ACTIVITY_WINDOW_INFO_FLAG);

	final boolean isEmbedded = true;		final boolean isEmbedded = true;
	final Rect activityBounds = mActivity.getResources().getConfiguration().windowConfiguration
	.getBounds();
	final Rect taskBounds = new Rect(0, 0, 1000, 2000);		final Rect taskBounds = new Rect(0, 0, 1000, 2000);
	final Rect activityStackBounds = new Rect(0, 0, 500, 2000);		final Rect activityStackBounds = new Rect(0, 0, 500, 2000);
	doReturn(isEmbedded).when(mActivityWindowInfo).isEmbedded();		doReturn(isEmbedded).when(mActivityWindowInfo).isEmbedded();
	@@ -1576,7 +1574,7 @@ public class SplitControllerTest {
	doReturn(activityStackBounds).when(mActivityWindowInfo).getTaskFragmentBounds();		doReturn(activityStackBounds).when(mActivityWindowInfo).getTaskFragmentBounds();

	final EmbeddedActivityWindowInfo expected = new EmbeddedActivityWindowInfo(mActivity,		final EmbeddedActivityWindowInfo expected = new EmbeddedActivityWindowInfo(mActivity,
	isEmbedded, activityBounds, taskBounds, activityStackBounds);		isEmbedded, taskBounds, activityStackBounds);
	assertEquals(expected, mSplitController.getEmbeddedActivityWindowInfo(mActivity));		assertEquals(expected, mSplitController.getEmbeddedActivityWindowInfo(mActivity));
	}		}