diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 0d8391bc52..3846a9c30e 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -297,15 +297,11 @@ 16dp - 40dp - 150dp - 225dp + 30dp + 100dp + 180dp 300dp - 30dp - 100dp - 180dp - 24dp 40dp diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 2485ff8fa4..4f10dde699 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -27,7 +27,6 @@ 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; @@ -367,17 +366,12 @@ public abstract class AbsSwipeUpHandler, TaskbarUIController controller = mActivityInterface.getTaskbarController(); mTaskbarAlreadyOpen = controller != null && !controller.isTaskbarStashed(); mIsTaskbarAllAppsOpen = controller != null && controller.isTaskbarAllAppsOpen(); - mTaskbarAppWindowThreshold = res - .getDimensionPixelSize(ENABLE_TASKBAR_REVISED_THRESHOLDS.get() - ? R.dimen.taskbar_app_window_threshold_v2 - : R.dimen.taskbar_app_window_threshold); + mTaskbarAppWindowThreshold = + res.getDimensionPixelSize(R.dimen.taskbar_app_window_threshold); boolean swipeWillNotShowTaskbar = mTaskbarAlreadyOpen; mTaskbarHomeOverviewThreshold = swipeWillNotShowTaskbar ? 0 - : res.getDimensionPixelSize( - ENABLE_TASKBAR_REVISED_THRESHOLDS.get() - ? R.dimen.taskbar_home_overview_threshold_v2 - : R.dimen.taskbar_home_overview_threshold); + : res.getDimensionPixelSize(R.dimen.taskbar_home_overview_threshold); mTaskbarCatchUpThreshold = res.getDimensionPixelSize(R.dimen.taskbar_catch_up_threshold); } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java index 3afd0a3431..1630d0f7e2 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java @@ -18,7 +18,6 @@ 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; @@ -74,9 +73,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer { Resources res = context.getResources(); mUnstashArea = res.getDimensionPixelSize(R.dimen.taskbar_unstash_input_area); - int taskbarNavThreshold = res.getDimensionPixelSize(ENABLE_TASKBAR_REVISED_THRESHOLDS.get() - ? R.dimen.taskbar_nav_threshold_v2 - : R.dimen.taskbar_nav_threshold); + int taskbarNavThreshold = res.getDimensionPixelSize(R.dimen.taskbar_nav_threshold); int screenHeight = taskbarActivityContext.getDeviceProfile().heightPx; mTaskbarNavThresholdY = screenHeight - taskbarNavThreshold; mIsTaskbarAllAppsOpen = diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index cdf838fe9e..ff0a867641 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -338,10 +338,6 @@ public final class FeatureFlags { "ENABLE_DOWNLOAD_APP_UX_V3", false, "Updates the download app UX" + " to have better visuals, improve contrast, and color"); - public static final BooleanFlag ENABLE_TASKBAR_REVISED_THRESHOLDS = getDebugFlag( - "ENABLE_TASKBAR_REVISED_THRESHOLDS", true, - "Uses revised thresholds for transient taskbar."); - public static final BooleanFlag FORCE_PERSISTENT_TASKBAR = getDebugFlag( "FORCE_PERSISTENT_TASKBAR", false, "Forces taskbar to be persistent, even in gesture" + " nav mode and when transient taskbar is enabled.");