commit | ac1d0b7089a24e7eb8d8cd80e6293f9cdf5e1f29 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 14 23:34:50 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 14 23:34:50 2022 +0000 |
tree | bc47c80e09f3167889eb20d9840aa326dc376d9e | |
parent | 726c49e77cd038c8c1fd2c45ca9e192b7b342967 [diff] | |
parent | 8c65675382020bf13961284762f0250b74dd854e [diff] |
Merge "Add flag that disables depth on overlay scroll" into tm-dev am: 8c65675382 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766312 Change-Id: Id951c79d8a00f2058f436451ca833fd61b03efef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java index 3b02599..eda0823 100644 --- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java +++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -53,6 +53,7 @@ public class DepthController implements StateHandler<LauncherState>, BaseActivity.MultiWindowModeChangedListener { + private static final boolean OVERLAY_SCROLL_ENABLED = false; public static final FloatProperty<DepthController> DEPTH = new FloatProperty<DepthController>("depth") { @Override @@ -294,6 +295,9 @@ } public void onOverlayScrollChanged(float progress) { + if (!OVERLAY_SCROLL_ENABLED) { + return; + } // Add some padding to the progress, such we don't change the depth on the last frames of // the animation. It's possible that a user flinging the feed quickly would scroll // horizontally by accident, causing the device to enter client composition unnecessarily.