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

Merge "Redirect shelf height requests into keep clear area registration" into udc-qpr-dev am: c24e6e0198

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

Change-Id: Ic290b610f534024e173b29d062fd1632b700e407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mateusz Cicheński
2023-07-24 18:32:01 +00:00
committed by Automerger Merge Worker
parent 9ccc2d55ee c24e6e0198
commit 1d727e732f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
View File

@@ -939,6 +939,11 @@ public class PipController implements PipTransitionController.PipTransitionCallb
* Sets both shelf visibility and its height. * Sets both shelf visibility and its height.
*/ */
private void setShelfHeight(boolean visible, int height) { private void setShelfHeight(boolean visible, int height) {
if (mEnablePipKeepClearAlgorithm) {
// turn this into Launcher keep clear area registration instead
setLauncherKeepClearAreaHeight(visible, height);
return;
}
if (!mIsKeyguardShowingOrAnimating) { if (!mIsKeyguardShowingOrAnimating) {
setShelfHeightLocked(visible, height); setShelfHeightLocked(visible, height);
} }