Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4235a949 authored by Jon Miranda's avatar Jon Miranda Committed by Automerger Merge Worker
Browse files

Merge "New taskbar thresholds." into tm-qpr-dev am: d95c511b am: 5ce4bd34 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22140107



Change-Id: I3a17fbf6d4969a2c991b30d8007bf1c33ddec8b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a479a6e3 5ce4bd34

quickstep/res/values-sw720dp/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -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>

quickstep/res/values/dimens.xml

+4 −4
Original line number Diff line number Diff line
@@ -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>

res/values/dimens.xml

+0 −8
Original line number Diff line number Diff line
@@ -389,14 +389,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>