diff --git a/quickstep/res/values-sw600dp/config.xml b/quickstep/res/values-sw600dp/config.xml index b22cfc5118..34d16955dc 100644 --- a/quickstep/res/values-sw600dp/config.xml +++ b/quickstep/res/values-sw600dp/config.xml @@ -17,4 +17,8 @@ 8 + + + 0.775 + 2400 diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml index 79a96d198c..d8aabb69ee 100644 --- a/quickstep/res/values/config.xml +++ b/quickstep/res/values/config.xml @@ -63,4 +63,12 @@ 44 + + + 0.65 + 850 + 0.8 + 2800 + 1 + 1600 diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 16b417ebe6..1d976bbf19 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -96,7 +96,7 @@ 25dp - 100dp + 72dp 72dp 1.1 diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt index 36dbe977dc..bdd3ba93aa 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt @@ -417,7 +417,7 @@ CONTAINER : StatefulContainer { breakpoints.add(minLimit) mappings.add(Mapping.Identity) breakpoints.add(Breakpoint(detachKey, detachThreshold, spring, Guarantee.None)) - mappings.add(Mapping.Linear(0.3f)) + mappings.add(Mapping.Linear(MAGNETIC_DETACH_INTERPOLATION_FRACTION)) breakpoints.add(maxLimit) return MotionSpec(DirectionalMotionSpec(breakpoints, mappings)) @@ -435,5 +435,7 @@ CONTAINER : StatefulContainer { private const val RECENTS_SCALE_FIRST_THRESHOLD_FRACTION = 0.2f private const val RECENTS_SCALE_DISMISS_THRESHOLD_FRACTION = 0.5f private const val RECENTS_SCALE_SECOND_THRESHOLD_FRACTION = 0.575f + + private const val MAGNETIC_DETACH_INTERPOLATION_FRACTION = 0.35f } } diff --git a/res/values/config.xml b/res/values/config.xml index 5c183f7606..bff1362397 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -106,14 +106,6 @@ 0.95 400 - - 0.6 - 900 - 0.8 - 3000 - 1 - 1600 - 0