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

Merge "Fix split dim when IME shown" into sc-v2-dev

Browse Source
This commit is contained in:
Tony Huang
2021-09-24 05:39:40 +00:00
committed by Android (Google) Code Review
parent abdb320b70 13e9fc1916
commit 6bb4d07b6a
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -776,26 +776,31 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
boolean adjustSurfaceLayoutForIme(SurfaceControl.Transaction t,
SurfaceControl dividerLeash, SurfaceControl leash1, SurfaceControl leash2,
SurfaceControl dimLayer1, SurfaceControl dimLayer2) {
if (mYOffsetForIme == 0) return false;
final boolean showDim = mDimValue1 > 0.001f || mDimValue2 > 0.001f;
boolean adjusted = false;
if (mYOffsetForIme != 0) {
if (dividerLeash != null) {
mTempRect.set(mDividerBounds);
mTempRect.offset(0, mYOffsetForIme);
t.setPosition(dividerLeash, mTempRect.left, mTempRect.top);
}
if (dividerLeash != null) {
mTempRect.set(mDividerBounds);
mTempRect.set(mBounds1);
mTempRect.offset(0, mYOffsetForIme);
t.setPosition(dividerLeash, mTempRect.left, mTempRect.top);
t.setPosition(leash1, mTempRect.left, mTempRect.top);
mTempRect.set(mBounds2);
mTempRect.offset(0, mYOffsetForIme);
t.setPosition(leash2, mTempRect.left, mTempRect.top);
adjusted = true;
}
mTempRect.set(mBounds1);
mTempRect.offset(0, mYOffsetForIme);
t.setPosition(leash1, mTempRect.left, mTempRect.top);
mTempRect.set(mBounds2);
mTempRect.offset(0, mYOffsetForIme);
t.setPosition(leash2, mTempRect.left, mTempRect.top);
t.setAlpha(dimLayer1, mDimValue1).setVisibility(dimLayer1, mDimValue1 > 0.001f);
t.setAlpha(dimLayer2, mDimValue2).setVisibility(dimLayer2, mDimValue2 > 0.001f);
return true;
if (showDim) {
t.setAlpha(dimLayer1, mDimValue1).setVisibility(dimLayer1, mDimValue1 > 0.001f);
t.setAlpha(dimLayer2, mDimValue2).setVisibility(dimLayer2, mDimValue2 > 0.001f);
adjusted = true;
}
return adjusted;
}
}
}