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 am: 6bb4d07b6a

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

Change-Id: I16036ca864b5beb32f0e28bbdc983d8e3b64206f
This commit is contained in:
Tony Huang
2021-09-24 05:54:43 +00:00
committed by Automerger Merge Worker
parent e17c06935a 6bb4d07b6a
commit f0e4b775b8
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -776,8 +776,9 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
boolean adjustSurfaceLayoutForIme(SurfaceControl.Transaction t, boolean adjustSurfaceLayoutForIme(SurfaceControl.Transaction t,
SurfaceControl dividerLeash, SurfaceControl leash1, SurfaceControl leash2, SurfaceControl dividerLeash, SurfaceControl leash1, SurfaceControl leash2,
SurfaceControl dimLayer1, SurfaceControl dimLayer2) { 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) { if (dividerLeash != null) {
mTempRect.set(mDividerBounds); mTempRect.set(mDividerBounds);
mTempRect.offset(0, mYOffsetForIme); mTempRect.offset(0, mYOffsetForIme);
@@ -791,11 +792,15 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
mTempRect.set(mBounds2); mTempRect.set(mBounds2);
mTempRect.offset(0, mYOffsetForIme); mTempRect.offset(0, mYOffsetForIme);
t.setPosition(leash2, mTempRect.left, mTempRect.top); t.setPosition(leash2, mTempRect.left, mTempRect.top);
adjusted = true;
}
if (showDim) {
t.setAlpha(dimLayer1, mDimValue1).setVisibility(dimLayer1, mDimValue1 > 0.001f); t.setAlpha(dimLayer1, mDimValue1).setVisibility(dimLayer1, mDimValue1 > 0.001f);
t.setAlpha(dimLayer2, mDimValue2).setVisibility(dimLayer2, mDimValue2 > 0.001f); t.setAlpha(dimLayer2, mDimValue2).setVisibility(dimLayer2, mDimValue2 > 0.001f);
adjusted = true;
return true; }
return adjusted;
} }
} }
} }