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

Commit 0af71f85 authored by Thales Lima's avatar Thales Lima Committed by Android (Google) Code Review
Browse files

Merge "Create a DeviceProfileDumpTest for nonquickstep" into tm-qpr-dev

parents 25656568 69166dd0

res/values-land/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


    <!-- Dynamic grid -->

    <dimen name="dynamic_grid_edge_margin">15.28dp</dimen>

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

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

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

res/values-sw600dp/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


<!-- Dynamic grid -->

    <dimen name="dynamic_grid_edge_margin">9dp</dimen>

    <dimen name="dynamic_grid_icon_drawable_padding">7dp</dimen>

    <dimen name="cell_layout_padding">9dp</dimen>



<!-- Hotseat -->

res/values-sw600dp/styles.xml

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

  ~ Copyright (C) 2023 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>

    <style name="CellStyleDefault">

        <item name="iconDrawablePadding">7dp</item>

    </style>

</resources>
 
 No newline at end of file

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    <!-- Dynamic Grid -->

    <dimen name="dynamic_grid_edge_margin">10.77dp</dimen>

    <dimen name="dynamic_grid_left_right_margin">8dp</dimen>

    <dimen name="dynamic_grid_icon_drawable_padding">7dp</dimen>

    <!-- Minimum amount of next page visible in spring loaded mode -->

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

tests/src/com/android/launcher3/AbstractDeviceProfileTest.kt

+18 −0
Original line number Diff line number Diff line
@@ -93,6 +93,24 @@ abstract class AbstractDeviceProfileTest { 
                    gesturePx = 0,

                    cutoutPx = 0

                ),

            "twopanel-phone" to

                DeviceSpec(

                    Pair(1080, 2092),

                    densityDpi = 420,

                    statusBarNaturalPx = 133,

                    statusBarRotatedPx = 110,

                    gesturePx = 63,

                    cutoutPx = 133

                ),

            "twopanel-tablet" to

                DeviceSpec(

                    Pair(2208, 1840),

                    densityDpi = 420,

                    statusBarNaturalPx = 110,

                    statusBarRotatedPx = 133,

                    gesturePx = 0,

                    cutoutPx = 0

                )

        )



    protected fun initializeVarsForPhone(