From 4a7569b1b0695758db0d8b83daba079e79027f5e Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 17 Mar 2023 08:16:56 -0700
Subject: [PATCH] New taskbar thresholds.

Nav threshold / App window threshold / Home overview threshold / Catch up threshold
Default: 40dp / 88dp / 156dp / 264dp
sw720dp: 30dp / 100dp / 180dp / 300dp

Bug: 267646355
Test: manual
Change-Id: Ic4e99820ca44d3f1bfc12f570d003d4062e6a2cd
---
 quickstep/res/values-sw720dp/dimens.xml | 6 ++++++
 quickstep/res/values/dimens.xml         | 8 ++++----
 res/values/dimens.xml                   | 8 --------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/quickstep/res/values-sw720dp/dimens.xml b/quickstep/res/values-sw720dp/dimens.xml
index d27561ab1d..f093185d14 100644
--- a/quickstep/res/values-sw720dp/dimens.xml
+++ b/quickstep/res/values-sw720dp/dimens.xml
@@ -41,4 +41,10 @@
     <!-- Transient taskbar -->
     <dimen name="transient_taskbar_size">76dp</dimen>
     <dimen name="transient_taskbar_icon_size">52dp</dimen>
+
+    <!-- Taskbar swipe up thresholds -->
+    <dimen name="taskbar_nav_threshold">30dp</dimen>
+    <dimen name="taskbar_app_window_threshold">100dp</dimen>
+    <dimen name="taskbar_home_overview_threshold">180dp</dimen>
+    <dimen name="taskbar_catch_up_threshold">300dp</dimen>
 </resources>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 126ab7c442..9e6ee8a438 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -301,10 +301,10 @@
     <!-- An additional touch slop to prevent x-axis movement during the swipe up to show taskbar -->
     <dimen name="transient_taskbar_clamped_offset_bound">16dp</dimen>
     <!-- Taskbar swipe up thresholds -->
-    <dimen name="taskbar_nav_threshold">30dp</dimen>
-    <dimen name="taskbar_app_window_threshold">100dp</dimen>
-    <dimen name="taskbar_home_overview_threshold">180dp</dimen>
-    <dimen name="taskbar_catch_up_threshold">300dp</dimen>
+    <dimen name="taskbar_nav_threshold">40dp</dimen>
+    <dimen name="taskbar_app_window_threshold">88dp</dimen>
+    <dimen name="taskbar_home_overview_threshold">156dp</dimen>
+    <dimen name="taskbar_catch_up_threshold">264dp</dimen>
 
     <!--  Taskbar 3 button spacing  -->
     <dimen name="taskbar_button_space_inbetween">24dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index aa84d2ba92..cc7053f635 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -381,14 +381,6 @@
     <dimen name="taskbar_button_space_inbetween_phone">0dp</dimen>
     <dimen name="taskbar_button_margin_split">0dp</dimen>
     <dimen name="taskbar_button_margin_6_5">0dp</dimen>
-    <!-- Taskbar swipe up thresholds threshold -->
-    <dimen name="taskbar_nav_threshold">0dp</dimen>
-    <dimen name="taskbar_app_window_threshold">0dp</dimen>
-    <dimen name="taskbar_home_overview_threshold">0dp</dimen>
-    <dimen name="taskbar_catch_up_threshold">0dp</dimen>
-    <dimen name="taskbar_nav_threshold_v2">0dp</dimen>
-    <dimen name="taskbar_app_window_threshold_v2">0dp</dimen>
-    <dimen name="taskbar_home_overview_threshold_v2">0dp</dimen>
 
     <!-- Size of the maximum radius for the enforced rounded rectangles. -->
     <dimen name="enforced_rounded_corner_max_radius">16dp</dimen>