diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index 6da804bde8..e57e84184e 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -109,7 +109,7 @@ public class BackgroundAppState extends OverviewState { } @Override - public float getDepth(Context context) { + protected float getDepthUnchecked(Context context) { return 1f; } } diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java index 9bb424364d..e44f59fd71 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -203,7 +203,7 @@ public class OverviewState extends LauncherState { } @Override - public float getDepth(Context context) { + protected float getDepthUnchecked(Context context) { return 1f; } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java index 33f380f99f..ea71d979b8 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java @@ -87,7 +87,7 @@ public class AllAppsState extends LauncherState { } @Override - public float getDepth(Context context) { + protected float getDepthUnchecked(Context context) { return 1f; } diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index e799df7b68..54d8f0d8bc 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -285,7 +285,14 @@ public abstract class LauncherState { * * 0 means completely zoomed in, without blurs. 1 is zoomed out, with blurs. */ - public float getDepth(Context context) { + public final float getDepth(Context context) { + if (BaseDraggingActivity.fromContext(context).getDeviceProfile().isMultiWindowMode) { + return 0; + } + return getDepthUnchecked(context); + } + + protected float getDepthUnchecked(Context context) { return 0f; } diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java index 2ba624cc1b..b2ff69afc3 100644 --- a/src/com/android/launcher3/states/SpringLoadedState.java +++ b/src/com/android/launcher3/states/SpringLoadedState.java @@ -78,7 +78,7 @@ public class SpringLoadedState extends LauncherState { } @Override - public float getDepth(Context context) { + protected float getDepthUnchecked(Context context) { return 0.5f; }