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

Commit fe5bccbf authored by Jeremy Sim's avatar Jeremy Sim Committed by Android (Google) Code Review
Browse files

Merge "Update calculation method for Overview UI placement on tablets" into tm-qpr-dev

parents f49287d6 1cfe6d49

quickstep/res/values-sw600dp/dimens.xml

+9 −2
Original line number Diff line number Diff line
@@ -14,16 +14,23 @@ 
 * limitations under the License.

*/

-->

<!-- Applies to small tablet screens -->

<resources>

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



    <!--  Task View  -->

    <!--  Overview Task Views  -->

    <!--  A touch target for icons, sometimes slightly larger than the icons themselves  -->

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

    <!--  The icon size for the focused task, placed in center of touch target  -->

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

    <!--  The space under the focused task icon  -->

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

    <!--  The icon size of all non-focused task icons, placed in center of touch target  -->

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

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

    <!--  The space between grid rows (when there's 2 rows of thumbnails)  -->

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

    <!--  The horizontal space between tasks  -->

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

    <!--  The space to the left and to the right of the "Clear all" button  -->

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

</resources>

quickstep/res/values-sw720dp/dimens.xml

+11 −2
Original line number Diff line number Diff line
@@ -14,14 +14,23 @@ 
 * limitations under the License.

*/

-->

<!-- Applies to large tablet screens -->

<resources>

    <!--  Task View  -->

    <!--  Overview Task Views  -->

    <!--  The primary task thumbnail uses up to this much of the total screen height/width  -->

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

    <!--  A touch target for icons, sometimes slightly larger than the icons themselves  -->

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

    <!--  The icon size for the focused task, placed in center of touch target  -->

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

    <!--  The space under the focused task icon  -->

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

    <!--  The icon size of all non-focused task icons, placed in center of touch target  -->

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

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

    <!--  The space between grid rows (when there's 2 rows of thumbnails)  -->

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

    <!--  The horizontal space between tasks  -->

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

    <!--  The space to the left and to the right of the "Clear all" button  -->

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

</resources>

quickstep/res/values/dimens.xml

+8 −3
Original line number Diff line number Diff line
@@ -31,14 +31,19 @@ 


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



    <!--  Task View  -->

    <!--  Overview Task Views  -->

    <!--  The primary task thumbnail uses up to this much of the total screen height/width  -->

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

    <!--  A touch target for icons, sometimes slightly larger than the icons themselves  -->

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

    <!--  The icon size for the focused task, placed in center of touch target  -->

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

    <!--  The space under the focused task icon  -->

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

    <!--  The horizontal space between tasks  -->

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

    <dimen name="task_icon_cache_default_icon_size">72dp</dimen>



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

    <dimen name="task_icon_cache_default_icon_size">72dp</dimen>

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



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

quickstep/src/com/android/quickstep/views/TaskView.java

+3 −4
Original line number Diff line number Diff line
@@ -866,10 +866,9 @@ public class TaskView extends FrameLayout implements Reusable { 


        int thumbnailTopMargin = deviceProfile.overviewTaskThumbnailTopMarginPx;

        int taskIconHeight = deviceProfile.overviewTaskIconSizePx;

        int taskMargin = isGridTask ? deviceProfile.overviewTaskMarginGridPx

                : deviceProfile.overviewTaskMarginPx;

        int taskIconMargin = thumbnailTopMargin - taskIconHeight - taskMargin;

        orientationHandler.setTaskIconParams(iconParams, taskIconMargin, taskIconHeight,

        int taskMargin = deviceProfile.overviewTaskMarginPx;



        orientationHandler.setTaskIconParams(iconParams, taskMargin, taskIconHeight,

                thumbnailTopMargin, isRtl);

        iconParams.width = iconParams.height = taskIconHeight;

        mIconView.setLayoutParams(iconParams);

quickstep/tests/src/com/android/quickstep/DeviceProfilePhone3ButtonTest.kt

+2 −7
Original line number Diff line number Diff line
@@ -339,11 +339,6 @@ class DeviceProfilePhone3ButtonTest : DeviceProfileBaseTest() { 
        assertThat(dp.overviewTaskMarginPx).isEqualTo(56)

    }



    @Test

    fun overviewTaskMarginGridPx() {

        assertThat(dp.overviewTaskMarginGridPx).isEqualTo(0)

    }



    @Test

    fun overviewTaskIconSizePx() {

        assertThat(dp.overviewTaskIconSizePx).isEqualTo(168)
@@ -361,7 +356,7 @@ class DeviceProfilePhone3ButtonTest : DeviceProfileBaseTest() { 


    @Test

    fun overviewTaskThumbnailTopMarginPx() {

        assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(280)

        assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(224)

    }



    @Test
@@ -386,7 +381,7 @@ class DeviceProfilePhone3ButtonTest : DeviceProfileBaseTest() { 


    @Test

    fun overviewRowSpacing() {

        assertThat(dp.overviewRowSpacing).isEqualTo(-112)

        assertThat(dp.overviewRowSpacing).isEqualTo(0)

    }



    @Test