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

Commit 8ade327c authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da62 

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



Change-Id: I22a53c2f36b0bbceb54d6c251e71c6e6df7ce3f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6ee0503 f4c8da62

quickstep/res/values-sw600dp-land/dimens.xml

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
*/

-->

<resources>

    <!--  Overview actions  -->

    <dimen name="overview_actions_top_margin">12dp</dimen>

    <dimen name="overview_grid_side_margin">52dp</dimen>

    <dimen name="overview_page_spacing">38dp</dimen>

</resources>

quickstep/res/values-sw600dp/dimens.xml

+7 −5
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ 
<resources>

    <dimen name="navigation_key_padding">25dp</dimen>



    <!--  Task View  -->

    <dimen name="task_thumbnail_icon_size">48dp</dimen>

    <dimen name="task_thumbnail_icon_drawable_size">44dp</dimen>

    <dimen name="overview_task_margin">12dp</dimen>

    <dimen name="overview_task_margin_grid">4dp</dimen>

    <dimen name="overview_actions_button_spacing">36dp</dimen>

    <dimen name="overview_grid_side_margin">60dp</dimen>

    <dimen name="overview_grid_row_spacing">36dp</dimen>

    <dimen name="task_thumbnail_icon_drawable_size_grid">44dp</dimen>

    <dimen name="overview_task_margin_grid">12dp</dimen>

    <dimen name="overview_grid_row_spacing">28dp</dimen>

    <dimen name="overview_page_spacing">36dp</dimen>

    <dimen name="task_thumbnail_icon_drawable_size_grid">32dp</dimen>

    <dimen name="overview_grid_side_margin">64dp</dimen>

</resources>

quickstep/res/values-sw720dp-land/dimens.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

 * Copyright (c) 2022, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

*/

-->

<resources>

    <!--  Overview actions  -->

    <dimen name="overview_actions_top_margin">20dp</dimen>

</resources>

quickstep/res/values-sw720dp/dimens.xml

+5 −3
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 
*/

-->

<resources>

    <!--  Task View  -->

    <dimen name="task_thumbnail_icon_size">48dp</dimen>

    <dimen name="task_thumbnail_icon_drawable_size">44dp</dimen>

    <dimen name="overview_task_margin">16dp</dimen>

    <dimen name="task_thumbnail_icon_drawable_size_grid">44dp</dimen>

    <dimen name="overview_task_margin_grid">16dp</dimen>

    <dimen name="overview_grid_side_margin">64dp</dimen>

    <dimen name="overview_grid_row_spacing">36dp</dimen>

    <dimen name="overview_page_spacing">44dp</dimen>

    <dimen name="task_thumbnail_icon_drawable_size">44dp</dimen>

    <dimen name="task_thumbnail_icon_drawable_size_grid">44dp</dimen>

    <dimen name="overview_grid_side_margin">64dp</dimen>

</resources>

quickstep/res/values/dimens.xml

+8 −8
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
-->



<resources>

    <dimen name="task_thumbnail_icon_size">48dp</dimen>

    <dimen name="task_thumbnail_icon_drawable_size">48dp</dimen>

    <!-- For screens without rounded corners -->

    <dimen name="task_corner_radius_small">2dp</dimen>

    <!-- For Launchers that want to override the default dialog corner radius -->
@@ -32,18 +30,20 @@ 
    <dimen name="overview_proactive_row_bottom_margin">16dp</dimen>



    <dimen name="overview_minimum_next_prev_size">50dp</dimen>



    <!--  Task View  -->

    <dimen name="task_thumbnail_icon_size">48dp</dimen>

    <dimen name="task_thumbnail_icon_drawable_size">44dp</dimen>

    <dimen name="overview_task_margin">16dp</dimen>

    <dimen name="overview_task_margin_grid">0dp</dimen>

    <dimen name="overview_page_spacing">16dp</dimen>



    <item name="overview_max_scale" format="float" type="dimen">0.7</item>

    <item name="overview_modal_max_scale" format="float" type="dimen">1.1</item>



    <!-- Overrideable in overlay that provides the Overview Actions. -->

    <dimen name="overview_actions_height">48dp</dimen>

    <dimen name="overview_actions_button_spacing">32dp</dimen>

    <dimen name="overview_actions_top_margin">24dp</dimen>

    <dimen name="overview_actions_horizontal_margin">16dp</dimen>



    <dimen name="overview_page_spacing">16dp</dimen>

    <dimen name="overview_actions_height">48dp</dimen>

    <dimen name="overview_actions_button_spacing">36dp</dimen>



    <!-- These speeds are in dp/s -->

    <dimen name="max_task_dismiss_drag_velocity">2.25dp</dimen>