| commit | 893af8e025f2a9cf8accf0c9da895b21f2f5a25b | [log] [tgz] |
|---|---|---|
| author | Android Build Prod User <android-build-prod@system.gserviceaccount.com> | Fri Aug 27 01:37:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 27 01:37:54 2021 +0000 |
| tree | d47e74e786a8fa09f8a3931ea6351cac6d8e654b | |
| parent | 4de2335e7c12d2216f117badb34e1db165518c3d [diff] | |
| parent | 8249d33b29108253dd8e07b99ba0dd2cbdca51f3 [diff] |
Merge "Don't avoid blurring overview" into sc-v2-dev am: 0664dbdab9 am: 8249d33b29 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15687143 Change-Id: Id42d2c9283869e14200e4198ebae20ea4174a091
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java index 68159fa..ab88b2b 100644 --- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java +++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -296,13 +296,10 @@ } if (supportsBlur) { - // We cannot mark the window as opaque in overview because there will be an app window - // below the launcher layer, and we need to draw it -- without blurs. - boolean isOverview = mLauncher.isInState(LauncherState.OVERVIEW); - boolean opaque = mLauncher.getScrimView().isFullyOpaque() && !isOverview; + boolean opaque = mLauncher.getScrimView().isFullyOpaque(); - int blur = opaque || isOverview || !mCrossWindowBlursEnabled - || mBlurDisabledForAppLaunch ? 0 : (int) (depth * mMaxBlurRadius); + int blur = !mCrossWindowBlursEnabled || mBlurDisabledForAppLaunch + ? 0 : (int) (depth * mMaxBlurRadius); SurfaceControl.Transaction transaction = new SurfaceControl.Transaction() .setBackgroundBlurRadius(mSurface, blur) .setOpaque(mSurface, opaque);