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

Commit d7c7eaf8 authored by Jordan Silva's avatar Jordan Silva
Browse files

Update Responsive Grid tests with aspect ratio group 

Adding aspect ratio group and updating the responsive grid tests to match the refactored classes.

Bug: 299889733
Flag: ACONFIG com.android.launcher3.enable_responsive_workspace TEAMFOOD
Test: AllAppsSpecsTest
Test: CalculatedAllAppsSpecTest
Test: HotseatSpecsTest
Test: CalculatedHotseatSpecTest
Test: WorkspaceSpecsTest
Test: CalculatedWorkspaceSpecTest
Test: ResponsiveFolderTest
Test: CalculatedFolderSpecTest
Change-Id: I918f4e28eb310bc9300fc6cc2b5b2af67d758a96
parent f2402e25

tests/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ 
        <attr name="maxAvailableSize" format="dimension" />

    </declare-styleable>



    <declare-styleable name="ResponsiveSpecGroup">

        <attr name="maxAspectRatio" format="float" />

    </declare-styleable>



    <declare-styleable name="WorkspaceSpec">

        <attr name="specType" />

        <attr name="maxAvailableSize" />

tests/res/xml/invalid_all_apps_file_case_1.xml

+18 −17
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
  ~ limitations under the License.

  -->

<allAppsSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">

    <specs launcher:maxAspectRatio="10">

        <allAppsSpec

            launcher:specType="height"

            launcher:maxAvailableSize="9999dp">
@@ -31,6 +32,6 @@ 
            <gutter launcher:matchWorkspace="true" />

            <cellSize launcher:matchWorkspace="true" />

        </allAppsSpec>



    </specs>

</allAppsSpecs>

tests/res/xml/invalid_all_apps_file_case_2.xml

+21 −20
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
  ~ limitations under the License.

  -->

<allAppsSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">

    <specs launcher:maxAspectRatio="10">

        <allAppsSpec

            launcher:specType="height"

            launcher:maxAvailableSize="9999dp">
@@ -34,5 +35,5 @@ 
            <gutter launcher:matchWorkspace="true" />

            <cellSize launcher:matchWorkspace="true" />

        </allAppsSpec>



    </specs>

</allAppsSpecs>
 
 No newline at end of file

tests/res/xml/invalid_all_apps_file_case_3.xml

+19 −18
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
  ~ limitations under the License.

  -->

<allAppsSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">

    <specs launcher:maxAspectRatio="10">

        <allAppsSpec

            launcher:specType="height"

            launcher:maxAvailableSize="9999dp">
@@ -32,6 +33,6 @@ 
            <gutter launcher:matchWorkspace="true" />

            <cellSize launcher:matchWorkspace="true" />

        </allAppsSpec>



    </specs>

</allAppsSpecs>

tests/res/xml/invalid_folders_specs_1.xml

+22 −20
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<!-- Tablet - 6x5 portrait -->

<folderSpecs xmlns:launcher="http://schemas.android.com/apk/res-auto">

    <specs launcher:maxAspectRatio="10">

        <folderSpec launcher:specType="width" launcher:maxAvailableSize="800dp">

            <!--  missing startPadding  -->

            <endPadding launcher:fixedSize="16dp" />
@@ -37,4 +38,5 @@ 
            <gutter launcher:fixedSize="16dp" />

            <cellSize launcher:fixedSize="104dp" />

        </folderSpec>

    </specs>

</folderSpecs>