Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keep split bounds after configuration update" into sc-v2-dev am: c5c1623ee2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15624356

Change-Id: I611669e34b9663e56219a909aff92383a6fdaf9d
This commit is contained in:
Tony Huang
2021-08-24 03:26:22 +00:00
committed by Automerger Merge Worker
parent bb37331b36 c5c1623ee2
commit d4c71faf1b
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
View File

@@ -93,6 +93,7 @@ public final class SplitLayout {
private final Rect mDividerBounds = new Rect(); private final Rect mDividerBounds = new Rect();
private final Rect mBounds1 = new Rect(); private final Rect mBounds1 = new Rect();
private final Rect mBounds2 = new Rect(); private final Rect mBounds2 = new Rect();
private final Rect mTmpBounds = new Rect();
private final SplitLayoutHandler mSplitLayoutHandler; private final SplitLayoutHandler mSplitLayoutHandler;
private final SplitWindowManager mSplitWindowManager; private final SplitWindowManager mSplitWindowManager;
private final DisplayImeController mDisplayImeController; private final DisplayImeController mDisplayImeController;
@@ -188,9 +189,10 @@ public final class SplitLayout {
final int rotation = configuration.windowConfiguration.getRotation(); final int rotation = configuration.windowConfiguration.getRotation();
final Rect rootBounds = configuration.windowConfiguration.getBounds(); final Rect rootBounds = configuration.windowConfiguration.getBounds();
if (rotation != mRotation || !mRootBounds.equals(rootBounds)) { if (rotation != mRotation || !mRootBounds.equals(rootBounds)) {
mTmpBounds.set(mRootBounds);
mRootBounds.set(rootBounds); mRootBounds.set(rootBounds);
mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds); mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds);
resetDividerPosition(); initDividerPosition(mTmpBounds);
affectsLayout = true; affectsLayout = true;
} }
@@ -202,6 +204,19 @@ public final class SplitLayout {
return affectsLayout; return affectsLayout;
} }
private void initDividerPosition(Rect oldBounds) {
final float snapRatio = (float) mDividePosition
/ (float) (isLandscape(oldBounds) ? oldBounds.width() : oldBounds.height());
// Estimate position by previous ratio.
final float length =
(float) (isLandscape() ? mRootBounds.width() : mRootBounds.height());
final int estimatePosition = (int) (length * snapRatio);
// Init divider position by estimated position using current bounds snap algorithm.
mDividePosition = mDividerSnapAlgorithm.calculateNonDismissingSnapTarget(
estimatePosition).position;
updateBounds(mDividePosition);
}
/** Updates recording bounds of divider window and both of the splits. */ /** Updates recording bounds of divider window and both of the splits. */
private void updateBounds(int position) { private void updateBounds(int position) {
mDividerBounds.set(mRootBounds); mDividerBounds.set(mRootBounds);