Merge changes from topic "presubmit-am-8e96c6381a9e4b5293842cc17f174988" into tm-mainline-prod

* changes:
  [automerge] Fix placement bug with split staging icon in RtL 2p: 43c79704ed
  Fix placement bug with split staging icon in RtL
This commit is contained in:
Jeremy Sim authored and Android (Google) Code Review committed 2022-04-10 01:48:53 +00:00
commit 70760fdf34
4 files changed
+19 -22

No files matched your search

@@ -458,29 +458,29 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
}
@Override
public void updateStagedSplitIconParams(FrameLayout.LayoutParams out, float onScreenRectCenterX,
public void updateStagedSplitIconParams(View out, float onScreenRectCenterX,
float onScreenRectCenterY, float fullscreenScaleX, float fullscreenScaleY,
int drawableWidth, int drawableHeight, DeviceProfile dp,
@StagePosition int stagePosition) {
boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT;
if (!dp.isLandscape) {
float inset = dp.getInsets().top;
out.leftMargin = Math.round(onScreenRectCenterX / fullscreenScaleX
- 1.0f * drawableWidth / 2);
out.topMargin = Math.round((onScreenRectCenterY + (inset / 2f)) / fullscreenScaleY
- 1.0f * drawableHeight / 2);
out.setX(Math.round(onScreenRectCenterX / fullscreenScaleX
- 1.0f * drawableWidth / 2));
out.setY(Math.round((onScreenRectCenterY + (inset / 2f)) / fullscreenScaleY
- 1.0f * drawableHeight / 2));
} else {
if (pinToRight) {
float inset = dp.getInsets().right;
out.leftMargin = Math.round((onScreenRectCenterX - (inset / 2f)) / fullscreenScaleX
- 1.0f * drawableWidth / 2);
out.setX(Math.round((onScreenRectCenterX - (inset / 2f)) / fullscreenScaleX
- 1.0f * drawableWidth / 2));
} else {
float inset = dp.getInsets().left;
out.leftMargin = Math.round((onScreenRectCenterX + (inset / 2f)) / fullscreenScaleX
- 1.0f * drawableWidth / 2);
out.setX(Math.round((onScreenRectCenterX + (inset / 2f)) / fullscreenScaleX
- 1.0f * drawableWidth / 2));
}
out.topMargin = Math.round(onScreenRectCenterY / fullscreenScaleY
- 1.0f * drawableHeight / 2);
out.setY(Math.round(onScreenRectCenterY / fullscreenScaleY
- 1.0f * drawableHeight / 2));
}
}