Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 674e38fd authored Apr 21, 2020 by Winson Chung Committed by Android (Google) Code Review Apr 21, 2020

Merge "Disable blurs while in multiwindow mode" into ub-launcher3-rvc-dev

parents f2393f1d b330d6e6

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ public class BackgroundAppState extends OverviewState {
		}

		@Override
		public float getDepth(Context context) {
		protected float getDepthUnchecked(Context context) {
		return 1f;
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ public class OverviewState extends LauncherState {
		}

		@Override
		public float getDepth(Context context) {
		protected float getDepthUnchecked(Context context) {
		return 1f;
		}

quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ public class AllAppsState extends LauncherState {
		}

		@Override
		public float getDepth(Context context) {
		protected float getDepthUnchecked(Context context) {
		return 1f;
		}

src/com/android/launcher3/LauncherState.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

src/com/android/launcher3/states/SpringLoadedState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ public class SpringLoadedState extends LauncherState {
		}

		@Override
		public float getDepth(Context context) {
		protected float getDepthUnchecked(Context context) {
		return 0.5f;
		}