Merge "Fix pauseBlur make launcher become opaque" into udc-dev am: 37d8c93893

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23011999

Change-Id: Ifd201d003836cb9305b18401fafa1e4bb4345aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2023-05-04 07:57:03 +00:00
committed by Automerger Merge Worker
@@ -75,7 +75,7 @@ public class BaseDepthController {
// marking the launcher surface as opaque. Only used in certain Launcher states.
private boolean mHasContentBehindLauncher;
/** Pause applying depth and blur, can be used when something behind the Launcher. */
/** Pause blur but allow transparent, can be used when launch something behind the Launcher. */
protected boolean mPauseBlurs;
/**
@@ -132,7 +132,7 @@ public class BaseDepthController {
return;
}
boolean hasOpaqueBg = mLauncher.getScrimView().isFullyOpaque();
boolean isSurfaceOpaque = mPauseBlurs || (!mHasContentBehindLauncher && hasOpaqueBg);
boolean isSurfaceOpaque = !mHasContentBehindLauncher && hasOpaqueBg && !mPauseBlurs;
mCurrentBlur = !mCrossWindowBlursEnabled || hasOpaqueBg || mPauseBlurs
? 0 : (int) (depth * mMaxBlurRadius);