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

This commit is contained in:
Mateusz Cicheński
2023-07-24 18:15:35 +00:00
committed by Android (Google) Code Review

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);
} }