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

Commit 30de09f0 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7977275 from 992db75d to sc-v2-release 

Change-Id: I6f7b3a2eecad0b626024b1dd08ef7cd1c26d7668
parents 6b31c328 992db75d

quickstep/res/values-sw720dp/dimens.xml

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

 * Copyright (c) 2021, 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>

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

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

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

</resources>

quickstep/res/values/dimens.xml

+5 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
    <dimen name="overview_task_margin">16dp</dimen>

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

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

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



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

    <dimen name="overview_actions_height">48dp</dimen>
@@ -51,9 +52,10 @@ 


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

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

    <dimen name="overview_grid_row_spacing_portrait">17.13dp</dimen>

    <dimen name="overview_grid_row_spacing_landscape">13.38dp</dimen>

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

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

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

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

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



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

    <dimen name="max_task_dismiss_drag_velocity">2.25dp</dimen>
@@ -61,8 +63,6 @@ 
    <dimen name="default_task_dismiss_drag_velocity_grid">1dp</dimen>

    <dimen name="default_task_dismiss_drag_velocity_grid_focus_task">5dp</dimen>



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

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

    <dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>



    <!-- The speed in dp/s at which the user needs to be scrolling in recents such that we start

quickstep/src/com/android/quickstep/BaseActivityInterface.java

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T 


            PointF taskDimension = getTaskDimension(context, dp);

            float scale = gridRect.height() / taskDimension.y;

            scale = Math.min(scale, res.getFloat(R.dimen.overview_max_scale));

            int outWidth = Math.round(scale * taskDimension.x);

            int outHeight = Math.round(scale * taskDimension.y);

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+3 −3
Original line number Diff line number Diff line
@@ -324,14 +324,14 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        if (!mLauncher.isTablet()) {

            return;

        }

        for (int i = 2; i <= 12; i++) {

        for (int i = 2; i <= 14; i++) {

            startTestActivity(i);

        }



        Overview overview = mLauncher.pressHome().switchToOverview();

        executeOnLauncher(

                launcher -> assertTrue("Don't have at least 11 tasks",

                        getTaskCount(launcher) >= 11));

                launcher -> assertTrue("Don't have at least 13 tasks",

                        getTaskCount(launcher) >= 13));



        // Test scroll the first task off screen

        overview.scrollCurrentTaskOffScreen();

res/values/dimens.xml

+4 −4
Original line number Diff line number Diff line
@@ -342,10 +342,10 @@ 
    <dimen name="overview_actions_margin_three_button">0dp</dimen>

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

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

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

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

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

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

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

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

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

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

    <dimen name="split_placeholder_size">110dp</dimen>

    <dimen name="task_menu_width_grid">200dp</dimen>