From 3d72ac1a785cbf09655f6dda7782b0081365dfd1 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Mon, 21 Nov 2022 14:39:52 -0800 Subject: [PATCH] Add revised thresholds for transient taskbar behind flag ENABLE_TASKBAR_REVISED_THRESHOLDS. Bug: 260002412 Test: enable flag Change-Id: I4d82a853061b1540b6c6aea5e58b05a3ea6638e0 --- quickstep/res/values/dimens.xml | 6 +++++- quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 5 ++++- .../inputconsumers/OtherActivityInputConsumer.java | 5 ++++- .../quickstep/inputconsumers/TaskbarStashInputConsumer.java | 5 ++++- res/values/dimens.xml | 3 +++ src/com/android/launcher3/config/FeatureFlags.java | 4 ++++ 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index c0b665730d..50f123676f 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -292,10 +292,14 @@ 16dp + 40dp 150dp 225dp 300dp - 40dp + + 30dp + 100dp + 200dp 24dp diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index b0de9cef64..2b575e9e88 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -27,6 +27,7 @@ import static com.android.launcher3.PagedView.INVALID_PAGE; import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL; import static com.android.launcher3.anim.Interpolators.DEACCEL; import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2; +import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_REVISED_THRESHOLDS; import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE; @@ -345,7 +346,9 @@ public abstract class AbsSwipeUpHandler, Resources res = context.getResources(); mTaskbarAppWindowThreshold = res - .getDimensionPixelSize(R.dimen.taskbar_app_window_threshold); + .getDimensionPixelSize(ENABLE_TASKBAR_REVISED_THRESHOLDS.get() + ? R.dimen.taskbar_app_window_threshold_v2 + : R.dimen.taskbar_app_window_threshold); mTaskbarCatchUpThreshold = res.getDimensionPixelSize(R.dimen.taskbar_catch_up_threshold); mIsTransientTaskbar = DisplayController.isTransientTaskbar(mActivity); diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java index f842fd0c48..c1615d2b86 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java @@ -27,6 +27,7 @@ import static com.android.launcher3.PagedView.ACTION_MOVE_ALLOW_EASY_FLING; import static com.android.launcher3.PagedView.DEBUG_FAILED_QUICKSWITCH; import static com.android.launcher3.Utilities.EDGE_NAV_BAR; import static com.android.launcher3.Utilities.squaredHypot; +import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_REVISED_THRESHOLDS; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.TraceHelper.FLAG_CHECK_FOR_RACE_CONDITIONS; import static com.android.launcher3.util.VelocityUtils.PX_PER_MS; @@ -164,7 +165,9 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC mTaskbarAlreadyOpen = controller != null && !controller.isTaskbarStashed(); mIsTransientTaskbar = DisplayController.isTransientTaskbar(base); mTaskbarHomeOverviewThreshold = base.getResources() - .getDimensionPixelSize(R.dimen.taskbar_home_overview_threshold); + .getDimensionPixelSize(ENABLE_TASKBAR_REVISED_THRESHOLDS.get() + ? R.dimen.taskbar_home_overview_threshold_v2 + : R.dimen.taskbar_home_overview_threshold); boolean continuingPreviousGesture = mTaskAnimationManager.isRecentsAnimationRunning(); mIsDeferredDownTarget = !continuingPreviousGesture && isDeferredDownTarget; diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java index b7f2022073..3a094905bf 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java @@ -18,6 +18,7 @@ package com.android.quickstep.inputconsumers; import static android.view.MotionEvent.INVALID_POINTER_ID; import static com.android.launcher3.Utilities.squaredHypot; +import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_REVISED_THRESHOLDS; import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TOUCHING; import android.content.Context; @@ -72,7 +73,9 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { Resources res = context.getResources(); mUnstashArea = res.getDimensionPixelSize(R.dimen.taskbar_unstash_input_area); - int taskbarThreshold = res.getDimensionPixelSize(R.dimen.taskbar_nav_threshold); + int taskbarThreshold = res.getDimensionPixelSize(ENABLE_TASKBAR_REVISED_THRESHOLDS.get() + ? R.dimen.taskbar_nav_threshold_v2 + : R.dimen.taskbar_nav_threshold); int screenHeight = taskbarActivityContext.getDeviceProfile().heightPx; mTaskbarThresholdY = screenHeight - taskbarThreshold; diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 50b756362a..db604f2ba7 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -388,6 +388,9 @@ 0dp 0dp 0dp + 0dp + 0dp + 0dp 16dp diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 819463d89d..468c761b37 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -326,6 +326,10 @@ public final class FeatureFlags { "HOME_GARDENING_WORKSPACE_BUTTONS", false, "Change workspace edit buttons to reflect home gardening"); + public static final BooleanFlag ENABLE_TASKBAR_REVISED_THRESHOLDS = getDebugFlag( + "ENABLE_TASKBAR_REVISED_THRESHOLDS", false, + "Uses revised thresholds for transient taskbar."); + public static final BooleanFlag ENABLE_TRANSIENT_TASKBAR = getDebugFlag( "ENABLE_TRANSIENT_TASKBAR", false, "Enables transient taskbar.");