From 8e11d531e8beb31fd18e343aeed466935b8974bc Mon Sep 17 00:00:00 2001 From: Thales Lima Date: Thu, 31 Aug 2023 13:40:26 +0000 Subject: [PATCH 1/2] Add new attribute to hotseat specs Edge padding is used as the space between hotseat and the edge of the screen. In most cases it is used in a height spec, but for vertical bar, i.e. when a handheld is in landscape, it is used a width spec. Fix: 292204436 Test: CalculatedHotseatSpecTest Test: HotseatSpecsTest Test: DeviceProfileResponsiveAlternativeDisplaysDumpTest Test: DeviceProfileResponsiveDumpTest Flag: ENABLE_RESPONSIVE_WORKSPACE Change-Id: Ib75ffcdd33925ee9ef156dcb70eefd133c9b458b --- src/com/android/launcher3/DeviceProfile.java | 97 +++++++++++-------- .../launcher3/responsive/HotseatSpecs.kt | 32 ++++-- .../android/launcher3/responsive/SizeSpec.kt | 1 + 3 files changed, 82 insertions(+), 48 deletions(-) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index a48c9288d3..0a5524b3ad 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -205,9 +205,11 @@ public class DeviceProfile { public int hotseatBarEndOffset; public int hotseatQsbSpace; public int springLoadedHotseatBarTopMarginPx; - // Start is the side next to the nav bar, end is the side next to the workspace - public final int hotseatBarSidePaddingStartPx; - public final int hotseatBarSidePaddingEndPx; + // These 2 values are only used for isVerticalBar + // Padding between edge of screen and hotseat + public final int mHotseatBarEdgePaddingPx; + // Space between hotseat and workspace (not used in responsive) + public final int mHotseatBarWorkspaceSpacePx; public int hotseatQsbWidth; // only used when isQsbInline public final int hotseatQsbHeight; public final int hotseatQsbVisualHeight; @@ -497,46 +499,56 @@ public class DeviceProfile { numShownAllAppsColumns = isTwoPanels ? inv.numDatabaseAllAppsColumns : inv.numAllAppsColumns; - int hotseatBarBottomSpace = pxFromDp(inv.hotseatBarBottomSpace[mTypeIndex], mMetrics); + int hotseatBarBottomSpace; int minQsbMargin = res.getDimensionPixelSize(R.dimen.min_qsb_margin); if (mIsResponsiveGrid) { HotseatSpecs hotseatSpecs = HotseatSpecs.create(new ResourceHelper(context, isTwoPanels ? inv.hotseatSpecsTwoPanelId : inv.hotseatSpecsId)); - mResponsiveHotseatSpec = hotseatSpecs.getCalculatedHeightSpec(heightPx); + mResponsiveHotseatSpec = + isVerticalBarLayout() ? hotseatSpecs.getCalculatedWidthSpec(widthPx) + : hotseatSpecs.getCalculatedHeightSpec(heightPx); hotseatQsbSpace = mResponsiveHotseatSpec.getHotseatQsbSpace(); + hotseatBarBottomSpace = + isVerticalBarLayout() ? 0 : mResponsiveHotseatSpec.getEdgePadding(); + mHotseatBarEdgePaddingPx = + isVerticalBarLayout() ? mResponsiveHotseatSpec.getEdgePadding() : 0; + mHotseatBarWorkspaceSpacePx = 0; } else { hotseatQsbSpace = pxFromDp(inv.hotseatQsbSpace[mTypeIndex], mMetrics); + hotseatBarBottomSpace = pxFromDp(inv.hotseatBarBottomSpace[mTypeIndex], mMetrics); + mHotseatBarEdgePaddingPx = + isVerticalBarLayout() ? workspacePageIndicatorHeight : 0; + mHotseatBarWorkspaceSpacePx = + res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_side_padding); } - // Have a little space between the inset and the QSB - if (mInsets.bottom + minQsbMargin > hotseatBarBottomSpace) { - int availableSpace = hotseatQsbSpace - (mInsets.bottom - hotseatBarBottomSpace); + if (!isVerticalBarLayout()) { + // Have a little space between the inset and the QSB + if (mInsets.bottom + minQsbMargin > hotseatBarBottomSpace) { + int availableSpace = hotseatQsbSpace - (mInsets.bottom - hotseatBarBottomSpace); - // Only change the spaces if there is space - if (availableSpace > 0) { - // Make sure there is enough space between hotseat/QSB and QSB/navBar - if (availableSpace < minQsbMargin * 2) { - minQsbMargin = availableSpace / 2; - hotseatQsbSpace = minQsbMargin; - } else { - hotseatQsbSpace -= minQsbMargin; + // Only change the spaces if there is space + if (availableSpace > 0) { + // Make sure there is enough space between hotseat/QSB and QSB/navBar + if (availableSpace < minQsbMargin * 2) { + minQsbMargin = availableSpace / 2; + hotseatQsbSpace = minQsbMargin; + } else { + hotseatQsbSpace -= minQsbMargin; + } } - } - hotseatBarBottomSpacePx = mInsets.bottom + minQsbMargin; + hotseatBarBottomSpacePx = mInsets.bottom + minQsbMargin; - } else { - hotseatBarBottomSpacePx = hotseatBarBottomSpace; + } else { + hotseatBarBottomSpacePx = hotseatBarBottomSpace; + } } springLoadedHotseatBarTopMarginPx = res.getDimensionPixelSize( R.dimen.spring_loaded_hotseat_top_margin); - hotseatBarSidePaddingEndPx = - res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_side_padding); - // Add a bit of space between nav bar and hotseat in vertical bar layout. - hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? workspacePageIndicatorHeight : 0; - updateHotseatSizes(pxFromDp(inv.iconSize[INDEX_DEFAULT], mMetrics)); + updateHotseatSizes(pxFromDp(inv.iconSize[mTypeIndex], mMetrics)); if (areNavButtonsInline && !isPhone) { inlineNavButtonsEndSpacingPx = res.getDimensionPixelSize(inv.inlineNavButtonsEndSpacing); @@ -562,10 +574,9 @@ public class DeviceProfile { int availableResponsiveWidth = availableWidthPx - (isVerticalBarLayout() ? hotseatBarSizePx : 0); int numColumns = getPanelCount() * inv.numColumns; - // don't use availableHeightPx because it subtracts bottom padding, - // but the workspace go behind it - int availableResponsiveHeight = - heightPx - mInsets.top - (isVerticalBarLayout() ? 0 : hotseatBarSizePx); + // don't use availableHeightPx because it subtracts mInsets.bottom + int availableResponsiveHeight = heightPx - mInsets.top + - (isVerticalBarLayout() ? 0 : hotseatBarSizePx); mResponsiveWidthSpec = workspaceSpecs.getCalculatedWidthSpec(numColumns, availableResponsiveWidth); mResponsiveHeightSpec = workspaceSpecs.getCalculatedHeightSpec(inv.numRows, @@ -738,8 +749,8 @@ public class DeviceProfile { hotseatCellHeightPx = getIconSizeWithOverlap(hotseatIconSizePx); if (isVerticalBarLayout()) { - hotseatBarSizePx = hotseatIconSizePx + hotseatBarSidePaddingStartPx - + hotseatBarSidePaddingEndPx; + hotseatBarSizePx = hotseatIconSizePx + mHotseatBarEdgePaddingPx + + mHotseatBarWorkspaceSpacePx; } else if (isQsbInline) { hotseatBarSizePx = Math.max(hotseatIconSizePx, hotseatQsbVisualHeight) + hotseatBarBottomSpacePx; @@ -1007,6 +1018,7 @@ public class DeviceProfile { iconSizePx = mIconSizeSteps.getIconSmallerThan(cellWidthPx); } + // TODO(b/296400197): isVerticalBar shouldn't show labels anymore iconDrawablePaddingPx = getNormalizedIconDrawablePadding(); int iconTextHeight = Utilities.calculateTextHeight(iconTextSizePx); int cellContentHeight = iconSizePx + iconDrawablePaddingPx + iconTextHeight; @@ -1491,7 +1503,8 @@ public class DeviceProfile { if (isVerticalBarLayout()) { if (mIsResponsiveGrid) { padding.top = mResponsiveHeightSpec.getStartPaddingPx(); - padding.bottom = mResponsiveHeightSpec.getEndPaddingPx(); + padding.bottom = Math.max(0, + mResponsiveHeightSpec.getEndPaddingPx() - mInsets.bottom); if (isSeascape()) { padding.left = hotseatBarSizePx + mResponsiveWidthSpec.getEndPaddingPx(); padding.right = mResponsiveWidthSpec.getStartPaddingPx(); @@ -1504,9 +1517,9 @@ public class DeviceProfile { padding.bottom = edgeMarginPx; if (isSeascape()) { padding.left = hotseatBarSizePx; - padding.right = hotseatBarSidePaddingStartPx; + padding.right = mHotseatBarEdgePaddingPx; } else { - padding.left = hotseatBarSidePaddingStartPx; + padding.left = mHotseatBarEdgePaddingPx; padding.right = hotseatBarSizePx; } } @@ -1560,11 +1573,11 @@ public class DeviceProfile { + diffOverlapFactor), 0); if (isSeascape()) { - hotseatBarPadding.set(mInsets.left + hotseatBarSidePaddingStartPx, paddingTop, - hotseatBarSidePaddingEndPx, paddingBottom); + hotseatBarPadding.set(mInsets.left + mHotseatBarEdgePaddingPx, paddingTop, + mHotseatBarWorkspaceSpacePx, paddingBottom); } else { - hotseatBarPadding.set(hotseatBarSidePaddingEndPx, paddingTop, - mInsets.right + hotseatBarSidePaddingStartPx, paddingBottom); + hotseatBarPadding.set(mHotseatBarWorkspaceSpacePx, paddingTop, + mInsets.right + mHotseatBarEdgePaddingPx, paddingBottom); } } else if (isTaskbarPresent) { // Center the QSB vertically with hotseat @@ -1910,10 +1923,10 @@ public class DeviceProfile { writer.println(prefix + "\tinv.hotseatColumnSpan: " + inv.hotseatColumnSpan[mTypeIndex]); writer.println(prefix + pxToDpStr("hotseatCellHeightPx", hotseatCellHeightPx)); writer.println(prefix + pxToDpStr("hotseatBarBottomSpacePx", hotseatBarBottomSpacePx)); - writer.println(prefix + pxToDpStr("hotseatBarSidePaddingStartPx", - hotseatBarSidePaddingStartPx)); - writer.println(prefix + pxToDpStr("hotseatBarSidePaddingEndPx", - hotseatBarSidePaddingEndPx)); + writer.println(prefix + pxToDpStr("mHotseatBarEdgePaddingPx", + mHotseatBarEdgePaddingPx)); + writer.println(prefix + pxToDpStr("mHotseatBarWorkspaceSpacePx", + mHotseatBarWorkspaceSpacePx)); writer.println(prefix + pxToDpStr("hotseatBarEndOffset", hotseatBarEndOffset)); writer.println(prefix + pxToDpStr("hotseatQsbSpace", hotseatQsbSpace)); writer.println(prefix + pxToDpStr("hotseatQsbHeight", hotseatQsbHeight)); diff --git a/src/com/android/launcher3/responsive/HotseatSpecs.kt b/src/com/android/launcher3/responsive/HotseatSpecs.kt index 482508d085..d578b0874d 100644 --- a/src/com/android/launcher3/responsive/HotseatSpecs.kt +++ b/src/com/android/launcher3/responsive/HotseatSpecs.kt @@ -21,14 +21,20 @@ import android.util.Log import com.android.launcher3.R import com.android.launcher3.util.ResourceHelper -class HotseatSpecs(val specs: List) { +class HotseatSpecs(val widthSpecs: List, val heightSpecs: List) { fun getCalculatedHeightSpec(availableHeight: Int): CalculatedHotseatSpec { - val spec = specs.firstOrNull { availableHeight <= it.maxAvailableSize } + val spec = heightSpecs.firstOrNull { availableHeight <= it.maxAvailableSize } check(spec != null) { "No available height spec found within $availableHeight." } return CalculatedHotseatSpec(availableHeight, spec) } + fun getCalculatedWidthSpec(availableWidth: Int): CalculatedHotseatSpec { + val spec = widthSpecs.firstOrNull { availableWidth <= it.maxAvailableSize } + check(spec != null) { "No available width spec found within $availableWidth." } + return CalculatedHotseatSpec(availableWidth, spec) + } + companion object { private const val XML_HOTSEAT_SPEC = "hotseatSpec" @@ -36,7 +42,9 @@ class HotseatSpecs(val specs: List) { fun create(resourceHelper: ResourceHelper): HotseatSpecs { val parser = ResponsiveSpecsParser(resourceHelper) val specs = parser.parseXML(XML_HOTSEAT_SPEC, ::HotseatSpec) - return HotseatSpecs(specs.filter { it.specType == ResponsiveSpec.SpecType.HEIGHT }) + val (widthSpecs, heightSpecs) = + specs.partition { it.specType == ResponsiveSpec.SpecType.WIDTH } + return HotseatSpecs(widthSpecs, heightSpecs) } } } @@ -44,7 +52,8 @@ class HotseatSpecs(val specs: List) { data class HotseatSpec( val maxAvailableSize: Int, val specType: ResponsiveSpec.SpecType, - val hotseatQsbSpace: SizeSpec + val hotseatQsbSpace: SizeSpec, + val edgePadding: SizeSpec ) { init { @@ -63,7 +72,8 @@ data class HotseatSpec( R.styleable.ResponsiveSpec_specType, ResponsiveSpec.SpecType.HEIGHT.ordinal )], - hotseatQsbSpace = specs.getOrError(SizeSpec.XmlTags.HOTSEAT_QSB_SPACE) + hotseatQsbSpace = specs.getOrError(SizeSpec.XmlTags.HOTSEAT_QSB_SPACE), + edgePadding = specs.getOrError(SizeSpec.XmlTags.EDGE_PADDING) ) fun isValid(): Boolean { @@ -82,7 +92,10 @@ data class HotseatSpec( } private fun allSpecsAreValid(): Boolean { - return hotseatQsbSpace.isValid() && hotseatQsbSpace.onlyFixedSize() + return hotseatQsbSpace.isValid() && + hotseatQsbSpace.onlyFixedSize() && + edgePadding.isValid() && + edgePadding.onlyFixedSize() } companion object { @@ -95,13 +108,18 @@ class CalculatedHotseatSpec(val availableSpace: Int, val spec: HotseatSpec) { var hotseatQsbSpace: Int = 0 private set + var edgePadding: Int = 0 + private set + init { hotseatQsbSpace = spec.hotseatQsbSpace.getCalculatedValue(availableSpace) + edgePadding = spec.edgePadding.getCalculatedValue(availableSpace) } override fun hashCode(): Int { var result = availableSpace.hashCode() result = 31 * result + hotseatQsbSpace.hashCode() + result = 31 * result + edgePadding.hashCode() result = 31 * result + spec.hashCode() return result } @@ -110,12 +128,14 @@ class CalculatedHotseatSpec(val availableSpace: Int, val spec: HotseatSpec) { return other is CalculatedHotseatSpec && availableSpace == other.availableSpace && hotseatQsbSpace == other.hotseatQsbSpace && + edgePadding == other.edgePadding && spec == other.spec } override fun toString(): String { return "${this::class.simpleName}(" + "availableSpace=$availableSpace, hotseatQsbSpace=$hotseatQsbSpace, " + + "edgePadding=$edgePadding, " + "${spec::class.simpleName}.maxAvailableSize=${spec.maxAvailableSize}" + ")" } diff --git a/src/com/android/launcher3/responsive/SizeSpec.kt b/src/com/android/launcher3/responsive/SizeSpec.kt index c868c9f7be..2db843b791 100644 --- a/src/com/android/launcher3/responsive/SizeSpec.kt +++ b/src/com/android/launcher3/responsive/SizeSpec.kt @@ -121,6 +121,7 @@ data class SizeSpec( const val GUTTER = "gutter" const val CELL_SIZE = "cellSize" const val HOTSEAT_QSB_SPACE = "hotseatQsbSpace" + const val EDGE_PADDING = "edgePadding" } companion object { From 1f19c95d95b5ec6a7d788305b2d615e2c4d350bd Mon Sep 17 00:00:00 2001 From: Thales Lima Date: Thu, 31 Aug 2023 13:46:19 +0000 Subject: [PATCH 2/2] Create new hotseat spec tests Refactor DeviceProfileDumpTest to use files instead of inline strings. Fix: 292204436 Test: DeviceProfileDumpTest Test: CalculatedHotseatSpecTest Test: HotseatSpecsTest Flag: ENABLE_RESPONSIVE_WORKSPACE Change-Id: I5aa2891c4c68033a4dd28f84f9dd5478be17b1d8 --- .../DeviceProfileDumpTest/phonePortrait.txt | 127 ++ .../phonePortrait3Button.txt | 127 ++ .../phoneVerticalBar.txt | 127 ++ .../phoneVerticalBar3Button.txt | 127 ++ .../DeviceProfileDumpTest/tabletLandscape.txt | 127 ++ .../tabletLandscape3Button.txt | 127 ++ .../DeviceProfileDumpTest/tabletPortrait.txt | 127 ++ .../tabletPortrait3Button.txt | 127 ++ .../twoPanelLandscape.txt | 127 ++ .../twoPanelLandscape3Button.txt | 127 ++ .../twoPanelPortrait.txt | 127 ++ .../twoPanelPortrait3Button.txt | 127 ++ tests/res/xml/invalid_hotseat_file_case_1.xml | 2 + tests/res/xml/valid_hotseat_file.xml | 10 +- tests/res/xml/valid_hotseat_land_file.xml | 32 + .../nonquickstep/DeviceProfileDumpTest.kt | 1590 +---------------- .../responsive/CalculatedHotseatSpecTest.kt | 23 + .../launcher3/responsive/HotseatSpecsTest.kt | 45 +- 18 files changed, 1645 insertions(+), 1581 deletions(-) create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait3Button.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar3Button.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/tabletLandscape.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/tabletLandscape3Button.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/tabletPortrait.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/tabletPortrait3Button.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelLandscape.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelLandscape3Button.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelPortrait.txt create mode 100644 tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelPortrait3Button.txt create mode 100644 tests/res/xml/valid_hotseat_land_file.xml diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait.txt new file mode 100644 index 0000000000..b8f4c0b054 --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.625 px + isTablet:false + isPhone:true + transposeLayoutWithOrientation:true + isGestureMode:true + isLandscape:false + isMultiWindowMode:false + isTwoPanels:false + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 1080.0px (411.42856dp) + heightPx: 2400.0px (914.2857dp) + availableWidthPx: 1080.0px (411.42856dp) + availableHeightPx: 2219.0px (845.3333dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 118.0px (44.95238dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 63.0px (24.0dp) + aspectRatio:2.2222223 + isResponsiveGrid:false + isScalableGrid:false + inv.numRows: 5 + inv.numColumns: 5 + inv.numSearchContainerColumns: 5 + minCellSize: PointF(0.0, 0.0)dp + cellWidthPx: 159.0px (60.57143dp) + cellHeightPx: 229.0px (87.2381dp) + getCellSize().x: 207.0px (78.85714dp) + getCellSize().y: 383.0px (145.90475dp) + cellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp) + cellLayoutBorderSpacePx Vertical: 0.0px (0.0dp) + cellLayoutPaddingPx.left: 21.0px (8.0dp) + cellLayoutPaddingPx.top: 28.0px (10.666667dp) + cellLayoutPaddingPx.right: 21.0px (8.0dp) + cellLayoutPaddingPx.bottom: 28.0px (10.666667dp) + iconSizePx: 147.0px (56.0dp) + iconTextSizePx: 38.0px (14.476191dp) + iconDrawablePaddingPx: 12.0px (4.571429dp) + inv.numFolderRows: 4 + inv.numFolderColumns: 4 + folderCellWidthPx: 195.0px (74.28571dp) + folderCellHeightPx: 230.0px (87.61905dp) + folderChildIconSizePx: 147.0px (56.0dp) + folderChildTextSizePx: 38.0px (14.476191dp) + folderChildDrawablePaddingPx: 4.0px (1.5238096dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 21.0px (8.0dp) + folderTopPadding: 63.0px (24.0dp) + folderFooterHeight: 147.0px (56.0dp) + bottomSheetTopPadding: 146.0px (55.61905dp) + bottomSheetOpenDuration: 267 + bottomSheetCloseDuration: 267 + bottomSheetWorkspaceScale: 1.0 + bottomSheetDepth: 0.0 + allAppsShiftRange: 788.0px (300.1905dp) + allAppsTopPadding: 0.0px (0.0dp) + allAppsOpenDuration: 600 + allAppsCloseDuration: 300 + allAppsIconSizePx: 147.0px (56.0dp) + allAppsIconTextSizePx: 38.0px (14.476191dp) + allAppsIconDrawablePaddingPx: 21.0px (8.0dp) + allAppsCellHeightPx: 315.0px (120.0dp) + allAppsCellWidthPx: 189.0px (72.0dp) + allAppsBorderSpacePxX: 42.0px (16.0dp) + allAppsBorderSpacePxY: 42.0px (16.0dp) + numShownAllAppsColumns: 5 + allAppsLeftRightPadding: 0.0px (0.0dp) + allAppsLeftRightMargin: 0.0px (0.0dp) + hotseatBarSizePx: 273.0px (104.0dp) + inv.hotseatColumnSpan: 5 + hotseatCellHeightPx: 166.0px (63.238094dp) + hotseatBarBottomSpacePx: 126.0px (48.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 200.0px (76.190475dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 107.0px (40.761906dp) + getHotseatLayoutPadding(context).left: 21.0px (8.0dp) + getHotseatLayoutPadding(context).right: 21.0px (8.0dp) + numShownHotseatIcons: 5 + hotseatBorderSpace: 0.0px (0.0dp) + isQsbInline: false + hotseatQsbWidth: 0.0px (0.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:false + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp) + workspacePadding.left: 0.0px (0.0dp) + workspacePadding.top: 0.0px (0.0dp) + workspacePadding.right: 0.0px (0.0dp) + workspacePadding.bottom: 245.0px (93.333336dp) + iconScale: 1.0px (0.3809524dp) + cellScaleToFit : 1.0px (0.3809524dp) + extraSpace: 773.0px (294.4762dp) + unscaled extraSpace: 773.0px (294.4762dp) + maxEmptySpace: 0.0px (0.0dp) + workspaceTopPadding: 0.0px (0.0dp) + workspaceBottomPadding: 0.0px (0.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 63.0px (24.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 84.0px (32.0dp) + dropTargetBarSizePx: 147.0px (56.0dp) + dropTargetBarBottomMarginPx: 42.0px (16.0dp) + getCellLayoutSpringLoadShrunkTop(): 391.0px (148.95238dp) + getCellLayoutSpringLoadShrunkBottom(): 1927.0px (734.0952dp) + workspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.7781155px (0.29642496dp) + getCellLayoutHeight(): 1974.0px (752.0dp) + getCellLayoutWidth(): 1080.0px (411.42856dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait3Button.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait3Button.txt new file mode 100644 index 0000000000..a5122773d6 --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait3Button.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.625 px + isTablet:false + isPhone:true + transposeLayoutWithOrientation:true + isGestureMode:false + isLandscape:false + isMultiWindowMode:false + isTwoPanels:false + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 1080.0px (411.42856dp) + heightPx: 2400.0px (914.2857dp) + availableWidthPx: 1080.0px (411.42856dp) + availableHeightPx: 2156.0px (821.3333dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 118.0px (44.95238dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 126.0px (48.0dp) + aspectRatio:2.2222223 + isResponsiveGrid:false + isScalableGrid:false + inv.numRows: 5 + inv.numColumns: 5 + inv.numSearchContainerColumns: 5 + minCellSize: PointF(0.0, 0.0)dp + cellWidthPx: 159.0px (60.57143dp) + cellHeightPx: 229.0px (87.2381dp) + getCellSize().x: 207.0px (78.85714dp) + getCellSize().y: 379.0px (144.38095dp) + cellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp) + cellLayoutBorderSpacePx Vertical: 0.0px (0.0dp) + cellLayoutPaddingPx.left: 21.0px (8.0dp) + cellLayoutPaddingPx.top: 28.0px (10.666667dp) + cellLayoutPaddingPx.right: 21.0px (8.0dp) + cellLayoutPaddingPx.bottom: 28.0px (10.666667dp) + iconSizePx: 147.0px (56.0dp) + iconTextSizePx: 38.0px (14.476191dp) + iconDrawablePaddingPx: 12.0px (4.571429dp) + inv.numFolderRows: 4 + inv.numFolderColumns: 4 + folderCellWidthPx: 195.0px (74.28571dp) + folderCellHeightPx: 230.0px (87.61905dp) + folderChildIconSizePx: 147.0px (56.0dp) + folderChildTextSizePx: 38.0px (14.476191dp) + folderChildDrawablePaddingPx: 4.0px (1.5238096dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 21.0px (8.0dp) + folderTopPadding: 63.0px (24.0dp) + folderFooterHeight: 147.0px (56.0dp) + bottomSheetTopPadding: 146.0px (55.61905dp) + bottomSheetOpenDuration: 267 + bottomSheetCloseDuration: 267 + bottomSheetWorkspaceScale: 1.0 + bottomSheetDepth: 0.0 + allAppsShiftRange: 788.0px (300.1905dp) + allAppsTopPadding: 0.0px (0.0dp) + allAppsOpenDuration: 600 + allAppsCloseDuration: 300 + allAppsIconSizePx: 147.0px (56.0dp) + allAppsIconTextSizePx: 38.0px (14.476191dp) + allAppsIconDrawablePaddingPx: 21.0px (8.0dp) + allAppsCellHeightPx: 315.0px (120.0dp) + allAppsCellWidthPx: 189.0px (72.0dp) + allAppsBorderSpacePxX: 42.0px (16.0dp) + allAppsBorderSpacePxY: 42.0px (16.0dp) + numShownAllAppsColumns: 5 + allAppsLeftRightPadding: 0.0px (0.0dp) + allAppsLeftRightMargin: 0.0px (0.0dp) + hotseatBarSizePx: 294.0px (112.0dp) + inv.hotseatColumnSpan: 5 + hotseatCellHeightPx: 166.0px (63.238094dp) + hotseatBarBottomSpacePx: 147.0px (56.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 200.0px (76.190475dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 128.0px (48.761906dp) + getHotseatLayoutPadding(context).left: 21.0px (8.0dp) + getHotseatLayoutPadding(context).right: 21.0px (8.0dp) + numShownHotseatIcons: 5 + hotseatBorderSpace: 0.0px (0.0dp) + isQsbInline: false + hotseatQsbWidth: 0.0px (0.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:false + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp) + workspacePadding.left: 0.0px (0.0dp) + workspacePadding.top: 0.0px (0.0dp) + workspacePadding.right: 0.0px (0.0dp) + workspacePadding.bottom: 203.0px (77.333336dp) + iconScale: 1.0px (0.3809524dp) + cellScaleToFit : 1.0px (0.3809524dp) + extraSpace: 752.0px (286.4762dp) + unscaled extraSpace: 752.0px (286.4762dp) + maxEmptySpace: 0.0px (0.0dp) + workspaceTopPadding: 0.0px (0.0dp) + workspaceBottomPadding: 0.0px (0.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 126.0px (48.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 84.0px (32.0dp) + dropTargetBarSizePx: 147.0px (56.0dp) + dropTargetBarBottomMarginPx: 42.0px (16.0dp) + getCellLayoutSpringLoadShrunkTop(): 391.0px (148.95238dp) + getCellLayoutSpringLoadShrunkBottom(): 1906.0px (726.0952dp) + workspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.77572966px (0.29551607dp) + getCellLayoutHeight(): 1953.0px (744.0dp) + getCellLayoutWidth(): 1080.0px (411.42856dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar.txt new file mode 100644 index 0000000000..a3a8dc53f5 --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.625 px + isTablet:false + isPhone:true + transposeLayoutWithOrientation:true + isGestureMode:true + isLandscape:true + isMultiWindowMode:false + isTwoPanels:false + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 2400.0px (914.2857dp) + heightPx: 1080.0px (411.42856dp) + availableWidthPx: 2282.0px (869.3333dp) + availableHeightPx: 943.0px (359.2381dp) + mInsets.left: 118.0px (44.95238dp) + mInsets.top: 74.0px (28.190475dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 63.0px (24.0dp) + aspectRatio:2.2222223 + isResponsiveGrid:false + isScalableGrid:false + inv.numRows: 5 + inv.numColumns: 5 + inv.numSearchContainerColumns: 5 + minCellSize: PointF(0.0, 0.0)dp + cellWidthPx: 152.0px (57.904762dp) + cellHeightPx: 166.0px (63.238094dp) + getCellSize().x: 393.0px (149.71428dp) + getCellSize().y: 180.0px (68.57143dp) + cellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp) + cellLayoutBorderSpacePx Vertical: 0.0px (0.0dp) + cellLayoutPaddingPx.left: 53.0px (20.190475dp) + cellLayoutPaddingPx.top: 0.0px (0.0dp) + cellLayoutPaddingPx.right: 53.0px (20.190475dp) + cellLayoutPaddingPx.bottom: 40.0px (15.238095dp) + iconSizePx: 147.0px (56.0dp) + iconTextSizePx: 0.0px (0.0dp) + iconDrawablePaddingPx: 0.0px (0.0dp) + inv.numFolderRows: 4 + inv.numFolderColumns: 4 + folderCellWidthPx: 163.0px (62.095238dp) + folderCellHeightPx: 192.0px (73.14286dp) + folderChildIconSizePx: 123.0px (46.857143dp) + folderChildTextSizePx: 32.0px (12.190476dp) + folderChildDrawablePaddingPx: 3.0px (1.1428572dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 21.0px (8.0dp) + folderTopPadding: 53.0px (20.190475dp) + folderFooterHeight: 123.0px (46.857143dp) + bottomSheetTopPadding: 114.0px (43.42857dp) + bottomSheetOpenDuration: 267 + bottomSheetCloseDuration: 267 + bottomSheetWorkspaceScale: 1.0 + bottomSheetDepth: 0.0 + allAppsShiftRange: 788.0px (300.1905dp) + allAppsTopPadding: 0.0px (0.0dp) + allAppsOpenDuration: 600 + allAppsCloseDuration: 300 + allAppsIconSizePx: 147.0px (56.0dp) + allAppsIconTextSizePx: 38.0px (14.476191dp) + allAppsIconDrawablePaddingPx: 21.0px (8.0dp) + allAppsCellHeightPx: 321.0px (122.28571dp) + allAppsCellWidthPx: 189.0px (72.0dp) + allAppsBorderSpacePxX: 42.0px (16.0dp) + allAppsBorderSpacePxY: 42.0px (16.0dp) + numShownAllAppsColumns: 5 + allAppsLeftRightPadding: 0.0px (0.0dp) + allAppsLeftRightMargin: 0.0px (0.0dp) + hotseatBarSizePx: 252.0px (96.0dp) + inv.hotseatColumnSpan: 5 + hotseatCellHeightPx: 166.0px (63.238094dp) + hotseatBarBottomSpacePx: 0.0px (0.0dp) + mHotseatBarEdgePaddingPx: 63.0px (24.0dp) + mHotseatBarWorkspaceSpacePx: 42.0px (16.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 118.0px (44.95238dp) + getHotseatLayoutPadding(context).top: 64.0px (24.380953dp) + getHotseatLayoutPadding(context).bottom: 112.0px (42.666668dp) + getHotseatLayoutPadding(context).left: 42.0px (16.0dp) + getHotseatLayoutPadding(context).right: 63.0px (24.0dp) + numShownHotseatIcons: 5 + hotseatBorderSpace: 0.0px (0.0dp) + isQsbInline: false + hotseatQsbWidth: 0.0px (0.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:false + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 0.0px (0.0dp) + workspacePadding.left: 10.0px (3.8095238dp) + workspacePadding.top: 0.0px (0.0dp) + workspacePadding.right: 199.0px (75.809525dp) + workspacePadding.bottom: 0.0px (0.0dp) + iconScale: 1.0px (0.3809524dp) + cellScaleToFit : 1.0px (0.3809524dp) + extraSpace: 73.0px (27.809525dp) + unscaled extraSpace: 73.0px (27.809525dp) + maxEmptySpace: 0.0px (0.0dp) + workspaceTopPadding: 0.0px (0.0dp) + workspaceBottomPadding: 0.0px (0.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 63.0px (24.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 16.0px (6.095238dp) + dropTargetBarSizePx: 95.0px (36.190475dp) + dropTargetBarBottomMarginPx: 16.0px (6.095238dp) + getCellLayoutSpringLoadShrunkTop(): 201.0px (76.57143dp) + getCellLayoutSpringLoadShrunkBottom(): 952.0px (362.66666dp) + workspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.79639447px (0.30338836dp) + getCellLayoutHeight(): 943.0px (359.2381dp) + getCellLayoutWidth(): 2073.0px (789.7143dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar3Button.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar3Button.txt new file mode 100644 index 0000000000..55066cbd6a --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar3Button.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.625 px + isTablet:false + isPhone:true + transposeLayoutWithOrientation:true + isGestureMode:false + isLandscape:true + isMultiWindowMode:false + isTwoPanels:false + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 2400.0px (914.2857dp) + heightPx: 1080.0px (411.42856dp) + availableWidthPx: 2156.0px (821.3333dp) + availableHeightPx: 1006.0px (383.2381dp) + mInsets.left: 118.0px (44.95238dp) + mInsets.top: 74.0px (28.190475dp) + mInsets.right: 126.0px (48.0dp) + mInsets.bottom: 0.0px (0.0dp) + aspectRatio:2.2222223 + isResponsiveGrid:false + isScalableGrid:false + inv.numRows: 5 + inv.numColumns: 5 + inv.numSearchContainerColumns: 5 + minCellSize: PointF(0.0, 0.0)dp + cellWidthPx: 152.0px (57.904762dp) + cellHeightPx: 166.0px (63.238094dp) + getCellSize().x: 368.0px (140.19048dp) + getCellSize().y: 193.0px (73.52381dp) + cellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp) + cellLayoutBorderSpacePx Vertical: 0.0px (0.0dp) + cellLayoutPaddingPx.left: 53.0px (20.190475dp) + cellLayoutPaddingPx.top: 0.0px (0.0dp) + cellLayoutPaddingPx.right: 53.0px (20.190475dp) + cellLayoutPaddingPx.bottom: 40.0px (15.238095dp) + iconSizePx: 147.0px (56.0dp) + iconTextSizePx: 0.0px (0.0dp) + iconDrawablePaddingPx: 0.0px (0.0dp) + inv.numFolderRows: 4 + inv.numFolderColumns: 4 + folderCellWidthPx: 173.0px (65.90476dp) + folderCellHeightPx: 205.0px (78.09524dp) + folderChildIconSizePx: 131.0px (49.904762dp) + folderChildTextSizePx: 34.0px (12.952381dp) + folderChildDrawablePaddingPx: 4.0px (1.5238096dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 21.0px (8.0dp) + folderTopPadding: 56.0px (21.333334dp) + folderFooterHeight: 131.0px (49.904762dp) + bottomSheetTopPadding: 114.0px (43.42857dp) + bottomSheetOpenDuration: 267 + bottomSheetCloseDuration: 267 + bottomSheetWorkspaceScale: 1.0 + bottomSheetDepth: 0.0 + allAppsShiftRange: 788.0px (300.1905dp) + allAppsTopPadding: 0.0px (0.0dp) + allAppsOpenDuration: 600 + allAppsCloseDuration: 300 + allAppsIconSizePx: 147.0px (56.0dp) + allAppsIconTextSizePx: 38.0px (14.476191dp) + allAppsIconDrawablePaddingPx: 21.0px (8.0dp) + allAppsCellHeightPx: 321.0px (122.28571dp) + allAppsCellWidthPx: 189.0px (72.0dp) + allAppsBorderSpacePxX: 42.0px (16.0dp) + allAppsBorderSpacePxY: 42.0px (16.0dp) + numShownAllAppsColumns: 5 + allAppsLeftRightPadding: 0.0px (0.0dp) + allAppsLeftRightMargin: 0.0px (0.0dp) + hotseatBarSizePx: 252.0px (96.0dp) + inv.hotseatColumnSpan: 5 + hotseatCellHeightPx: 166.0px (63.238094dp) + hotseatBarBottomSpacePx: 0.0px (0.0dp) + mHotseatBarEdgePaddingPx: 63.0px (24.0dp) + mHotseatBarWorkspaceSpacePx: 42.0px (16.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 118.0px (44.95238dp) + getHotseatLayoutPadding(context).top: 64.0px (24.380953dp) + getHotseatLayoutPadding(context).bottom: 49.0px (18.666666dp) + getHotseatLayoutPadding(context).left: 42.0px (16.0dp) + getHotseatLayoutPadding(context).right: 189.0px (72.0dp) + numShownHotseatIcons: 5 + hotseatBorderSpace: 0.0px (0.0dp) + isQsbInline: false + hotseatQsbWidth: 0.0px (0.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:false + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 0.0px (0.0dp) + workspacePadding.left: 10.0px (3.8095238dp) + workspacePadding.top: 0.0px (0.0dp) + workspacePadding.right: 199.0px (75.809525dp) + workspacePadding.bottom: 0.0px (0.0dp) + iconScale: 1.0px (0.3809524dp) + cellScaleToFit : 1.0px (0.3809524dp) + extraSpace: 136.0px (51.809525dp) + unscaled extraSpace: 136.0px (51.809525dp) + maxEmptySpace: 0.0px (0.0dp) + workspaceTopPadding: 0.0px (0.0dp) + workspaceBottomPadding: 0.0px (0.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 0.0px (0.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 16.0px (6.095238dp) + dropTargetBarSizePx: 95.0px (36.190475dp) + dropTargetBarBottomMarginPx: 16.0px (6.095238dp) + getCellLayoutSpringLoadShrunkTop(): 201.0px (76.57143dp) + getCellLayoutSpringLoadShrunkBottom(): 1008.0px (384.0dp) + workspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.8021869px (0.305595dp) + getCellLayoutHeight(): 1006.0px (383.2381dp) + getCellLayoutWidth(): 1947.0px (741.7143dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/tabletLandscape.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/tabletLandscape.txt new file mode 100644 index 0000000000..6e764c232d --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/tabletLandscape.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.0 px + isTablet:true + isPhone:false + transposeLayoutWithOrientation:false + isGestureMode:true + isLandscape:true + isMultiWindowMode:false + isTwoPanels:false + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 2560.0px (1280.0dp) + heightPx: 1600.0px (800.0dp) + availableWidthPx: 2560.0px (1280.0dp) + availableHeightPx: 1496.0px (748.0dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 104.0px (52.0dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 0.0px (0.0dp) + aspectRatio:1.6 + isResponsiveGrid:false + isScalableGrid:true + inv.numRows: 5 + inv.numColumns: 6 + inv.numSearchContainerColumns: 3 + minCellSize: PointF(120.0, 104.0)dp + cellWidthPx: 240.0px (120.0dp) + cellHeightPx: 208.0px (104.0dp) + getCellSize().x: 240.0px (120.0dp) + getCellSize().y: 208.0px (104.0dp) + cellLayoutBorderSpacePx Horizontal: 128.0px (64.0dp) + cellLayoutBorderSpacePx Vertical: 32.0px (16.0dp) + cellLayoutPaddingPx.left: 59.0px (29.5dp) + cellLayoutPaddingPx.top: 25.0px (12.5dp) + cellLayoutPaddingPx.right: 59.0px (29.5dp) + cellLayoutPaddingPx.bottom: 59.0px (29.5dp) + iconSizePx: 120.0px (60.0dp) + iconTextSizePx: 28.0px (14.0dp) + iconDrawablePaddingPx: 9.0px (4.5dp) + inv.numFolderRows: 3 + inv.numFolderColumns: 3 + folderCellWidthPx: 240.0px (120.0dp) + folderCellHeightPx: 208.0px (104.0dp) + folderChildIconSizePx: 120.0px (60.0dp) + folderChildTextSizePx: 28.0px (14.0dp) + folderChildDrawablePaddingPx: 11.0px (5.5dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 0.0px (0.0dp) + folderTopPadding: 48.0px (24.0dp) + folderFooterHeight: 112.0px (56.0dp) + bottomSheetTopPadding: 104.0px (52.0dp) + bottomSheetOpenDuration: 500 + bottomSheetCloseDuration: 500 + bottomSheetWorkspaceScale: 0.97 + bottomSheetDepth: 0.0 + allAppsShiftRange: 1496.0px (748.0dp) + allAppsTopPadding: 104.0px (52.0dp) + allAppsOpenDuration: 500 + allAppsCloseDuration: 500 + allAppsIconSizePx: 120.0px (60.0dp) + allAppsIconTextSizePx: 28.0px (14.0dp) + allAppsIconDrawablePaddingPx: 9.0px (4.5dp) + allAppsCellHeightPx: 284.0px (142.0dp) + allAppsCellWidthPx: 252.0px (126.0dp) + allAppsBorderSpacePxX: 32.0px (16.0dp) + allAppsBorderSpacePxY: 32.0px (16.0dp) + numShownAllAppsColumns: 6 + allAppsLeftRightPadding: 32.0px (16.0dp) + allAppsLeftRightMargin: 412.0px (206.0dp) + hotseatBarSizePx: 200.0px (100.0dp) + inv.hotseatColumnSpan: 4 + hotseatCellHeightPx: 135.0px (67.5dp) + hotseatBarBottomSpacePx: 80.0px (40.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 128.0px (64.0dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 65.0px (32.5dp) + getHotseatLayoutPadding(context).left: 668.0px (334.0dp) + getHotseatLayoutPadding(context).right: 668.0px (334.0dp) + numShownHotseatIcons: 6 + hotseatBorderSpace: 100.0px (50.0dp) + isQsbInline: false + hotseatQsbWidth: 1224.0px (612.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:true + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 240.0px (120.0dp) + workspacePadding.left: 181.0px (90.5dp) + workspacePadding.top: 0.0px (0.0dp) + workspacePadding.right: 181.0px (90.5dp) + workspacePadding.bottom: 244.0px (122.0dp) + iconScale: 1.0px (0.5dp) + cellScaleToFit : 1.0px (0.5dp) + extraSpace: 80.0px (40.0dp) + unscaled extraSpace: 80.0px (40.0dp) + maxEmptySpace: 200.0px (100.0dp) + workspaceTopPadding: 25.0px (12.5dp) + workspaceBottomPadding: 55.0px (27.5dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 0.0px (0.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 0.0px (0.0dp) + dropTargetBarSizePx: 144.0px (72.0dp) + dropTargetBarBottomMarginPx: 64.0px (32.0dp) + getCellLayoutSpringLoadShrunkTop(): 312.0px (156.0dp) + getCellLayoutSpringLoadShrunkBottom(): 1272.0px (636.0dp) + workspaceSpringLoadedMinNextPageVisiblePx: 48.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.76677316px (0.38338658dp) + getCellLayoutHeight(): 1252.0px (626.0dp) + getCellLayoutWidth(): 2198.0px (1099.0dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/tabletLandscape3Button.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/tabletLandscape3Button.txt new file mode 100644 index 0000000000..7650082968 --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/tabletLandscape3Button.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.0 px + isTablet:true + isPhone:false + transposeLayoutWithOrientation:false + isGestureMode:false + isLandscape:true + isMultiWindowMode:false + isTwoPanels:false + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 2560.0px (1280.0dp) + heightPx: 1600.0px (800.0dp) + availableWidthPx: 2560.0px (1280.0dp) + availableHeightPx: 1496.0px (748.0dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 104.0px (52.0dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 0.0px (0.0dp) + aspectRatio:1.6 + isResponsiveGrid:false + isScalableGrid:true + inv.numRows: 5 + inv.numColumns: 6 + inv.numSearchContainerColumns: 3 + minCellSize: PointF(120.0, 104.0)dp + cellWidthPx: 240.0px (120.0dp) + cellHeightPx: 208.0px (104.0dp) + getCellSize().x: 240.0px (120.0dp) + getCellSize().y: 208.0px (104.0dp) + cellLayoutBorderSpacePx Horizontal: 128.0px (64.0dp) + cellLayoutBorderSpacePx Vertical: 32.0px (16.0dp) + cellLayoutPaddingPx.left: 59.0px (29.5dp) + cellLayoutPaddingPx.top: 25.0px (12.5dp) + cellLayoutPaddingPx.right: 59.0px (29.5dp) + cellLayoutPaddingPx.bottom: 59.0px (29.5dp) + iconSizePx: 120.0px (60.0dp) + iconTextSizePx: 28.0px (14.0dp) + iconDrawablePaddingPx: 9.0px (4.5dp) + inv.numFolderRows: 3 + inv.numFolderColumns: 3 + folderCellWidthPx: 240.0px (120.0dp) + folderCellHeightPx: 208.0px (104.0dp) + folderChildIconSizePx: 120.0px (60.0dp) + folderChildTextSizePx: 28.0px (14.0dp) + folderChildDrawablePaddingPx: 11.0px (5.5dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 0.0px (0.0dp) + folderTopPadding: 48.0px (24.0dp) + folderFooterHeight: 112.0px (56.0dp) + bottomSheetTopPadding: 104.0px (52.0dp) + bottomSheetOpenDuration: 500 + bottomSheetCloseDuration: 500 + bottomSheetWorkspaceScale: 0.97 + bottomSheetDepth: 0.0 + allAppsShiftRange: 1496.0px (748.0dp) + allAppsTopPadding: 104.0px (52.0dp) + allAppsOpenDuration: 500 + allAppsCloseDuration: 500 + allAppsIconSizePx: 120.0px (60.0dp) + allAppsIconTextSizePx: 28.0px (14.0dp) + allAppsIconDrawablePaddingPx: 9.0px (4.5dp) + allAppsCellHeightPx: 284.0px (142.0dp) + allAppsCellWidthPx: 252.0px (126.0dp) + allAppsBorderSpacePxX: 32.0px (16.0dp) + allAppsBorderSpacePxY: 32.0px (16.0dp) + numShownAllAppsColumns: 6 + allAppsLeftRightPadding: 32.0px (16.0dp) + allAppsLeftRightMargin: 412.0px (206.0dp) + hotseatBarSizePx: 200.0px (100.0dp) + inv.hotseatColumnSpan: 4 + hotseatCellHeightPx: 135.0px (67.5dp) + hotseatBarBottomSpacePx: 80.0px (40.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 128.0px (64.0dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 65.0px (32.5dp) + getHotseatLayoutPadding(context).left: 668.0px (334.0dp) + getHotseatLayoutPadding(context).right: 668.0px (334.0dp) + numShownHotseatIcons: 6 + hotseatBorderSpace: 100.0px (50.0dp) + isQsbInline: false + hotseatQsbWidth: 1224.0px (612.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:true + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 240.0px (120.0dp) + workspacePadding.left: 181.0px (90.5dp) + workspacePadding.top: 0.0px (0.0dp) + workspacePadding.right: 181.0px (90.5dp) + workspacePadding.bottom: 244.0px (122.0dp) + iconScale: 1.0px (0.5dp) + cellScaleToFit : 1.0px (0.5dp) + extraSpace: 80.0px (40.0dp) + unscaled extraSpace: 80.0px (40.0dp) + maxEmptySpace: 200.0px (100.0dp) + workspaceTopPadding: 25.0px (12.5dp) + workspaceBottomPadding: 55.0px (27.5dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 0.0px (0.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 0.0px (0.0dp) + dropTargetBarSizePx: 144.0px (72.0dp) + dropTargetBarBottomMarginPx: 64.0px (32.0dp) + getCellLayoutSpringLoadShrunkTop(): 312.0px (156.0dp) + getCellLayoutSpringLoadShrunkBottom(): 1272.0px (636.0dp) + workspaceSpringLoadedMinNextPageVisiblePx: 48.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.76677316px (0.38338658dp) + getCellLayoutHeight(): 1252.0px (626.0dp) + getCellLayoutWidth(): 2198.0px (1099.0dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/tabletPortrait.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/tabletPortrait.txt new file mode 100644 index 0000000000..2b241a1645 --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/tabletPortrait.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.0 px + isTablet:true + isPhone:false + transposeLayoutWithOrientation:false + isGestureMode:true + isLandscape:false + isMultiWindowMode:false + isTwoPanels:false + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 1600.0px (800.0dp) + heightPx: 2560.0px (1280.0dp) + availableWidthPx: 1600.0px (800.0dp) + availableHeightPx: 2456.0px (1228.0dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 104.0px (52.0dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 0.0px (0.0dp) + aspectRatio:1.6 + isResponsiveGrid:false + isScalableGrid:true + inv.numRows: 5 + inv.numColumns: 6 + inv.numSearchContainerColumns: 3 + minCellSize: PointF(102.0, 120.0)dp + cellWidthPx: 204.0px (102.0dp) + cellHeightPx: 240.0px (120.0dp) + getCellSize().x: 204.0px (102.0dp) + getCellSize().y: 240.0px (120.0dp) + cellLayoutBorderSpacePx Horizontal: 32.0px (16.0dp) + cellLayoutBorderSpacePx Vertical: 128.0px (64.0dp) + cellLayoutPaddingPx.left: 72.0px (36.0dp) + cellLayoutPaddingPx.top: 72.0px (36.0dp) + cellLayoutPaddingPx.right: 72.0px (36.0dp) + cellLayoutPaddingPx.bottom: 72.0px (36.0dp) + iconSizePx: 120.0px (60.0dp) + iconTextSizePx: 28.0px (14.0dp) + iconDrawablePaddingPx: 9.0px (4.5dp) + inv.numFolderRows: 3 + inv.numFolderColumns: 3 + folderCellWidthPx: 204.0px (102.0dp) + folderCellHeightPx: 240.0px (120.0dp) + folderChildIconSizePx: 120.0px (60.0dp) + folderChildTextSizePx: 28.0px (14.0dp) + folderChildDrawablePaddingPx: 22.0px (11.0dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 0.0px (0.0dp) + folderTopPadding: 48.0px (24.0dp) + folderFooterHeight: 112.0px (56.0dp) + bottomSheetTopPadding: 704.0px (352.0dp) + bottomSheetOpenDuration: 500 + bottomSheetCloseDuration: 500 + bottomSheetWorkspaceScale: 0.97 + bottomSheetDepth: 0.0 + allAppsShiftRange: 1810.0px (905.0dp) + allAppsTopPadding: 750.0px (375.0dp) + allAppsOpenDuration: 500 + allAppsCloseDuration: 500 + allAppsIconSizePx: 120.0px (60.0dp) + allAppsIconTextSizePx: 28.0px (14.0dp) + allAppsIconDrawablePaddingPx: 9.0px (4.5dp) + allAppsCellHeightPx: 316.0px (158.0dp) + allAppsCellWidthPx: 192.0px (96.0dp) + allAppsBorderSpacePxX: 16.0px (8.0dp) + allAppsBorderSpacePxY: 32.0px (16.0dp) + numShownAllAppsColumns: 6 + allAppsLeftRightPadding: 32.0px (16.0dp) + allAppsLeftRightMargin: 152.0px (76.0dp) + hotseatBarSizePx: 272.0px (136.0dp) + inv.hotseatColumnSpan: 6 + hotseatCellHeightPx: 135.0px (67.5dp) + hotseatBarBottomSpacePx: 152.0px (76.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 216.0px (108.0dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 137.0px (68.5dp) + getHotseatLayoutPadding(context).left: 150.0px (75.0dp) + getHotseatLayoutPadding(context).right: 150.0px (75.0dp) + numShownHotseatIcons: 6 + hotseatBorderSpace: 116.0px (58.0dp) + isQsbInline: false + hotseatQsbWidth: 1300.0px (650.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:true + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 108.0px (54.0dp) + workspacePadding.left: 36.0px (18.0dp) + workspacePadding.top: 132.0px (66.0dp) + workspacePadding.right: 36.0px (18.0dp) + workspacePadding.bottom: 468.0px (234.0dp) + iconScale: 1.0px (0.5dp) + cellScaleToFit : 1.0px (0.5dp) + extraSpace: 424.0px (212.0dp) + unscaled extraSpace: 424.0px (212.0dp) + maxEmptySpace: 19998.0px (9999.0dp) + workspaceTopPadding: 204.0px (102.0dp) + workspaceBottomPadding: 220.0px (110.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 0.0px (0.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 220.0px (110.0dp) + dropTargetBarSizePx: 144.0px (72.0dp) + dropTargetBarBottomMarginPx: 96.0px (48.0dp) + getCellLayoutSpringLoadShrunkTop(): 564.0px (282.0dp) + getCellLayoutSpringLoadShrunkBottom(): 2072.0px (1036.0dp) + workspaceSpringLoadedMinNextPageVisiblePx: 48.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.8125px (0.40625dp) + getCellLayoutHeight(): 1856.0px (928.0dp) + getCellLayoutWidth(): 1528.0px (764.0dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/tabletPortrait3Button.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/tabletPortrait3Button.txt new file mode 100644 index 0000000000..6d38d277db --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/tabletPortrait3Button.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.0 px + isTablet:true + isPhone:false + transposeLayoutWithOrientation:false + isGestureMode:false + isLandscape:false + isMultiWindowMode:false + isTwoPanels:false + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 1600.0px (800.0dp) + heightPx: 2560.0px (1280.0dp) + availableWidthPx: 1600.0px (800.0dp) + availableHeightPx: 2456.0px (1228.0dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 104.0px (52.0dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 0.0px (0.0dp) + aspectRatio:1.6 + isResponsiveGrid:false + isScalableGrid:true + inv.numRows: 5 + inv.numColumns: 6 + inv.numSearchContainerColumns: 3 + minCellSize: PointF(102.0, 120.0)dp + cellWidthPx: 204.0px (102.0dp) + cellHeightPx: 240.0px (120.0dp) + getCellSize().x: 204.0px (102.0dp) + getCellSize().y: 240.0px (120.0dp) + cellLayoutBorderSpacePx Horizontal: 32.0px (16.0dp) + cellLayoutBorderSpacePx Vertical: 128.0px (64.0dp) + cellLayoutPaddingPx.left: 72.0px (36.0dp) + cellLayoutPaddingPx.top: 72.0px (36.0dp) + cellLayoutPaddingPx.right: 72.0px (36.0dp) + cellLayoutPaddingPx.bottom: 72.0px (36.0dp) + iconSizePx: 120.0px (60.0dp) + iconTextSizePx: 28.0px (14.0dp) + iconDrawablePaddingPx: 9.0px (4.5dp) + inv.numFolderRows: 3 + inv.numFolderColumns: 3 + folderCellWidthPx: 204.0px (102.0dp) + folderCellHeightPx: 240.0px (120.0dp) + folderChildIconSizePx: 120.0px (60.0dp) + folderChildTextSizePx: 28.0px (14.0dp) + folderChildDrawablePaddingPx: 22.0px (11.0dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 0.0px (0.0dp) + folderTopPadding: 48.0px (24.0dp) + folderFooterHeight: 112.0px (56.0dp) + bottomSheetTopPadding: 704.0px (352.0dp) + bottomSheetOpenDuration: 500 + bottomSheetCloseDuration: 500 + bottomSheetWorkspaceScale: 0.97 + bottomSheetDepth: 0.0 + allAppsShiftRange: 1810.0px (905.0dp) + allAppsTopPadding: 750.0px (375.0dp) + allAppsOpenDuration: 500 + allAppsCloseDuration: 500 + allAppsIconSizePx: 120.0px (60.0dp) + allAppsIconTextSizePx: 28.0px (14.0dp) + allAppsIconDrawablePaddingPx: 9.0px (4.5dp) + allAppsCellHeightPx: 316.0px (158.0dp) + allAppsCellWidthPx: 192.0px (96.0dp) + allAppsBorderSpacePxX: 16.0px (8.0dp) + allAppsBorderSpacePxY: 32.0px (16.0dp) + numShownAllAppsColumns: 6 + allAppsLeftRightPadding: 32.0px (16.0dp) + allAppsLeftRightMargin: 152.0px (76.0dp) + hotseatBarSizePx: 272.0px (136.0dp) + inv.hotseatColumnSpan: 6 + hotseatCellHeightPx: 135.0px (67.5dp) + hotseatBarBottomSpacePx: 152.0px (76.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 216.0px (108.0dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 137.0px (68.5dp) + getHotseatLayoutPadding(context).left: 150.0px (75.0dp) + getHotseatLayoutPadding(context).right: 150.0px (75.0dp) + numShownHotseatIcons: 6 + hotseatBorderSpace: 116.0px (58.0dp) + isQsbInline: false + hotseatQsbWidth: 1300.0px (650.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:true + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 108.0px (54.0dp) + workspacePadding.left: 36.0px (18.0dp) + workspacePadding.top: 132.0px (66.0dp) + workspacePadding.right: 36.0px (18.0dp) + workspacePadding.bottom: 468.0px (234.0dp) + iconScale: 1.0px (0.5dp) + cellScaleToFit : 1.0px (0.5dp) + extraSpace: 424.0px (212.0dp) + unscaled extraSpace: 424.0px (212.0dp) + maxEmptySpace: 19998.0px (9999.0dp) + workspaceTopPadding: 204.0px (102.0dp) + workspaceBottomPadding: 220.0px (110.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 0.0px (0.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 220.0px (110.0dp) + dropTargetBarSizePx: 144.0px (72.0dp) + dropTargetBarBottomMarginPx: 96.0px (48.0dp) + getCellLayoutSpringLoadShrunkTop(): 564.0px (282.0dp) + getCellLayoutSpringLoadShrunkBottom(): 2072.0px (1036.0dp) + workspaceSpringLoadedMinNextPageVisiblePx: 48.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.8125px (0.40625dp) + getCellLayoutHeight(): 1856.0px (928.0dp) + getCellLayoutWidth(): 1528.0px (764.0dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelLandscape.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelLandscape.txt new file mode 100644 index 0000000000..5799de7638 --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelLandscape.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.625 px + isTablet:true + isPhone:false + transposeLayoutWithOrientation:false + isGestureMode:true + isLandscape:true + isMultiWindowMode:false + isTwoPanels:true + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 2208.0px (841.1429dp) + heightPx: 1840.0px (700.9524dp) + availableWidthPx: 2208.0px (841.1429dp) + availableHeightPx: 1730.0px (659.0476dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 110.0px (41.904762dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 0.0px (0.0dp) + aspectRatio:1.2 + isResponsiveGrid:false + isScalableGrid:false + inv.numRows: 4 + inv.numColumns: 4 + inv.numSearchContainerColumns: 4 + minCellSize: PointF(0.0, 0.0)dp + cellWidthPx: 154.0px (58.666668dp) + cellHeightPx: 218.0px (83.04762dp) + getCellSize().x: 270.0px (102.85714dp) + getCellSize().y: 342.0px (130.28572dp) + cellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp) + cellLayoutBorderSpacePx Vertical: 0.0px (0.0dp) + cellLayoutPaddingPx.left: 0.0px (0.0dp) + cellLayoutPaddingPx.top: 0.0px (0.0dp) + cellLayoutPaddingPx.right: 0.0px (0.0dp) + cellLayoutPaddingPx.bottom: 0.0px (0.0dp) + iconSizePx: 141.0px (53.714287dp) + iconTextSizePx: 34.0px (12.952381dp) + iconDrawablePaddingPx: 13.0px (4.952381dp) + inv.numFolderRows: 3 + inv.numFolderColumns: 4 + folderCellWidthPx: 189.0px (72.0dp) + folderCellHeightPx: 219.0px (83.42857dp) + folderChildIconSizePx: 141.0px (53.714287dp) + folderChildTextSizePx: 34.0px (12.952381dp) + folderChildDrawablePaddingPx: 5.0px (1.9047619dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 21.0px (8.0dp) + folderTopPadding: 63.0px (24.0dp) + folderFooterHeight: 147.0px (56.0dp) + bottomSheetTopPadding: 110.0px (41.904762dp) + bottomSheetOpenDuration: 500 + bottomSheetCloseDuration: 500 + bottomSheetWorkspaceScale: 0.97 + bottomSheetDepth: 1.0 + allAppsShiftRange: 1730.0px (659.0476dp) + allAppsTopPadding: 110.0px (41.904762dp) + allAppsOpenDuration: 500 + allAppsCloseDuration: 500 + allAppsIconSizePx: 141.0px (53.714287dp) + allAppsIconTextSizePx: 34.0px (12.952381dp) + allAppsIconDrawablePaddingPx: 21.0px (8.0dp) + allAppsCellHeightPx: 315.0px (120.0dp) + allAppsCellWidthPx: 183.0px (69.71429dp) + allAppsBorderSpacePxX: 42.0px (16.0dp) + allAppsBorderSpacePxY: 42.0px (16.0dp) + numShownAllAppsColumns: 8 + allAppsLeftRightPadding: 42.0px (16.0dp) + allAppsLeftRightMargin: 183.0px (69.71429dp) + hotseatBarSizePx: 267.0px (101.71429dp) + inv.hotseatColumnSpan: 4 + hotseatCellHeightPx: 159.0px (60.57143dp) + hotseatBarBottomSpacePx: 126.0px (48.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 116.0px (44.190475dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 108.0px (41.142857dp) + getHotseatLayoutPadding(context).left: 113.0px (43.04762dp) + getHotseatLayoutPadding(context).right: 113.0px (43.04762dp) + numShownHotseatIcons: 6 + hotseatBorderSpace: 0.0px (0.0dp) + isQsbInline: false + hotseatQsbWidth: 0.0px (0.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:true + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp) + workspacePadding.left: 21.0px (8.0dp) + workspacePadding.top: 30.0px (11.428572dp) + workspacePadding.right: 21.0px (8.0dp) + workspacePadding.bottom: 330.0px (125.71429dp) + iconScale: 1.0px (0.3809524dp) + cellScaleToFit : 1.0px (0.3809524dp) + extraSpace: 498.0px (189.71428dp) + unscaled extraSpace: 498.0px (189.71428dp) + maxEmptySpace: 0.0px (0.0dp) + workspaceTopPadding: 0.0px (0.0dp) + workspaceBottomPadding: 0.0px (0.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 0.0px (0.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 0.0px (0.0dp) + dropTargetBarSizePx: 147.0px (56.0dp) + dropTargetBarBottomMarginPx: 42.0px (16.0dp) + getCellLayoutSpringLoadShrunkTop(): 299.0px (113.90476dp) + getCellLayoutSpringLoadShrunkBottom(): 1457.0px (555.0476dp) + workspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.8452555px (0.32200208dp) + getCellLayoutHeight(): 1370.0px (521.9048dp) + getCellLayoutWidth(): 1083.0px (412.57144dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelLandscape3Button.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelLandscape3Button.txt new file mode 100644 index 0000000000..b4956fff28 --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelLandscape3Button.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.625 px + isTablet:true + isPhone:false + transposeLayoutWithOrientation:false + isGestureMode:false + isLandscape:true + isMultiWindowMode:false + isTwoPanels:true + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 2208.0px (841.1429dp) + heightPx: 1840.0px (700.9524dp) + availableWidthPx: 2208.0px (841.1429dp) + availableHeightPx: 1730.0px (659.0476dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 110.0px (41.904762dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 0.0px (0.0dp) + aspectRatio:1.2 + isResponsiveGrid:false + isScalableGrid:false + inv.numRows: 4 + inv.numColumns: 4 + inv.numSearchContainerColumns: 4 + minCellSize: PointF(0.0, 0.0)dp + cellWidthPx: 154.0px (58.666668dp) + cellHeightPx: 218.0px (83.04762dp) + getCellSize().x: 270.0px (102.85714dp) + getCellSize().y: 342.0px (130.28572dp) + cellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp) + cellLayoutBorderSpacePx Vertical: 0.0px (0.0dp) + cellLayoutPaddingPx.left: 0.0px (0.0dp) + cellLayoutPaddingPx.top: 0.0px (0.0dp) + cellLayoutPaddingPx.right: 0.0px (0.0dp) + cellLayoutPaddingPx.bottom: 0.0px (0.0dp) + iconSizePx: 141.0px (53.714287dp) + iconTextSizePx: 34.0px (12.952381dp) + iconDrawablePaddingPx: 13.0px (4.952381dp) + inv.numFolderRows: 3 + inv.numFolderColumns: 4 + folderCellWidthPx: 189.0px (72.0dp) + folderCellHeightPx: 219.0px (83.42857dp) + folderChildIconSizePx: 141.0px (53.714287dp) + folderChildTextSizePx: 34.0px (12.952381dp) + folderChildDrawablePaddingPx: 5.0px (1.9047619dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 21.0px (8.0dp) + folderTopPadding: 63.0px (24.0dp) + folderFooterHeight: 147.0px (56.0dp) + bottomSheetTopPadding: 110.0px (41.904762dp) + bottomSheetOpenDuration: 500 + bottomSheetCloseDuration: 500 + bottomSheetWorkspaceScale: 0.97 + bottomSheetDepth: 1.0 + allAppsShiftRange: 1730.0px (659.0476dp) + allAppsTopPadding: 110.0px (41.904762dp) + allAppsOpenDuration: 500 + allAppsCloseDuration: 500 + allAppsIconSizePx: 141.0px (53.714287dp) + allAppsIconTextSizePx: 34.0px (12.952381dp) + allAppsIconDrawablePaddingPx: 21.0px (8.0dp) + allAppsCellHeightPx: 315.0px (120.0dp) + allAppsCellWidthPx: 183.0px (69.71429dp) + allAppsBorderSpacePxX: 42.0px (16.0dp) + allAppsBorderSpacePxY: 42.0px (16.0dp) + numShownAllAppsColumns: 8 + allAppsLeftRightPadding: 42.0px (16.0dp) + allAppsLeftRightMargin: 183.0px (69.71429dp) + hotseatBarSizePx: 267.0px (101.71429dp) + inv.hotseatColumnSpan: 4 + hotseatCellHeightPx: 159.0px (60.57143dp) + hotseatBarBottomSpacePx: 126.0px (48.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 116.0px (44.190475dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 108.0px (41.142857dp) + getHotseatLayoutPadding(context).left: 113.0px (43.04762dp) + getHotseatLayoutPadding(context).right: 113.0px (43.04762dp) + numShownHotseatIcons: 6 + hotseatBorderSpace: 0.0px (0.0dp) + isQsbInline: false + hotseatQsbWidth: 0.0px (0.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:true + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp) + workspacePadding.left: 21.0px (8.0dp) + workspacePadding.top: 30.0px (11.428572dp) + workspacePadding.right: 21.0px (8.0dp) + workspacePadding.bottom: 330.0px (125.71429dp) + iconScale: 1.0px (0.3809524dp) + cellScaleToFit : 1.0px (0.3809524dp) + extraSpace: 498.0px (189.71428dp) + unscaled extraSpace: 498.0px (189.71428dp) + maxEmptySpace: 0.0px (0.0dp) + workspaceTopPadding: 0.0px (0.0dp) + workspaceBottomPadding: 0.0px (0.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 0.0px (0.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 0.0px (0.0dp) + dropTargetBarSizePx: 147.0px (56.0dp) + dropTargetBarBottomMarginPx: 42.0px (16.0dp) + getCellLayoutSpringLoadShrunkTop(): 299.0px (113.90476dp) + getCellLayoutSpringLoadShrunkBottom(): 1457.0px (555.0476dp) + workspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.8452555px (0.32200208dp) + getCellLayoutHeight(): 1370.0px (521.9048dp) + getCellLayoutWidth(): 1083.0px (412.57144dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelPortrait.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelPortrait.txt new file mode 100644 index 0000000000..15afb61481 --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelPortrait.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.625 px + isTablet:true + isPhone:false + transposeLayoutWithOrientation:false + isGestureMode:true + isLandscape:false + isMultiWindowMode:false + isTwoPanels:true + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 1840.0px (700.9524dp) + heightPx: 2208.0px (841.1429dp) + availableWidthPx: 1840.0px (700.9524dp) + availableHeightPx: 2075.0px (790.4762dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 133.0px (50.666668dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 0.0px (0.0dp) + aspectRatio:1.2 + isResponsiveGrid:false + isScalableGrid:false + inv.numRows: 4 + inv.numColumns: 4 + inv.numSearchContainerColumns: 4 + minCellSize: PointF(0.0, 0.0)dp + cellWidthPx: 154.0px (58.666668dp) + cellHeightPx: 218.0px (83.04762dp) + getCellSize().x: 224.0px (85.333336dp) + getCellSize().y: 430.0px (163.80952dp) + cellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp) + cellLayoutBorderSpacePx Vertical: 0.0px (0.0dp) + cellLayoutPaddingPx.left: 0.0px (0.0dp) + cellLayoutPaddingPx.top: 0.0px (0.0dp) + cellLayoutPaddingPx.right: 0.0px (0.0dp) + cellLayoutPaddingPx.bottom: 0.0px (0.0dp) + iconSizePx: 141.0px (53.714287dp) + iconTextSizePx: 34.0px (12.952381dp) + iconDrawablePaddingPx: 13.0px (4.952381dp) + inv.numFolderRows: 3 + inv.numFolderColumns: 4 + folderCellWidthPx: 189.0px (72.0dp) + folderCellHeightPx: 219.0px (83.42857dp) + folderChildIconSizePx: 141.0px (53.714287dp) + folderChildTextSizePx: 34.0px (12.952381dp) + folderChildDrawablePaddingPx: 5.0px (1.9047619dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 21.0px (8.0dp) + folderTopPadding: 63.0px (24.0dp) + folderFooterHeight: 147.0px (56.0dp) + bottomSheetTopPadding: 133.0px (50.666668dp) + bottomSheetOpenDuration: 500 + bottomSheetCloseDuration: 500 + bottomSheetWorkspaceScale: 0.97 + bottomSheetDepth: 1.0 + allAppsShiftRange: 1826.0px (695.619dp) + allAppsTopPadding: 382.0px (145.5238dp) + allAppsOpenDuration: 500 + allAppsCloseDuration: 500 + allAppsIconSizePx: 141.0px (53.714287dp) + allAppsIconTextSizePx: 34.0px (12.952381dp) + allAppsIconDrawablePaddingPx: 21.0px (8.0dp) + allAppsCellHeightPx: 315.0px (120.0dp) + allAppsCellWidthPx: 183.0px (69.71429dp) + allAppsBorderSpacePxX: 42.0px (16.0dp) + allAppsBorderSpacePxY: 42.0px (16.0dp) + numShownAllAppsColumns: 8 + allAppsLeftRightPadding: 42.0px (16.0dp) + allAppsLeftRightMargin: 1.0px (0.3809524dp) + hotseatBarSizePx: 267.0px (101.71429dp) + inv.hotseatColumnSpan: 4 + hotseatCellHeightPx: 159.0px (60.57143dp) + hotseatBarBottomSpacePx: 126.0px (48.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 171.0px (65.14286dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 108.0px (41.142857dp) + getHotseatLayoutPadding(context).left: 98.0px (37.333332dp) + getHotseatLayoutPadding(context).right: 98.0px (37.333332dp) + numShownHotseatIcons: 6 + hotseatBorderSpace: 0.0px (0.0dp) + isQsbInline: false + hotseatQsbWidth: 0.0px (0.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:true + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp) + workspacePadding.left: 21.0px (8.0dp) + workspacePadding.top: 24.0px (9.142858dp) + workspacePadding.right: 21.0px (8.0dp) + workspacePadding.bottom: 330.0px (125.71429dp) + iconScale: 1.0px (0.3809524dp) + cellScaleToFit : 1.0px (0.3809524dp) + extraSpace: 849.0px (323.42856dp) + unscaled extraSpace: 849.0px (323.42856dp) + maxEmptySpace: 0.0px (0.0dp) + workspaceTopPadding: 0.0px (0.0dp) + workspaceBottomPadding: 0.0px (0.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 0.0px (0.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 168.0px (64.0dp) + dropTargetBarSizePx: 147.0px (56.0dp) + dropTargetBarBottomMarginPx: 42.0px (16.0dp) + getCellLayoutSpringLoadShrunkTop(): 490.0px (186.66667dp) + getCellLayoutSpringLoadShrunkBottom(): 1770.0px (674.2857dp) + workspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.7437536px (0.2833347dp) + getCellLayoutHeight(): 1721.0px (655.619dp) + getCellLayoutWidth(): 899.0px (342.4762dp) diff --git a/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelPortrait3Button.txt b/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelPortrait3Button.txt new file mode 100644 index 0000000000..6cbed1fb93 --- /dev/null +++ b/tests/assets/dumpTests/DeviceProfileDumpTest/twoPanelPortrait3Button.txt @@ -0,0 +1,127 @@ +DeviceProfile: + 1 dp = 2.625 px + isTablet:true + isPhone:false + transposeLayoutWithOrientation:false + isGestureMode:false + isLandscape:false + isMultiWindowMode:false + isTwoPanels:true + windowX: 0.0px (0.0dp) + windowY: 0.0px (0.0dp) + widthPx: 1840.0px (700.9524dp) + heightPx: 2208.0px (841.1429dp) + availableWidthPx: 1840.0px (700.9524dp) + availableHeightPx: 2075.0px (790.4762dp) + mInsets.left: 0.0px (0.0dp) + mInsets.top: 133.0px (50.666668dp) + mInsets.right: 0.0px (0.0dp) + mInsets.bottom: 0.0px (0.0dp) + aspectRatio:1.2 + isResponsiveGrid:false + isScalableGrid:false + inv.numRows: 4 + inv.numColumns: 4 + inv.numSearchContainerColumns: 4 + minCellSize: PointF(0.0, 0.0)dp + cellWidthPx: 154.0px (58.666668dp) + cellHeightPx: 218.0px (83.04762dp) + getCellSize().x: 224.0px (85.333336dp) + getCellSize().y: 430.0px (163.80952dp) + cellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp) + cellLayoutBorderSpacePx Vertical: 0.0px (0.0dp) + cellLayoutPaddingPx.left: 0.0px (0.0dp) + cellLayoutPaddingPx.top: 0.0px (0.0dp) + cellLayoutPaddingPx.right: 0.0px (0.0dp) + cellLayoutPaddingPx.bottom: 0.0px (0.0dp) + iconSizePx: 141.0px (53.714287dp) + iconTextSizePx: 34.0px (12.952381dp) + iconDrawablePaddingPx: 13.0px (4.952381dp) + inv.numFolderRows: 3 + inv.numFolderColumns: 4 + folderCellWidthPx: 189.0px (72.0dp) + folderCellHeightPx: 219.0px (83.42857dp) + folderChildIconSizePx: 141.0px (53.714287dp) + folderChildTextSizePx: 34.0px (12.952381dp) + folderChildDrawablePaddingPx: 5.0px (1.9047619dp) + folderCellLayoutBorderSpacePx.x: 0.0px (0.0dp) + folderCellLayoutBorderSpacePx.y: 0.0px (0.0dp) + folderContentPaddingLeftRight: 21.0px (8.0dp) + folderTopPadding: 63.0px (24.0dp) + folderFooterHeight: 147.0px (56.0dp) + bottomSheetTopPadding: 133.0px (50.666668dp) + bottomSheetOpenDuration: 500 + bottomSheetCloseDuration: 500 + bottomSheetWorkspaceScale: 0.97 + bottomSheetDepth: 1.0 + allAppsShiftRange: 1826.0px (695.619dp) + allAppsTopPadding: 382.0px (145.5238dp) + allAppsOpenDuration: 500 + allAppsCloseDuration: 500 + allAppsIconSizePx: 141.0px (53.714287dp) + allAppsIconTextSizePx: 34.0px (12.952381dp) + allAppsIconDrawablePaddingPx: 21.0px (8.0dp) + allAppsCellHeightPx: 315.0px (120.0dp) + allAppsCellWidthPx: 183.0px (69.71429dp) + allAppsBorderSpacePxX: 42.0px (16.0dp) + allAppsBorderSpacePxY: 42.0px (16.0dp) + numShownAllAppsColumns: 8 + allAppsLeftRightPadding: 42.0px (16.0dp) + allAppsLeftRightMargin: 1.0px (0.3809524dp) + hotseatBarSizePx: 267.0px (101.71429dp) + inv.hotseatColumnSpan: 4 + hotseatCellHeightPx: 159.0px (60.57143dp) + hotseatBarBottomSpacePx: 126.0px (48.0dp) + mHotseatBarEdgePaddingPx: 0.0px (0.0dp) + mHotseatBarWorkspaceSpacePx: 0.0px (0.0dp) + hotseatBarEndOffset: 0.0px (0.0dp) + hotseatQsbSpace: 0.0px (0.0dp) + hotseatQsbHeight: 0.0px (0.0dp) + springLoadedHotseatBarTopMarginPx: 171.0px (65.14286dp) + getHotseatLayoutPadding(context).top: 0.0px (0.0dp) + getHotseatLayoutPadding(context).bottom: 108.0px (41.142857dp) + getHotseatLayoutPadding(context).left: 98.0px (37.333332dp) + getHotseatLayoutPadding(context).right: 98.0px (37.333332dp) + numShownHotseatIcons: 6 + hotseatBorderSpace: 0.0px (0.0dp) + isQsbInline: false + hotseatQsbWidth: 0.0px (0.0dp) + isTaskbarPresent:false + isTaskbarPresentInApps:true + taskbarHeight: 0.0px (0.0dp) + stashedTaskbarHeight: 0.0px (0.0dp) + taskbarBottomMargin: 0.0px (0.0dp) + taskbarIconSize: 0.0px (0.0dp) + desiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp) + workspacePadding.left: 21.0px (8.0dp) + workspacePadding.top: 24.0px (9.142858dp) + workspacePadding.right: 21.0px (8.0dp) + workspacePadding.bottom: 330.0px (125.71429dp) + iconScale: 1.0px (0.3809524dp) + cellScaleToFit : 1.0px (0.3809524dp) + extraSpace: 849.0px (323.42856dp) + unscaled extraSpace: 849.0px (323.42856dp) + maxEmptySpace: 0.0px (0.0dp) + workspaceTopPadding: 0.0px (0.0dp) + workspaceBottomPadding: 0.0px (0.0dp) + overviewTaskMarginPx: 0.0px (0.0dp) + overviewTaskIconSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizePx: 0.0px (0.0dp) + overviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp) + overviewTaskThumbnailTopMarginPx: 0.0px (0.0dp) + overviewActionsTopMarginPx: 0.0px (0.0dp) + overviewActionsHeight: 0.0px (0.0dp) + overviewActionsClaimedSpaceBelow: 0.0px (0.0dp) + overviewActionsButtonSpacing: 0.0px (0.0dp) + overviewPageSpacing: 0.0px (0.0dp) + overviewRowSpacing: 0.0px (0.0dp) + overviewGridSideMargin: 0.0px (0.0dp) + dropTargetBarTopMarginPx: 168.0px (64.0dp) + dropTargetBarSizePx: 147.0px (56.0dp) + dropTargetBarBottomMarginPx: 42.0px (16.0dp) + getCellLayoutSpringLoadShrunkTop(): 490.0px (186.66667dp) + getCellLayoutSpringLoadShrunkBottom(): 1770.0px (674.2857dp) + workspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp) + getWorkspaceSpringLoadScale(): 0.7437536px (0.2833347dp) + getCellLayoutHeight(): 1721.0px (655.619dp) + getCellLayoutWidth(): 899.0px (342.4762dp) diff --git a/tests/res/xml/invalid_hotseat_file_case_1.xml b/tests/res/xml/invalid_hotseat_file_case_1.xml index fcbc5ead8d..aaaf8bbddc 100644 --- a/tests/res/xml/invalid_hotseat_file_case_1.xml +++ b/tests/res/xml/invalid_hotseat_file_case_1.xml @@ -19,12 +19,14 @@ launcher:specType="height" launcher:maxAvailableSize="847dp"> + + \ No newline at end of file diff --git a/tests/res/xml/valid_hotseat_file.xml b/tests/res/xml/valid_hotseat_file.xml index c7f52e82c2..f698bd14ae 100644 --- a/tests/res/xml/valid_hotseat_file.xml +++ b/tests/res/xml/valid_hotseat_file.xml @@ -16,15 +16,17 @@ + launcher:maxAvailableSize="847dp" + launcher:specType="height"> + + launcher:maxAvailableSize="9999dp" + launcher:specType="height"> + \ No newline at end of file diff --git a/tests/res/xml/valid_hotseat_land_file.xml b/tests/res/xml/valid_hotseat_land_file.xml new file mode 100644 index 0000000000..fc4a836c51 --- /dev/null +++ b/tests/res/xml/valid_hotseat_land_file.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt b/tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt index 270672f209..9b67310314 100644 --- a/tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt +++ b/tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt @@ -15,14 +15,14 @@ */ package com.android.launcher3.nonquickstep +import android.content.Context import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import androidx.test.platform.app.InstrumentationRegistry import com.android.launcher3.AbstractDeviceProfileTest import com.android.launcher3.DeviceProfile import com.android.launcher3.InvariantDeviceProfile import com.google.common.truth.Truth.assertThat -import java.io.PrintWriter -import java.io.StringWriter import org.junit.Test import org.junit.runner.RunWith @@ -30,142 +30,14 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) class DeviceProfileDumpTest : AbstractDeviceProfileTest() { - + private val testContext: Context = InstrumentationRegistry.getInstrumentation().context + private val folderName: String = "DeviceProfileDumpTest" @Test fun phonePortrait3Button() { initializeVarsForPhone(deviceSpecs["phone"]!!, isGestureMode = false) val dp = getDeviceProfileForGrid("5_by_5") - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.625 px\n" + - "\tisTablet:false\n" + - "\tisPhone:true\n" + - "\ttransposeLayoutWithOrientation:true\n" + - "\tisGestureMode:false\n" + - "\tisLandscape:false\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:false\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 1080.0px (411.42856dp)\n" + - "\theightPx: 2400.0px (914.2857dp)\n" + - "\tavailableWidthPx: 1080.0px (411.42856dp)\n" + - "\tavailableHeightPx: 2156.0px (821.3333dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 118.0px (44.95238dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 126.0px (48.0dp)\n" + - "\taspectRatio:2.2222223\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:false\n" + - "\tinv.numRows: 5\n" + - "\tinv.numColumns: 5\n" + - "\tinv.numSearchContainerColumns: 5\n" + - "\tminCellSize: PointF(0.0, 0.0)dp\n" + - "\tcellWidthPx: 159.0px (60.57143dp)\n" + - "\tcellHeightPx: 229.0px (87.2381dp)\n" + - "\tgetCellSize().x: 207.0px (78.85714dp)\n" + - "\tgetCellSize().y: 379.0px (144.38095dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.left: 21.0px (8.0dp)\n" + - "\tcellLayoutPaddingPx.top: 28.0px (10.666667dp)\n" + - "\tcellLayoutPaddingPx.right: 21.0px (8.0dp)\n" + - "\tcellLayoutPaddingPx.bottom: 28.0px (10.666667dp)\n" + - "\ticonSizePx: 147.0px (56.0dp)\n" + - "\ticonTextSizePx: 38.0px (14.476191dp)\n" + - "\ticonDrawablePaddingPx: 12.0px (4.571429dp)\n" + - "\tinv.numFolderRows: 4\n" + - "\tinv.numFolderColumns: 4\n" + - "\tfolderCellWidthPx: 195.0px (74.28571dp)\n" + - "\tfolderCellHeightPx: 230.0px (87.61905dp)\n" + - "\tfolderChildIconSizePx: 147.0px (56.0dp)\n" + - "\tfolderChildTextSizePx: 38.0px (14.476191dp)\n" + - "\tfolderChildDrawablePaddingPx: 4.0px (1.5238096dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + - "\tfolderTopPadding: 63.0px (24.0dp)\n" + - "\tfolderFooterHeight: 147.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 146.0px (55.61905dp)\n" + - "\tbottomSheetOpenDuration: 267\n" + - "\tbottomSheetCloseDuration: 267\n" + - "\tbottomSheetWorkspaceScale: 1.0\n" + - "\tbottomSheetDepth: 0.0\n" + - "\tallAppsShiftRange: 788.0px (300.1905dp)\n" + - "\tallAppsTopPadding: 0.0px (0.0dp)\n" + - "\tallAppsOpenDuration: 600\n" + - "\tallAppsCloseDuration: 300\n" + - "\tallAppsIconSizePx: 147.0px (56.0dp)\n" + - "\tallAppsIconTextSizePx: 38.0px (14.476191dp)\n" + - "\tallAppsIconDrawablePaddingPx: 21.0px (8.0dp)\n" + - "\tallAppsCellHeightPx: 315.0px (120.0dp)\n" + - "\tallAppsCellWidthPx: 189.0px (72.0dp)\n" + - "\tallAppsBorderSpacePxX: 42.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 42.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 5\n" + - "\tallAppsLeftRightPadding: 0.0px (0.0dp)\n" + - "\tallAppsLeftRightMargin: 0.0px (0.0dp)\n" + - "\thotseatBarSizePx: 294.0px (112.0dp)\n" + - "\tinv.hotseatColumnSpan: 5\n" + - "\thotseatCellHeightPx: 166.0px (63.238094dp)\n" + - "\thotseatBarBottomSpacePx: 147.0px (56.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 200.0px (76.190475dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 128.0px (48.761906dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 21.0px (8.0dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 21.0px (8.0dp)\n" + - "\tnumShownHotseatIcons: 5\n" + - "\thotseatBorderSpace: 0.0px (0.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 0.0px (0.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:false\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp)\n" + - "\tworkspacePadding.left: 0.0px (0.0dp)\n" + - "\tworkspacePadding.top: 0.0px (0.0dp)\n" + - "\tworkspacePadding.right: 0.0px (0.0dp)\n" + - "\tworkspacePadding.bottom: 203.0px (77.333336dp)\n" + - "\ticonScale: 1.0px (0.3809524dp)\n" + - "\tcellScaleToFit : 1.0px (0.3809524dp)\n" + - "\textraSpace: 752.0px (286.4762dp)\n" + - "\tunscaled extraSpace: 752.0px (286.4762dp)\n" + - "\tmaxEmptySpace: 0.0px (0.0dp)\n" + - "\tworkspaceTopPadding: 0.0px (0.0dp)\n" + - "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 126.0px (48.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 84.0px (32.0dp)\n" + - "\tdropTargetBarSizePx: 147.0px (56.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 42.0px (16.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 391.0px (148.95238dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 1906.0px (726.0952dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.77572966px (0.29551607dp)\n" + - "\tgetCellLayoutHeight(): 1953.0px (744.0dp)\n" + - "\tgetCellLayoutWidth(): 1080.0px (411.42856dp)\n" - ) + assertDump(dp, "phonePortrait3Button") } @Test @@ -173,136 +45,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { initializeVarsForPhone(deviceSpecs["phone"]!!) val dp = getDeviceProfileForGrid("5_by_5") - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.625 px\n" + - "\tisTablet:false\n" + - "\tisPhone:true\n" + - "\ttransposeLayoutWithOrientation:true\n" + - "\tisGestureMode:true\n" + - "\tisLandscape:false\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:false\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 1080.0px (411.42856dp)\n" + - "\theightPx: 2400.0px (914.2857dp)\n" + - "\tavailableWidthPx: 1080.0px (411.42856dp)\n" + - "\tavailableHeightPx: 2219.0px (845.3333dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 118.0px (44.95238dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 63.0px (24.0dp)\n" + - "\taspectRatio:2.2222223\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:false\n" + - "\tinv.numRows: 5\n" + - "\tinv.numColumns: 5\n" + - "\tinv.numSearchContainerColumns: 5\n" + - "\tminCellSize: PointF(0.0, 0.0)dp\n" + - "\tcellWidthPx: 159.0px (60.57143dp)\n" + - "\tcellHeightPx: 229.0px (87.2381dp)\n" + - "\tgetCellSize().x: 207.0px (78.85714dp)\n" + - "\tgetCellSize().y: 383.0px (145.90475dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.left: 21.0px (8.0dp)\n" + - "\tcellLayoutPaddingPx.top: 28.0px (10.666667dp)\n" + - "\tcellLayoutPaddingPx.right: 21.0px (8.0dp)\n" + - "\tcellLayoutPaddingPx.bottom: 28.0px (10.666667dp)\n" + - "\ticonSizePx: 147.0px (56.0dp)\n" + - "\ticonTextSizePx: 38.0px (14.476191dp)\n" + - "\ticonDrawablePaddingPx: 12.0px (4.571429dp)\n" + - "\tinv.numFolderRows: 4\n" + - "\tinv.numFolderColumns: 4\n" + - "\tfolderCellWidthPx: 195.0px (74.28571dp)\n" + - "\tfolderCellHeightPx: 230.0px (87.61905dp)\n" + - "\tfolderChildIconSizePx: 147.0px (56.0dp)\n" + - "\tfolderChildTextSizePx: 38.0px (14.476191dp)\n" + - "\tfolderChildDrawablePaddingPx: 4.0px (1.5238096dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + - "\tfolderTopPadding: 63.0px (24.0dp)\n" + - "\tfolderFooterHeight: 147.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 146.0px (55.61905dp)\n" + - "\tbottomSheetOpenDuration: 267\n" + - "\tbottomSheetCloseDuration: 267\n" + - "\tbottomSheetWorkspaceScale: 1.0\n" + - "\tbottomSheetDepth: 0.0\n" + - "\tallAppsShiftRange: 788.0px (300.1905dp)\n" + - "\tallAppsTopPadding: 0.0px (0.0dp)\n" + - "\tallAppsOpenDuration: 600\n" + - "\tallAppsCloseDuration: 300\n" + - "\tallAppsIconSizePx: 147.0px (56.0dp)\n" + - "\tallAppsIconTextSizePx: 38.0px (14.476191dp)\n" + - "\tallAppsIconDrawablePaddingPx: 21.0px (8.0dp)\n" + - "\tallAppsCellHeightPx: 315.0px (120.0dp)\n" + - "\tallAppsCellWidthPx: 189.0px (72.0dp)\n" + - "\tallAppsBorderSpacePxX: 42.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 42.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 5\n" + - "\tallAppsLeftRightPadding: 0.0px (0.0dp)\n" + - "\tallAppsLeftRightMargin: 0.0px (0.0dp)\n" + - "\thotseatBarSizePx: 273.0px (104.0dp)\n" + - "\tinv.hotseatColumnSpan: 5\n" + - "\thotseatCellHeightPx: 166.0px (63.238094dp)\n" + - "\thotseatBarBottomSpacePx: 126.0px (48.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 200.0px (76.190475dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 107.0px (40.761906dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 21.0px (8.0dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 21.0px (8.0dp)\n" + - "\tnumShownHotseatIcons: 5\n" + - "\thotseatBorderSpace: 0.0px (0.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 0.0px (0.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:false\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp)\n" + - "\tworkspacePadding.left: 0.0px (0.0dp)\n" + - "\tworkspacePadding.top: 0.0px (0.0dp)\n" + - "\tworkspacePadding.right: 0.0px (0.0dp)\n" + - "\tworkspacePadding.bottom: 245.0px (93.333336dp)\n" + - "\ticonScale: 1.0px (0.3809524dp)\n" + - "\tcellScaleToFit : 1.0px (0.3809524dp)\n" + - "\textraSpace: 773.0px (294.4762dp)\n" + - "\tunscaled extraSpace: 773.0px (294.4762dp)\n" + - "\tmaxEmptySpace: 0.0px (0.0dp)\n" + - "\tworkspaceTopPadding: 0.0px (0.0dp)\n" + - "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 63.0px (24.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 84.0px (32.0dp)\n" + - "\tdropTargetBarSizePx: 147.0px (56.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 42.0px (16.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 391.0px (148.95238dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 1927.0px (734.0952dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.7781155px (0.29642496dp)\n" + - "\tgetCellLayoutHeight(): 1974.0px (752.0dp)\n" + - "\tgetCellLayoutWidth(): 1080.0px (411.42856dp)\n" - ) + assertDump(dp, "phonePortrait") } @Test @@ -310,136 +53,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { initializeVarsForPhone(deviceSpecs["phone"]!!, isVerticalBar = true, isGestureMode = false) val dp = getDeviceProfileForGrid("5_by_5") - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.625 px\n" + - "\tisTablet:false\n" + - "\tisPhone:true\n" + - "\ttransposeLayoutWithOrientation:true\n" + - "\tisGestureMode:false\n" + - "\tisLandscape:true\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:false\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 2400.0px (914.2857dp)\n" + - "\theightPx: 1080.0px (411.42856dp)\n" + - "\tavailableWidthPx: 2156.0px (821.3333dp)\n" + - "\tavailableHeightPx: 1006.0px (383.2381dp)\n" + - "\tmInsets.left: 118.0px (44.95238dp)\n" + - "\tmInsets.top: 74.0px (28.190475dp)\n" + - "\tmInsets.right: 126.0px (48.0dp)\n" + - "\tmInsets.bottom: 0.0px (0.0dp)\n" + - "\taspectRatio:2.2222223\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:false\n" + - "\tinv.numRows: 5\n" + - "\tinv.numColumns: 5\n" + - "\tinv.numSearchContainerColumns: 5\n" + - "\tminCellSize: PointF(0.0, 0.0)dp\n" + - "\tcellWidthPx: 152.0px (57.904762dp)\n" + - "\tcellHeightPx: 166.0px (63.238094dp)\n" + - "\tgetCellSize().x: 368.0px (140.19048dp)\n" + - "\tgetCellSize().y: 193.0px (73.52381dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.left: 53.0px (20.190475dp)\n" + - "\tcellLayoutPaddingPx.top: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.right: 53.0px (20.190475dp)\n" + - "\tcellLayoutPaddingPx.bottom: 40.0px (15.238095dp)\n" + - "\ticonSizePx: 147.0px (56.0dp)\n" + - "\ticonTextSizePx: 0.0px (0.0dp)\n" + - "\ticonDrawablePaddingPx: 0.0px (0.0dp)\n" + - "\tinv.numFolderRows: 4\n" + - "\tinv.numFolderColumns: 4\n" + - "\tfolderCellWidthPx: 173.0px (65.90476dp)\n" + - "\tfolderCellHeightPx: 205.0px (78.09524dp)\n" + - "\tfolderChildIconSizePx: 131.0px (49.904762dp)\n" + - "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + - "\tfolderChildDrawablePaddingPx: 4.0px (1.5238096dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + - "\tfolderTopPadding: 56.0px (21.333334dp)\n" + - "\tfolderFooterHeight: 131.0px (49.904762dp)\n" + - "\tbottomSheetTopPadding: 114.0px (43.42857dp)\n" + - "\tbottomSheetOpenDuration: 267\n" + - "\tbottomSheetCloseDuration: 267\n" + - "\tbottomSheetWorkspaceScale: 1.0\n" + - "\tbottomSheetDepth: 0.0\n" + - "\tallAppsShiftRange: 788.0px (300.1905dp)\n" + - "\tallAppsTopPadding: 0.0px (0.0dp)\n" + - "\tallAppsOpenDuration: 600\n" + - "\tallAppsCloseDuration: 300\n" + - "\tallAppsIconSizePx: 147.0px (56.0dp)\n" + - "\tallAppsIconTextSizePx: 38.0px (14.476191dp)\n" + - "\tallAppsIconDrawablePaddingPx: 21.0px (8.0dp)\n" + - "\tallAppsCellHeightPx: 321.0px (122.28571dp)\n" + - "\tallAppsCellWidthPx: 189.0px (72.0dp)\n" + - "\tallAppsBorderSpacePxX: 42.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 42.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 5\n" + - "\tallAppsLeftRightPadding: 0.0px (0.0dp)\n" + - "\tallAppsLeftRightMargin: 0.0px (0.0dp)\n" + - "\thotseatBarSizePx: 252.0px (96.0dp)\n" + - "\tinv.hotseatColumnSpan: 5\n" + - "\thotseatCellHeightPx: 166.0px (63.238094dp)\n" + - "\thotseatBarBottomSpacePx: 126.0px (48.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 63.0px (24.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 42.0px (16.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 118.0px (44.95238dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 64.0px (24.380953dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 49.0px (18.666666dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 42.0px (16.0dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 189.0px (72.0dp)\n" + - "\tnumShownHotseatIcons: 5\n" + - "\thotseatBorderSpace: 0.0px (0.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 0.0px (0.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:false\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 0.0px (0.0dp)\n" + - "\tworkspacePadding.left: 10.0px (3.8095238dp)\n" + - "\tworkspacePadding.top: 0.0px (0.0dp)\n" + - "\tworkspacePadding.right: 199.0px (75.809525dp)\n" + - "\tworkspacePadding.bottom: 0.0px (0.0dp)\n" + - "\ticonScale: 1.0px (0.3809524dp)\n" + - "\tcellScaleToFit : 1.0px (0.3809524dp)\n" + - "\textraSpace: 136.0px (51.809525dp)\n" + - "\tunscaled extraSpace: 136.0px (51.809525dp)\n" + - "\tmaxEmptySpace: 0.0px (0.0dp)\n" + - "\tworkspaceTopPadding: 0.0px (0.0dp)\n" + - "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 0.0px (0.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 16.0px (6.095238dp)\n" + - "\tdropTargetBarSizePx: 95.0px (36.190475dp)\n" + - "\tdropTargetBarBottomMarginPx: 16.0px (6.095238dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 201.0px (76.57143dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 1008.0px (384.0dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.8021869px (0.305595dp)\n" + - "\tgetCellLayoutHeight(): 1006.0px (383.2381dp)\n" + - "\tgetCellLayoutWidth(): 1947.0px (741.7143dp)\n" - ) + assertDump(dp, "phoneVerticalBar3Button") } @Test @@ -447,136 +61,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { initializeVarsForPhone(deviceSpecs["phone"]!!, isVerticalBar = true) val dp = getDeviceProfileForGrid("5_by_5") - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.625 px\n" + - "\tisTablet:false\n" + - "\tisPhone:true\n" + - "\ttransposeLayoutWithOrientation:true\n" + - "\tisGestureMode:true\n" + - "\tisLandscape:true\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:false\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 2400.0px (914.2857dp)\n" + - "\theightPx: 1080.0px (411.42856dp)\n" + - "\tavailableWidthPx: 2282.0px (869.3333dp)\n" + - "\tavailableHeightPx: 943.0px (359.2381dp)\n" + - "\tmInsets.left: 118.0px (44.95238dp)\n" + - "\tmInsets.top: 74.0px (28.190475dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 63.0px (24.0dp)\n" + - "\taspectRatio:2.2222223\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:false\n" + - "\tinv.numRows: 5\n" + - "\tinv.numColumns: 5\n" + - "\tinv.numSearchContainerColumns: 5\n" + - "\tminCellSize: PointF(0.0, 0.0)dp\n" + - "\tcellWidthPx: 152.0px (57.904762dp)\n" + - "\tcellHeightPx: 166.0px (63.238094dp)\n" + - "\tgetCellSize().x: 393.0px (149.71428dp)\n" + - "\tgetCellSize().y: 180.0px (68.57143dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.left: 53.0px (20.190475dp)\n" + - "\tcellLayoutPaddingPx.top: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.right: 53.0px (20.190475dp)\n" + - "\tcellLayoutPaddingPx.bottom: 40.0px (15.238095dp)\n" + - "\ticonSizePx: 147.0px (56.0dp)\n" + - "\ticonTextSizePx: 0.0px (0.0dp)\n" + - "\ticonDrawablePaddingPx: 0.0px (0.0dp)\n" + - "\tinv.numFolderRows: 4\n" + - "\tinv.numFolderColumns: 4\n" + - "\tfolderCellWidthPx: 163.0px (62.095238dp)\n" + - "\tfolderCellHeightPx: 192.0px (73.14286dp)\n" + - "\tfolderChildIconSizePx: 123.0px (46.857143dp)\n" + - "\tfolderChildTextSizePx: 32.0px (12.190476dp)\n" + - "\tfolderChildDrawablePaddingPx: 3.0px (1.1428572dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + - "\tfolderTopPadding: 53.0px (20.190475dp)\n" + - "\tfolderFooterHeight: 123.0px (46.857143dp)\n" + - "\tbottomSheetTopPadding: 114.0px (43.42857dp)\n" + - "\tbottomSheetOpenDuration: 267\n" + - "\tbottomSheetCloseDuration: 267\n" + - "\tbottomSheetWorkspaceScale: 1.0\n" + - "\tbottomSheetDepth: 0.0\n" + - "\tallAppsShiftRange: 788.0px (300.1905dp)\n" + - "\tallAppsTopPadding: 0.0px (0.0dp)\n" + - "\tallAppsOpenDuration: 600\n" + - "\tallAppsCloseDuration: 300\n" + - "\tallAppsIconSizePx: 147.0px (56.0dp)\n" + - "\tallAppsIconTextSizePx: 38.0px (14.476191dp)\n" + - "\tallAppsIconDrawablePaddingPx: 21.0px (8.0dp)\n" + - "\tallAppsCellHeightPx: 321.0px (122.28571dp)\n" + - "\tallAppsCellWidthPx: 189.0px (72.0dp)\n" + - "\tallAppsBorderSpacePxX: 42.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 42.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 5\n" + - "\tallAppsLeftRightPadding: 0.0px (0.0dp)\n" + - "\tallAppsLeftRightMargin: 0.0px (0.0dp)\n" + - "\thotseatBarSizePx: 252.0px (96.0dp)\n" + - "\tinv.hotseatColumnSpan: 5\n" + - "\thotseatCellHeightPx: 166.0px (63.238094dp)\n" + - "\thotseatBarBottomSpacePx: 126.0px (48.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 63.0px (24.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 42.0px (16.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 118.0px (44.95238dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 64.0px (24.380953dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 112.0px (42.666668dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 42.0px (16.0dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 63.0px (24.0dp)\n" + - "\tnumShownHotseatIcons: 5\n" + - "\thotseatBorderSpace: 0.0px (0.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 0.0px (0.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:false\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 0.0px (0.0dp)\n" + - "\tworkspacePadding.left: 10.0px (3.8095238dp)\n" + - "\tworkspacePadding.top: 0.0px (0.0dp)\n" + - "\tworkspacePadding.right: 199.0px (75.809525dp)\n" + - "\tworkspacePadding.bottom: 0.0px (0.0dp)\n" + - "\ticonScale: 1.0px (0.3809524dp)\n" + - "\tcellScaleToFit : 1.0px (0.3809524dp)\n" + - "\textraSpace: 73.0px (27.809525dp)\n" + - "\tunscaled extraSpace: 73.0px (27.809525dp)\n" + - "\tmaxEmptySpace: 0.0px (0.0dp)\n" + - "\tworkspaceTopPadding: 0.0px (0.0dp)\n" + - "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 63.0px (24.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 16.0px (6.095238dp)\n" + - "\tdropTargetBarSizePx: 95.0px (36.190475dp)\n" + - "\tdropTargetBarBottomMarginPx: 16.0px (6.095238dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 201.0px (76.57143dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 952.0px (362.66666dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.79639447px (0.30338836dp)\n" + - "\tgetCellLayoutHeight(): 943.0px (359.2381dp)\n" + - "\tgetCellLayoutWidth(): 2073.0px (789.7143dp)\n" - ) + assertDump(dp, "phoneVerticalBar") } @Test @@ -585,136 +70,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { val dp = getDeviceProfileForGrid("6_by_5") dp.isTaskbarPresentInApps = true - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.0 px\n" + - "\tisTablet:true\n" + - "\tisPhone:false\n" + - "\ttransposeLayoutWithOrientation:false\n" + - "\tisGestureMode:false\n" + - "\tisLandscape:true\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:false\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 2560.0px (1280.0dp)\n" + - "\theightPx: 1600.0px (800.0dp)\n" + - "\tavailableWidthPx: 2560.0px (1280.0dp)\n" + - "\tavailableHeightPx: 1496.0px (748.0dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 104.0px (52.0dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 0.0px (0.0dp)\n" + - "\taspectRatio:1.6\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:true\n" + - "\tinv.numRows: 5\n" + - "\tinv.numColumns: 6\n" + - "\tinv.numSearchContainerColumns: 3\n" + - "\tminCellSize: PointF(120.0, 104.0)dp\n" + - "\tcellWidthPx: 240.0px (120.0dp)\n" + - "\tcellHeightPx: 208.0px (104.0dp)\n" + - "\tgetCellSize().x: 240.0px (120.0dp)\n" + - "\tgetCellSize().y: 208.0px (104.0dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 128.0px (64.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 32.0px (16.0dp)\n" + - "\tcellLayoutPaddingPx.left: 59.0px (29.5dp)\n" + - "\tcellLayoutPaddingPx.top: 25.0px (12.5dp)\n" + - "\tcellLayoutPaddingPx.right: 59.0px (29.5dp)\n" + - "\tcellLayoutPaddingPx.bottom: 59.0px (29.5dp)\n" + - "\ticonSizePx: 120.0px (60.0dp)\n" + - "\ticonTextSizePx: 28.0px (14.0dp)\n" + - "\ticonDrawablePaddingPx: 9.0px (4.5dp)\n" + - "\tinv.numFolderRows: 3\n" + - "\tinv.numFolderColumns: 3\n" + - "\tfolderCellWidthPx: 240.0px (120.0dp)\n" + - "\tfolderCellHeightPx: 208.0px (104.0dp)\n" + - "\tfolderChildIconSizePx: 120.0px (60.0dp)\n" + - "\tfolderChildTextSizePx: 28.0px (14.0dp)\n" + - "\tfolderChildDrawablePaddingPx: 11.0px (5.5dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + - "\tfolderTopPadding: 48.0px (24.0dp)\n" + - "\tfolderFooterHeight: 112.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 104.0px (52.0dp)\n" + - "\tbottomSheetOpenDuration: 500\n" + - "\tbottomSheetCloseDuration: 500\n" + - "\tbottomSheetWorkspaceScale: 0.97\n" + - "\tbottomSheetDepth: 0.0\n" + - "\tallAppsShiftRange: 1496.0px (748.0dp)\n" + - "\tallAppsTopPadding: 104.0px (52.0dp)\n" + - "\tallAppsOpenDuration: 500\n" + - "\tallAppsCloseDuration: 500\n" + - "\tallAppsIconSizePx: 120.0px (60.0dp)\n" + - "\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" + - "\tallAppsIconDrawablePaddingPx: 9.0px (4.5dp)\n" + - "\tallAppsCellHeightPx: 284.0px (142.0dp)\n" + - "\tallAppsCellWidthPx: 252.0px (126.0dp)\n" + - "\tallAppsBorderSpacePxX: 32.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 32.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 6\n" + - "\tallAppsLeftRightPadding: 32.0px (16.0dp)\n" + - "\tallAppsLeftRightMargin: 412.0px (206.0dp)\n" + - "\thotseatBarSizePx: 200.0px (100.0dp)\n" + - "\tinv.hotseatColumnSpan: 4\n" + - "\thotseatCellHeightPx: 135.0px (67.5dp)\n" + - "\thotseatBarBottomSpacePx: 80.0px (40.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 128.0px (64.0dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 65.0px (32.5dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 668.0px (334.0dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 668.0px (334.0dp)\n" + - "\tnumShownHotseatIcons: 6\n" + - "\thotseatBorderSpace: 100.0px (50.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 1224.0px (612.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:true\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 240.0px (120.0dp)\n" + - "\tworkspacePadding.left: 181.0px (90.5dp)\n" + - "\tworkspacePadding.top: 0.0px (0.0dp)\n" + - "\tworkspacePadding.right: 181.0px (90.5dp)\n" + - "\tworkspacePadding.bottom: 244.0px (122.0dp)\n" + - "\ticonScale: 1.0px (0.5dp)\n" + - "\tcellScaleToFit : 1.0px (0.5dp)\n" + - "\textraSpace: 80.0px (40.0dp)\n" + - "\tunscaled extraSpace: 80.0px (40.0dp)\n" + - "\tmaxEmptySpace: 200.0px (100.0dp)\n" + - "\tworkspaceTopPadding: 25.0px (12.5dp)\n" + - "\tworkspaceBottomPadding: 55.0px (27.5dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 0.0px (0.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 0.0px (0.0dp)\n" + - "\tdropTargetBarSizePx: 144.0px (72.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 64.0px (32.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 312.0px (156.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 1272.0px (636.0dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 48.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.76677316px (0.38338658dp)\n" + - "\tgetCellLayoutHeight(): 1252.0px (626.0dp)\n" + - "\tgetCellLayoutWidth(): 2198.0px (1099.0dp)\n" - ) + assertDump(dp, "tabletLandscape3Button") } @Test @@ -723,136 +79,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { val dp = getDeviceProfileForGrid("6_by_5") dp.isTaskbarPresentInApps = true - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.0 px\n" + - "\tisTablet:true\n" + - "\tisPhone:false\n" + - "\ttransposeLayoutWithOrientation:false\n" + - "\tisGestureMode:true\n" + - "\tisLandscape:true\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:false\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 2560.0px (1280.0dp)\n" + - "\theightPx: 1600.0px (800.0dp)\n" + - "\tavailableWidthPx: 2560.0px (1280.0dp)\n" + - "\tavailableHeightPx: 1496.0px (748.0dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 104.0px (52.0dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 0.0px (0.0dp)\n" + - "\taspectRatio:1.6\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:true\n" + - "\tinv.numRows: 5\n" + - "\tinv.numColumns: 6\n" + - "\tinv.numSearchContainerColumns: 3\n" + - "\tminCellSize: PointF(120.0, 104.0)dp\n" + - "\tcellWidthPx: 240.0px (120.0dp)\n" + - "\tcellHeightPx: 208.0px (104.0dp)\n" + - "\tgetCellSize().x: 240.0px (120.0dp)\n" + - "\tgetCellSize().y: 208.0px (104.0dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 128.0px (64.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 32.0px (16.0dp)\n" + - "\tcellLayoutPaddingPx.left: 59.0px (29.5dp)\n" + - "\tcellLayoutPaddingPx.top: 25.0px (12.5dp)\n" + - "\tcellLayoutPaddingPx.right: 59.0px (29.5dp)\n" + - "\tcellLayoutPaddingPx.bottom: 59.0px (29.5dp)\n" + - "\ticonSizePx: 120.0px (60.0dp)\n" + - "\ticonTextSizePx: 28.0px (14.0dp)\n" + - "\ticonDrawablePaddingPx: 9.0px (4.5dp)\n" + - "\tinv.numFolderRows: 3\n" + - "\tinv.numFolderColumns: 3\n" + - "\tfolderCellWidthPx: 240.0px (120.0dp)\n" + - "\tfolderCellHeightPx: 208.0px (104.0dp)\n" + - "\tfolderChildIconSizePx: 120.0px (60.0dp)\n" + - "\tfolderChildTextSizePx: 28.0px (14.0dp)\n" + - "\tfolderChildDrawablePaddingPx: 11.0px (5.5dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + - "\tfolderTopPadding: 48.0px (24.0dp)\n" + - "\tfolderFooterHeight: 112.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 104.0px (52.0dp)\n" + - "\tbottomSheetOpenDuration: 500\n" + - "\tbottomSheetCloseDuration: 500\n" + - "\tbottomSheetWorkspaceScale: 0.97\n" + - "\tbottomSheetDepth: 0.0\n" + - "\tallAppsShiftRange: 1496.0px (748.0dp)\n" + - "\tallAppsTopPadding: 104.0px (52.0dp)\n" + - "\tallAppsOpenDuration: 500\n" + - "\tallAppsCloseDuration: 500\n" + - "\tallAppsIconSizePx: 120.0px (60.0dp)\n" + - "\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" + - "\tallAppsIconDrawablePaddingPx: 9.0px (4.5dp)\n" + - "\tallAppsCellHeightPx: 284.0px (142.0dp)\n" + - "\tallAppsCellWidthPx: 252.0px (126.0dp)\n" + - "\tallAppsBorderSpacePxX: 32.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 32.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 6\n" + - "\tallAppsLeftRightPadding: 32.0px (16.0dp)\n" + - "\tallAppsLeftRightMargin: 412.0px (206.0dp)\n" + - "\thotseatBarSizePx: 200.0px (100.0dp)\n" + - "\tinv.hotseatColumnSpan: 4\n" + - "\thotseatCellHeightPx: 135.0px (67.5dp)\n" + - "\thotseatBarBottomSpacePx: 80.0px (40.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 128.0px (64.0dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 65.0px (32.5dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 668.0px (334.0dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 668.0px (334.0dp)\n" + - "\tnumShownHotseatIcons: 6\n" + - "\thotseatBorderSpace: 100.0px (50.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 1224.0px (612.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:true\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 240.0px (120.0dp)\n" + - "\tworkspacePadding.left: 181.0px (90.5dp)\n" + - "\tworkspacePadding.top: 0.0px (0.0dp)\n" + - "\tworkspacePadding.right: 181.0px (90.5dp)\n" + - "\tworkspacePadding.bottom: 244.0px (122.0dp)\n" + - "\ticonScale: 1.0px (0.5dp)\n" + - "\tcellScaleToFit : 1.0px (0.5dp)\n" + - "\textraSpace: 80.0px (40.0dp)\n" + - "\tunscaled extraSpace: 80.0px (40.0dp)\n" + - "\tmaxEmptySpace: 200.0px (100.0dp)\n" + - "\tworkspaceTopPadding: 25.0px (12.5dp)\n" + - "\tworkspaceBottomPadding: 55.0px (27.5dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 0.0px (0.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 0.0px (0.0dp)\n" + - "\tdropTargetBarSizePx: 144.0px (72.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 64.0px (32.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 312.0px (156.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 1272.0px (636.0dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 48.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.76677316px (0.38338658dp)\n" + - "\tgetCellLayoutHeight(): 1252.0px (626.0dp)\n" + - "\tgetCellLayoutWidth(): 2198.0px (1099.0dp)\n" - ) + assertDump(dp, "tabletLandscape") } @Test @@ -861,136 +88,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { val dp = getDeviceProfileForGrid("6_by_5") dp.isTaskbarPresentInApps = true - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.0 px\n" + - "\tisTablet:true\n" + - "\tisPhone:false\n" + - "\ttransposeLayoutWithOrientation:false\n" + - "\tisGestureMode:false\n" + - "\tisLandscape:false\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:false\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 1600.0px (800.0dp)\n" + - "\theightPx: 2560.0px (1280.0dp)\n" + - "\tavailableWidthPx: 1600.0px (800.0dp)\n" + - "\tavailableHeightPx: 2456.0px (1228.0dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 104.0px (52.0dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 0.0px (0.0dp)\n" + - "\taspectRatio:1.6\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:true\n" + - "\tinv.numRows: 5\n" + - "\tinv.numColumns: 6\n" + - "\tinv.numSearchContainerColumns: 3\n" + - "\tminCellSize: PointF(102.0, 120.0)dp\n" + - "\tcellWidthPx: 204.0px (102.0dp)\n" + - "\tcellHeightPx: 240.0px (120.0dp)\n" + - "\tgetCellSize().x: 204.0px (102.0dp)\n" + - "\tgetCellSize().y: 240.0px (120.0dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 32.0px (16.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 128.0px (64.0dp)\n" + - "\tcellLayoutPaddingPx.left: 72.0px (36.0dp)\n" + - "\tcellLayoutPaddingPx.top: 72.0px (36.0dp)\n" + - "\tcellLayoutPaddingPx.right: 72.0px (36.0dp)\n" + - "\tcellLayoutPaddingPx.bottom: 72.0px (36.0dp)\n" + - "\ticonSizePx: 120.0px (60.0dp)\n" + - "\ticonTextSizePx: 28.0px (14.0dp)\n" + - "\ticonDrawablePaddingPx: 9.0px (4.5dp)\n" + - "\tinv.numFolderRows: 3\n" + - "\tinv.numFolderColumns: 3\n" + - "\tfolderCellWidthPx: 204.0px (102.0dp)\n" + - "\tfolderCellHeightPx: 240.0px (120.0dp)\n" + - "\tfolderChildIconSizePx: 120.0px (60.0dp)\n" + - "\tfolderChildTextSizePx: 28.0px (14.0dp)\n" + - "\tfolderChildDrawablePaddingPx: 22.0px (11.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + - "\tfolderTopPadding: 48.0px (24.0dp)\n" + - "\tfolderFooterHeight: 112.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 704.0px (352.0dp)\n" + - "\tbottomSheetOpenDuration: 500\n" + - "\tbottomSheetCloseDuration: 500\n" + - "\tbottomSheetWorkspaceScale: 0.97\n" + - "\tbottomSheetDepth: 0.0\n" + - "\tallAppsShiftRange: 1810.0px (905.0dp)\n" + - "\tallAppsTopPadding: 750.0px (375.0dp)\n" + - "\tallAppsOpenDuration: 500\n" + - "\tallAppsCloseDuration: 500\n" + - "\tallAppsIconSizePx: 120.0px (60.0dp)\n" + - "\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" + - "\tallAppsIconDrawablePaddingPx: 9.0px (4.5dp)\n" + - "\tallAppsCellHeightPx: 316.0px (158.0dp)\n" + - "\tallAppsCellWidthPx: 192.0px (96.0dp)\n" + - "\tallAppsBorderSpacePxX: 16.0px (8.0dp)\n" + - "\tallAppsBorderSpacePxY: 32.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 6\n" + - "\tallAppsLeftRightPadding: 32.0px (16.0dp)\n" + - "\tallAppsLeftRightMargin: 152.0px (76.0dp)\n" + - "\thotseatBarSizePx: 272.0px (136.0dp)\n" + - "\tinv.hotseatColumnSpan: 6\n" + - "\thotseatCellHeightPx: 135.0px (67.5dp)\n" + - "\thotseatBarBottomSpacePx: 152.0px (76.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 216.0px (108.0dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 137.0px (68.5dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 150.0px (75.0dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 150.0px (75.0dp)\n" + - "\tnumShownHotseatIcons: 6\n" + - "\thotseatBorderSpace: 116.0px (58.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 1300.0px (650.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:true\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 108.0px (54.0dp)\n" + - "\tworkspacePadding.left: 36.0px (18.0dp)\n" + - "\tworkspacePadding.top: 132.0px (66.0dp)\n" + - "\tworkspacePadding.right: 36.0px (18.0dp)\n" + - "\tworkspacePadding.bottom: 468.0px (234.0dp)\n" + - "\ticonScale: 1.0px (0.5dp)\n" + - "\tcellScaleToFit : 1.0px (0.5dp)\n" + - "\textraSpace: 424.0px (212.0dp)\n" + - "\tunscaled extraSpace: 424.0px (212.0dp)\n" + - "\tmaxEmptySpace: 19998.0px (9999.0dp)\n" + - "\tworkspaceTopPadding: 204.0px (102.0dp)\n" + - "\tworkspaceBottomPadding: 220.0px (110.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 0.0px (0.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 220.0px (110.0dp)\n" + - "\tdropTargetBarSizePx: 144.0px (72.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 96.0px (48.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 564.0px (282.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 2072.0px (1036.0dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 48.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.8125px (0.40625dp)\n" + - "\tgetCellLayoutHeight(): 1856.0px (928.0dp)\n" + - "\tgetCellLayoutWidth(): 1528.0px (764.0dp)\n" - ) + assertDump(dp, "tabletPortrait3Button") } @Test @@ -999,136 +97,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { val dp = getDeviceProfileForGrid("6_by_5") dp.isTaskbarPresentInApps = true - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.0 px\n" + - "\tisTablet:true\n" + - "\tisPhone:false\n" + - "\ttransposeLayoutWithOrientation:false\n" + - "\tisGestureMode:true\n" + - "\tisLandscape:false\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:false\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 1600.0px (800.0dp)\n" + - "\theightPx: 2560.0px (1280.0dp)\n" + - "\tavailableWidthPx: 1600.0px (800.0dp)\n" + - "\tavailableHeightPx: 2456.0px (1228.0dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 104.0px (52.0dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 0.0px (0.0dp)\n" + - "\taspectRatio:1.6\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:true\n" + - "\tinv.numRows: 5\n" + - "\tinv.numColumns: 6\n" + - "\tinv.numSearchContainerColumns: 3\n" + - "\tminCellSize: PointF(102.0, 120.0)dp\n" + - "\tcellWidthPx: 204.0px (102.0dp)\n" + - "\tcellHeightPx: 240.0px (120.0dp)\n" + - "\tgetCellSize().x: 204.0px (102.0dp)\n" + - "\tgetCellSize().y: 240.0px (120.0dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 32.0px (16.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 128.0px (64.0dp)\n" + - "\tcellLayoutPaddingPx.left: 72.0px (36.0dp)\n" + - "\tcellLayoutPaddingPx.top: 72.0px (36.0dp)\n" + - "\tcellLayoutPaddingPx.right: 72.0px (36.0dp)\n" + - "\tcellLayoutPaddingPx.bottom: 72.0px (36.0dp)\n" + - "\ticonSizePx: 120.0px (60.0dp)\n" + - "\ticonTextSizePx: 28.0px (14.0dp)\n" + - "\ticonDrawablePaddingPx: 9.0px (4.5dp)\n" + - "\tinv.numFolderRows: 3\n" + - "\tinv.numFolderColumns: 3\n" + - "\tfolderCellWidthPx: 204.0px (102.0dp)\n" + - "\tfolderCellHeightPx: 240.0px (120.0dp)\n" + - "\tfolderChildIconSizePx: 120.0px (60.0dp)\n" + - "\tfolderChildTextSizePx: 28.0px (14.0dp)\n" + - "\tfolderChildDrawablePaddingPx: 22.0px (11.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + - "\tfolderTopPadding: 48.0px (24.0dp)\n" + - "\tfolderFooterHeight: 112.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 704.0px (352.0dp)\n" + - "\tbottomSheetOpenDuration: 500\n" + - "\tbottomSheetCloseDuration: 500\n" + - "\tbottomSheetWorkspaceScale: 0.97\n" + - "\tbottomSheetDepth: 0.0\n" + - "\tallAppsShiftRange: 1810.0px (905.0dp)\n" + - "\tallAppsTopPadding: 750.0px (375.0dp)\n" + - "\tallAppsOpenDuration: 500\n" + - "\tallAppsCloseDuration: 500\n" + - "\tallAppsIconSizePx: 120.0px (60.0dp)\n" + - "\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" + - "\tallAppsIconDrawablePaddingPx: 9.0px (4.5dp)\n" + - "\tallAppsCellHeightPx: 316.0px (158.0dp)\n" + - "\tallAppsCellWidthPx: 192.0px (96.0dp)\n" + - "\tallAppsBorderSpacePxX: 16.0px (8.0dp)\n" + - "\tallAppsBorderSpacePxY: 32.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 6\n" + - "\tallAppsLeftRightPadding: 32.0px (16.0dp)\n" + - "\tallAppsLeftRightMargin: 152.0px (76.0dp)\n" + - "\thotseatBarSizePx: 272.0px (136.0dp)\n" + - "\tinv.hotseatColumnSpan: 6\n" + - "\thotseatCellHeightPx: 135.0px (67.5dp)\n" + - "\thotseatBarBottomSpacePx: 152.0px (76.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 216.0px (108.0dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 137.0px (68.5dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 150.0px (75.0dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 150.0px (75.0dp)\n" + - "\tnumShownHotseatIcons: 6\n" + - "\thotseatBorderSpace: 116.0px (58.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 1300.0px (650.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:true\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 108.0px (54.0dp)\n" + - "\tworkspacePadding.left: 36.0px (18.0dp)\n" + - "\tworkspacePadding.top: 132.0px (66.0dp)\n" + - "\tworkspacePadding.right: 36.0px (18.0dp)\n" + - "\tworkspacePadding.bottom: 468.0px (234.0dp)\n" + - "\ticonScale: 1.0px (0.5dp)\n" + - "\tcellScaleToFit : 1.0px (0.5dp)\n" + - "\textraSpace: 424.0px (212.0dp)\n" + - "\tunscaled extraSpace: 424.0px (212.0dp)\n" + - "\tmaxEmptySpace: 19998.0px (9999.0dp)\n" + - "\tworkspaceTopPadding: 204.0px (102.0dp)\n" + - "\tworkspaceBottomPadding: 220.0px (110.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 0.0px (0.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 220.0px (110.0dp)\n" + - "\tdropTargetBarSizePx: 144.0px (72.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 96.0px (48.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 564.0px (282.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 2072.0px (1036.0dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 48.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.8125px (0.40625dp)\n" + - "\tgetCellLayoutHeight(): 1856.0px (928.0dp)\n" + - "\tgetCellLayoutWidth(): 1528.0px (764.0dp)\n" - ) + assertDump(dp, "tabletPortrait") } @Test @@ -1142,136 +111,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { val dp = getDeviceProfileForGrid("4_by_4") dp.isTaskbarPresentInApps = true - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.625 px\n" + - "\tisTablet:true\n" + - "\tisPhone:false\n" + - "\ttransposeLayoutWithOrientation:false\n" + - "\tisGestureMode:false\n" + - "\tisLandscape:true\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:true\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 2208.0px (841.1429dp)\n" + - "\theightPx: 1840.0px (700.9524dp)\n" + - "\tavailableWidthPx: 2208.0px (841.1429dp)\n" + - "\tavailableHeightPx: 1730.0px (659.0476dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 110.0px (41.904762dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 0.0px (0.0dp)\n" + - "\taspectRatio:1.2\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:false\n" + - "\tinv.numRows: 4\n" + - "\tinv.numColumns: 4\n" + - "\tinv.numSearchContainerColumns: 4\n" + - "\tminCellSize: PointF(0.0, 0.0)dp\n" + - "\tcellWidthPx: 154.0px (58.666668dp)\n" + - "\tcellHeightPx: 218.0px (83.04762dp)\n" + - "\tgetCellSize().x: 270.0px (102.85714dp)\n" + - "\tgetCellSize().y: 342.0px (130.28572dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.left: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.top: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.right: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" + - "\ticonSizePx: 141.0px (53.714287dp)\n" + - "\ticonTextSizePx: 34.0px (12.952381dp)\n" + - "\ticonDrawablePaddingPx: 13.0px (4.952381dp)\n" + - "\tinv.numFolderRows: 3\n" + - "\tinv.numFolderColumns: 4\n" + - "\tfolderCellWidthPx: 189.0px (72.0dp)\n" + - "\tfolderCellHeightPx: 219.0px (83.42857dp)\n" + - "\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" + - "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + - "\tfolderChildDrawablePaddingPx: 5.0px (1.9047619dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + - "\tfolderTopPadding: 63.0px (24.0dp)\n" + - "\tfolderFooterHeight: 147.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 110.0px (41.904762dp)\n" + - "\tbottomSheetOpenDuration: 500\n" + - "\tbottomSheetCloseDuration: 500\n" + - "\tbottomSheetWorkspaceScale: 0.97\n" + - "\tbottomSheetDepth: 1.0\n" + - "\tallAppsShiftRange: 1730.0px (659.0476dp)\n" + - "\tallAppsTopPadding: 110.0px (41.904762dp)\n" + - "\tallAppsOpenDuration: 500\n" + - "\tallAppsCloseDuration: 500\n" + - "\tallAppsIconSizePx: 141.0px (53.714287dp)\n" + - "\tallAppsIconTextSizePx: 34.0px (12.952381dp)\n" + - "\tallAppsIconDrawablePaddingPx: 21.0px (8.0dp)\n" + - "\tallAppsCellHeightPx: 315.0px (120.0dp)\n" + - "\tallAppsCellWidthPx: 183.0px (69.71429dp)\n" + - "\tallAppsBorderSpacePxX: 42.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 42.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 8\n" + - "\tallAppsLeftRightPadding: 42.0px (16.0dp)\n" + - "\tallAppsLeftRightMargin: 183.0px (69.71429dp)\n" + - "\thotseatBarSizePx: 267.0px (101.71429dp)\n" + - "\tinv.hotseatColumnSpan: 4\n" + - "\thotseatCellHeightPx: 159.0px (60.57143dp)\n" + - "\thotseatBarBottomSpacePx: 126.0px (48.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 116.0px (44.190475dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 108.0px (41.142857dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 113.0px (43.04762dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 113.0px (43.04762dp)\n" + - "\tnumShownHotseatIcons: 6\n" + - "\thotseatBorderSpace: 0.0px (0.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 0.0px (0.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:true\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp)\n" + - "\tworkspacePadding.left: 21.0px (8.0dp)\n" + - "\tworkspacePadding.top: 30.0px (11.428572dp)\n" + - "\tworkspacePadding.right: 21.0px (8.0dp)\n" + - "\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" + - "\ticonScale: 1.0px (0.3809524dp)\n" + - "\tcellScaleToFit : 1.0px (0.3809524dp)\n" + - "\textraSpace: 498.0px (189.71428dp)\n" + - "\tunscaled extraSpace: 498.0px (189.71428dp)\n" + - "\tmaxEmptySpace: 0.0px (0.0dp)\n" + - "\tworkspaceTopPadding: 0.0px (0.0dp)\n" + - "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 0.0px (0.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 0.0px (0.0dp)\n" + - "\tdropTargetBarSizePx: 147.0px (56.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 42.0px (16.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 299.0px (113.90476dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 1457.0px (555.0476dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.8452555px (0.32200208dp)\n" + - "\tgetCellLayoutHeight(): 1370.0px (521.9048dp)\n" + - "\tgetCellLayoutWidth(): 1083.0px (412.57144dp)\n" - ) + assertDump(dp, "twoPanelLandscape3Button") } @Test @@ -1284,136 +124,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { val dp = getDeviceProfileForGrid("4_by_4") dp.isTaskbarPresentInApps = true - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.625 px\n" + - "\tisTablet:true\n" + - "\tisPhone:false\n" + - "\ttransposeLayoutWithOrientation:false\n" + - "\tisGestureMode:true\n" + - "\tisLandscape:true\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:true\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 2208.0px (841.1429dp)\n" + - "\theightPx: 1840.0px (700.9524dp)\n" + - "\tavailableWidthPx: 2208.0px (841.1429dp)\n" + - "\tavailableHeightPx: 1730.0px (659.0476dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 110.0px (41.904762dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 0.0px (0.0dp)\n" + - "\taspectRatio:1.2\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:false\n" + - "\tinv.numRows: 4\n" + - "\tinv.numColumns: 4\n" + - "\tinv.numSearchContainerColumns: 4\n" + - "\tminCellSize: PointF(0.0, 0.0)dp\n" + - "\tcellWidthPx: 154.0px (58.666668dp)\n" + - "\tcellHeightPx: 218.0px (83.04762dp)\n" + - "\tgetCellSize().x: 270.0px (102.85714dp)\n" + - "\tgetCellSize().y: 342.0px (130.28572dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.left: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.top: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.right: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" + - "\ticonSizePx: 141.0px (53.714287dp)\n" + - "\ticonTextSizePx: 34.0px (12.952381dp)\n" + - "\ticonDrawablePaddingPx: 13.0px (4.952381dp)\n" + - "\tinv.numFolderRows: 3\n" + - "\tinv.numFolderColumns: 4\n" + - "\tfolderCellWidthPx: 189.0px (72.0dp)\n" + - "\tfolderCellHeightPx: 219.0px (83.42857dp)\n" + - "\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" + - "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + - "\tfolderChildDrawablePaddingPx: 5.0px (1.9047619dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + - "\tfolderTopPadding: 63.0px (24.0dp)\n" + - "\tfolderFooterHeight: 147.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 110.0px (41.904762dp)\n" + - "\tbottomSheetOpenDuration: 500\n" + - "\tbottomSheetCloseDuration: 500\n" + - "\tbottomSheetWorkspaceScale: 0.97\n" + - "\tbottomSheetDepth: 1.0\n" + - "\tallAppsShiftRange: 1730.0px (659.0476dp)\n" + - "\tallAppsTopPadding: 110.0px (41.904762dp)\n" + - "\tallAppsOpenDuration: 500\n" + - "\tallAppsCloseDuration: 500\n" + - "\tallAppsIconSizePx: 141.0px (53.714287dp)\n" + - "\tallAppsIconTextSizePx: 34.0px (12.952381dp)\n" + - "\tallAppsIconDrawablePaddingPx: 21.0px (8.0dp)\n" + - "\tallAppsCellHeightPx: 315.0px (120.0dp)\n" + - "\tallAppsCellWidthPx: 183.0px (69.71429dp)\n" + - "\tallAppsBorderSpacePxX: 42.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 42.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 8\n" + - "\tallAppsLeftRightPadding: 42.0px (16.0dp)\n" + - "\tallAppsLeftRightMargin: 183.0px (69.71429dp)\n" + - "\thotseatBarSizePx: 267.0px (101.71429dp)\n" + - "\tinv.hotseatColumnSpan: 4\n" + - "\thotseatCellHeightPx: 159.0px (60.57143dp)\n" + - "\thotseatBarBottomSpacePx: 126.0px (48.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 116.0px (44.190475dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 108.0px (41.142857dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 113.0px (43.04762dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 113.0px (43.04762dp)\n" + - "\tnumShownHotseatIcons: 6\n" + - "\thotseatBorderSpace: 0.0px (0.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 0.0px (0.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:true\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp)\n" + - "\tworkspacePadding.left: 21.0px (8.0dp)\n" + - "\tworkspacePadding.top: 30.0px (11.428572dp)\n" + - "\tworkspacePadding.right: 21.0px (8.0dp)\n" + - "\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" + - "\ticonScale: 1.0px (0.3809524dp)\n" + - "\tcellScaleToFit : 1.0px (0.3809524dp)\n" + - "\textraSpace: 498.0px (189.71428dp)\n" + - "\tunscaled extraSpace: 498.0px (189.71428dp)\n" + - "\tmaxEmptySpace: 0.0px (0.0dp)\n" + - "\tworkspaceTopPadding: 0.0px (0.0dp)\n" + - "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 0.0px (0.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 0.0px (0.0dp)\n" + - "\tdropTargetBarSizePx: 147.0px (56.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 42.0px (16.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 299.0px (113.90476dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 1457.0px (555.0476dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.8452555px (0.32200208dp)\n" + - "\tgetCellLayoutHeight(): 1370.0px (521.9048dp)\n" + - "\tgetCellLayoutWidth(): 1083.0px (412.57144dp)\n" - ) + assertDump(dp, "twoPanelLandscape") } @Test @@ -1426,136 +137,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { val dp = getDeviceProfileForGrid("4_by_4") dp.isTaskbarPresentInApps = true - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.625 px\n" + - "\tisTablet:true\n" + - "\tisPhone:false\n" + - "\ttransposeLayoutWithOrientation:false\n" + - "\tisGestureMode:false\n" + - "\tisLandscape:false\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:true\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 1840.0px (700.9524dp)\n" + - "\theightPx: 2208.0px (841.1429dp)\n" + - "\tavailableWidthPx: 1840.0px (700.9524dp)\n" + - "\tavailableHeightPx: 2075.0px (790.4762dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 133.0px (50.666668dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 0.0px (0.0dp)\n" + - "\taspectRatio:1.2\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:false\n" + - "\tinv.numRows: 4\n" + - "\tinv.numColumns: 4\n" + - "\tinv.numSearchContainerColumns: 4\n" + - "\tminCellSize: PointF(0.0, 0.0)dp\n" + - "\tcellWidthPx: 154.0px (58.666668dp)\n" + - "\tcellHeightPx: 218.0px (83.04762dp)\n" + - "\tgetCellSize().x: 224.0px (85.333336dp)\n" + - "\tgetCellSize().y: 430.0px (163.80952dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.left: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.top: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.right: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" + - "\ticonSizePx: 141.0px (53.714287dp)\n" + - "\ticonTextSizePx: 34.0px (12.952381dp)\n" + - "\ticonDrawablePaddingPx: 13.0px (4.952381dp)\n" + - "\tinv.numFolderRows: 3\n" + - "\tinv.numFolderColumns: 4\n" + - "\tfolderCellWidthPx: 189.0px (72.0dp)\n" + - "\tfolderCellHeightPx: 219.0px (83.42857dp)\n" + - "\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" + - "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + - "\tfolderChildDrawablePaddingPx: 5.0px (1.9047619dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + - "\tfolderTopPadding: 63.0px (24.0dp)\n" + - "\tfolderFooterHeight: 147.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 133.0px (50.666668dp)\n" + - "\tbottomSheetOpenDuration: 500\n" + - "\tbottomSheetCloseDuration: 500\n" + - "\tbottomSheetWorkspaceScale: 0.97\n" + - "\tbottomSheetDepth: 1.0\n" + - "\tallAppsShiftRange: 1826.0px (695.619dp)\n" + - "\tallAppsTopPadding: 382.0px (145.5238dp)\n" + - "\tallAppsOpenDuration: 500\n" + - "\tallAppsCloseDuration: 500\n" + - "\tallAppsIconSizePx: 141.0px (53.714287dp)\n" + - "\tallAppsIconTextSizePx: 34.0px (12.952381dp)\n" + - "\tallAppsIconDrawablePaddingPx: 21.0px (8.0dp)\n" + - "\tallAppsCellHeightPx: 315.0px (120.0dp)\n" + - "\tallAppsCellWidthPx: 183.0px (69.71429dp)\n" + - "\tallAppsBorderSpacePxX: 42.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 42.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 8\n" + - "\tallAppsLeftRightPadding: 42.0px (16.0dp)\n" + - "\tallAppsLeftRightMargin: 1.0px (0.3809524dp)\n" + - "\thotseatBarSizePx: 267.0px (101.71429dp)\n" + - "\tinv.hotseatColumnSpan: 4\n" + - "\thotseatCellHeightPx: 159.0px (60.57143dp)\n" + - "\thotseatBarBottomSpacePx: 126.0px (48.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 171.0px (65.14286dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 108.0px (41.142857dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 98.0px (37.333332dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 98.0px (37.333332dp)\n" + - "\tnumShownHotseatIcons: 6\n" + - "\thotseatBorderSpace: 0.0px (0.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 0.0px (0.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:true\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp)\n" + - "\tworkspacePadding.left: 21.0px (8.0dp)\n" + - "\tworkspacePadding.top: 24.0px (9.142858dp)\n" + - "\tworkspacePadding.right: 21.0px (8.0dp)\n" + - "\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" + - "\ticonScale: 1.0px (0.3809524dp)\n" + - "\tcellScaleToFit : 1.0px (0.3809524dp)\n" + - "\textraSpace: 849.0px (323.42856dp)\n" + - "\tunscaled extraSpace: 849.0px (323.42856dp)\n" + - "\tmaxEmptySpace: 0.0px (0.0dp)\n" + - "\tworkspaceTopPadding: 0.0px (0.0dp)\n" + - "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 0.0px (0.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 168.0px (64.0dp)\n" + - "\tdropTargetBarSizePx: 147.0px (56.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 42.0px (16.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 490.0px (186.66667dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 1770.0px (674.2857dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.7437536px (0.2833347dp)\n" + - "\tgetCellLayoutHeight(): 1721.0px (655.619dp)\n" + - "\tgetCellLayoutWidth(): 899.0px (342.4762dp)\n" - ) + assertDump(dp, "twoPanelPortrait3Button") } @Test @@ -1564,147 +146,17 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { val dp = getDeviceProfileForGrid("4_by_4") dp.isTaskbarPresentInApps = true - assertThat(dump(dp)) - .isEqualTo( - "DeviceProfile:\n" + - "\t1 dp = 2.625 px\n" + - "\tisTablet:true\n" + - "\tisPhone:false\n" + - "\ttransposeLayoutWithOrientation:false\n" + - "\tisGestureMode:true\n" + - "\tisLandscape:false\n" + - "\tisMultiWindowMode:false\n" + - "\tisTwoPanels:true\n" + - "\twindowX: 0.0px (0.0dp)\n" + - "\twindowY: 0.0px (0.0dp)\n" + - "\twidthPx: 1840.0px (700.9524dp)\n" + - "\theightPx: 2208.0px (841.1429dp)\n" + - "\tavailableWidthPx: 1840.0px (700.9524dp)\n" + - "\tavailableHeightPx: 2075.0px (790.4762dp)\n" + - "\tmInsets.left: 0.0px (0.0dp)\n" + - "\tmInsets.top: 133.0px (50.666668dp)\n" + - "\tmInsets.right: 0.0px (0.0dp)\n" + - "\tmInsets.bottom: 0.0px (0.0dp)\n" + - "\taspectRatio:1.2\n" + - "\tisResponsiveGrid:false\n" + - "\tisScalableGrid:false\n" + - "\tinv.numRows: 4\n" + - "\tinv.numColumns: 4\n" + - "\tinv.numSearchContainerColumns: 4\n" + - "\tminCellSize: PointF(0.0, 0.0)dp\n" + - "\tcellWidthPx: 154.0px (58.666668dp)\n" + - "\tcellHeightPx: 218.0px (83.04762dp)\n" + - "\tgetCellSize().x: 224.0px (85.333336dp)\n" + - "\tgetCellSize().y: 430.0px (163.80952dp)\n" + - "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + - "\tcellLayoutBorderSpacePx Vertical: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.left: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.top: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.right: 0.0px (0.0dp)\n" + - "\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" + - "\ticonSizePx: 141.0px (53.714287dp)\n" + - "\ticonTextSizePx: 34.0px (12.952381dp)\n" + - "\ticonDrawablePaddingPx: 13.0px (4.952381dp)\n" + - "\tinv.numFolderRows: 3\n" + - "\tinv.numFolderColumns: 4\n" + - "\tfolderCellWidthPx: 189.0px (72.0dp)\n" + - "\tfolderCellHeightPx: 219.0px (83.42857dp)\n" + - "\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" + - "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + - "\tfolderChildDrawablePaddingPx: 5.0px (1.9047619dp)\n" + - "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + - "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + - "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + - "\tfolderTopPadding: 63.0px (24.0dp)\n" + - "\tfolderFooterHeight: 147.0px (56.0dp)\n" + - "\tbottomSheetTopPadding: 133.0px (50.666668dp)\n" + - "\tbottomSheetOpenDuration: 500\n" + - "\tbottomSheetCloseDuration: 500\n" + - "\tbottomSheetWorkspaceScale: 0.97\n" + - "\tbottomSheetDepth: 1.0\n" + - "\tallAppsShiftRange: 1826.0px (695.619dp)\n" + - "\tallAppsTopPadding: 382.0px (145.5238dp)\n" + - "\tallAppsOpenDuration: 500\n" + - "\tallAppsCloseDuration: 500\n" + - "\tallAppsIconSizePx: 141.0px (53.714287dp)\n" + - "\tallAppsIconTextSizePx: 34.0px (12.952381dp)\n" + - "\tallAppsIconDrawablePaddingPx: 21.0px (8.0dp)\n" + - "\tallAppsCellHeightPx: 315.0px (120.0dp)\n" + - "\tallAppsCellWidthPx: 183.0px (69.71429dp)\n" + - "\tallAppsBorderSpacePxX: 42.0px (16.0dp)\n" + - "\tallAppsBorderSpacePxY: 42.0px (16.0dp)\n" + - "\tnumShownAllAppsColumns: 8\n" + - "\tallAppsLeftRightPadding: 42.0px (16.0dp)\n" + - "\tallAppsLeftRightMargin: 1.0px (0.3809524dp)\n" + - "\thotseatBarSizePx: 267.0px (101.71429dp)\n" + - "\tinv.hotseatColumnSpan: 4\n" + - "\thotseatCellHeightPx: 159.0px (60.57143dp)\n" + - "\thotseatBarBottomSpacePx: 126.0px (48.0dp)\n" + - "\thotseatBarSidePaddingStartPx: 0.0px (0.0dp)\n" + - "\thotseatBarSidePaddingEndPx: 0.0px (0.0dp)\n" + - "\thotseatBarEndOffset: 0.0px (0.0dp)\n" + - "\thotseatQsbSpace: 0.0px (0.0dp)\n" + - "\thotseatQsbHeight: 0.0px (0.0dp)\n" + - "\tspringLoadedHotseatBarTopMarginPx: 171.0px (65.14286dp)\n" + - "\tgetHotseatLayoutPadding(context).top: 0.0px (0.0dp)\n" + - "\tgetHotseatLayoutPadding(context).bottom: 108.0px (41.142857dp)\n" + - "\tgetHotseatLayoutPadding(context).left: 98.0px (37.333332dp)\n" + - "\tgetHotseatLayoutPadding(context).right: 98.0px (37.333332dp)\n" + - "\tnumShownHotseatIcons: 6\n" + - "\thotseatBorderSpace: 0.0px (0.0dp)\n" + - "\tisQsbInline: false\n" + - "\thotseatQsbWidth: 0.0px (0.0dp)\n" + - "\tisTaskbarPresent:false\n" + - "\tisTaskbarPresentInApps:true\n" + - "\ttaskbarHeight: 0.0px (0.0dp)\n" + - "\tstashedTaskbarHeight: 0.0px (0.0dp)\n" + - "\ttaskbarBottomMargin: 0.0px (0.0dp)\n" + - "\ttaskbarIconSize: 0.0px (0.0dp)\n" + - "\tdesiredWorkspaceHorizontalMarginPx: 21.0px (8.0dp)\n" + - "\tworkspacePadding.left: 21.0px (8.0dp)\n" + - "\tworkspacePadding.top: 24.0px (9.142858dp)\n" + - "\tworkspacePadding.right: 21.0px (8.0dp)\n" + - "\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" + - "\ticonScale: 1.0px (0.3809524dp)\n" + - "\tcellScaleToFit : 1.0px (0.3809524dp)\n" + - "\textraSpace: 849.0px (323.42856dp)\n" + - "\tunscaled extraSpace: 849.0px (323.42856dp)\n" + - "\tmaxEmptySpace: 0.0px (0.0dp)\n" + - "\tworkspaceTopPadding: 0.0px (0.0dp)\n" + - "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + - "\toverviewTaskMarginPx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizePx: 0.0px (0.0dp)\n" + - "\toverviewTaskIconDrawableSizeGridPx: 0.0px (0.0dp)\n" + - "\toverviewTaskThumbnailTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsTopMarginPx: 0.0px (0.0dp)\n" + - "\toverviewActionsHeight: 0.0px (0.0dp)\n" + - "\toverviewActionsClaimedSpaceBelow: 0.0px (0.0dp)\n" + - "\toverviewActionsButtonSpacing: 0.0px (0.0dp)\n" + - "\toverviewPageSpacing: 0.0px (0.0dp)\n" + - "\toverviewRowSpacing: 0.0px (0.0dp)\n" + - "\toverviewGridSideMargin: 0.0px (0.0dp)\n" + - "\tdropTargetBarTopMarginPx: 168.0px (64.0dp)\n" + - "\tdropTargetBarSizePx: 147.0px (56.0dp)\n" + - "\tdropTargetBarBottomMarginPx: 42.0px (16.0dp)\n" + - "\tgetCellLayoutSpringLoadShrunkTop(): 490.0px (186.66667dp)\n" + - "\tgetCellLayoutSpringLoadShrunkBottom(): 1770.0px (674.2857dp)\n" + - "\tworkspaceSpringLoadedMinNextPageVisiblePx: 63.0px (24.0dp)\n" + - "\tgetWorkspaceSpringLoadScale(): 0.7437536px (0.2833347dp)\n" + - "\tgetCellLayoutHeight(): 1721.0px (655.619dp)\n" + - "\tgetCellLayoutWidth(): 899.0px (342.4762dp)\n" - ) + assertDump(dp, "twoPanelPortrait") } private fun getDeviceProfileForGrid(gridName: String): DeviceProfile { return InvariantDeviceProfile(context, gridName).getDeviceProfile(context) } - private fun dump(dp: DeviceProfile): String { - val stringWriter = StringWriter() - val printWriter = PrintWriter(stringWriter) - dp.dump(context, "", printWriter) - printWriter.flush() - return stringWriter.toString() + private fun assertDump(dp: DeviceProfile, filename: String) { + val dump = dump(context!!, dp, "${folderName}_$filename.txt") + val expected = readDumpFromAssets(testContext, "$folderName/$filename.txt") + + assertThat(dump).isEqualTo(expected) } } diff --git a/tests/src/com/android/launcher3/responsive/CalculatedHotseatSpecTest.kt b/tests/src/com/android/launcher3/responsive/CalculatedHotseatSpecTest.kt index 0ecf7bae5a..58650361c4 100644 --- a/tests/src/com/android/launcher3/responsive/CalculatedHotseatSpecTest.kt +++ b/tests/src/com/android/launcher3/responsive/CalculatedHotseatSpecTest.kt @@ -50,6 +50,7 @@ class CalculatedHotseatSpecTest : AbstractDeviceProfileTest() { assertThat(heightSpec.availableSpace).isEqualTo(availableHeight) assertThat(heightSpec.hotseatQsbSpace).isEqualTo(95) + assertThat(heightSpec.edgePadding).isEqualTo(126) } /** @@ -71,5 +72,27 @@ class CalculatedHotseatSpecTest : AbstractDeviceProfileTest() { assertThat(heightSpec.availableSpace).isEqualTo(availableHeight) assertThat(heightSpec.hotseatQsbSpace).isEqualTo(81) + assertThat(heightSpec.edgePadding).isEqualTo(162) + } + + /** + * This test tests: + * - (width spec) gets the correct breakpoint from the XML - skips the first breakpoint + */ + @Test + fun normalPhoneLandscape_returnsSecondBreakpointSpec() { + val deviceSpec = deviceSpecs["phone"]!! + initializeVarsForPhone(deviceSpec, isVerticalBar = true) + + // Hotseat uses the whole device width + val availableWidth = deviceSpec.naturalSize.second + + val hotseatSpecs = + HotseatSpecs.create(TestResourceHelper(context!!, TestR.xml.valid_hotseat_land_file)) + val widthSpec = hotseatSpecs.getCalculatedWidthSpec(availableWidth) + + assertThat(widthSpec.availableSpace).isEqualTo(availableWidth) + assertThat(widthSpec.hotseatQsbSpace).isEqualTo(0) + assertThat(widthSpec.edgePadding).isEqualTo(168) } } diff --git a/tests/src/com/android/launcher3/responsive/HotseatSpecsTest.kt b/tests/src/com/android/launcher3/responsive/HotseatSpecsTest.kt index c764e47526..f650e91d11 100644 --- a/tests/src/com/android/launcher3/responsive/HotseatSpecsTest.kt +++ b/tests/src/com/android/launcher3/responsive/HotseatSpecsTest.kt @@ -23,7 +23,6 @@ import androidx.test.platform.app.InstrumentationRegistry import com.android.launcher3.AbstractDeviceProfileTest import com.android.launcher3.tests.R as TestR import com.android.launcher3.util.TestResourceHelper -import com.android.systemui.util.dpToPx import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test @@ -43,25 +42,55 @@ class HotseatSpecsTest : AbstractDeviceProfileTest() { fun parseValidFile() { val hotseatSpecs = HotseatSpecs.create(TestResourceHelper(context!!, TestR.xml.valid_hotseat_file)) - assertThat(hotseatSpecs.specs.size).isEqualTo(2) - val expectedSpecs = + val expectedHeightSpecs = listOf( HotseatSpec( maxAvailableSize = 847.dpToPx(), specType = ResponsiveSpec.SpecType.HEIGHT, - hotseatQsbSpace = SizeSpec(24f.dpToPx()) + hotseatQsbSpace = SizeSpec(24f.dpToPx()), + edgePadding = SizeSpec(48f.dpToPx()) ), HotseatSpec( maxAvailableSize = 9999.dpToPx(), specType = ResponsiveSpec.SpecType.HEIGHT, - hotseatQsbSpace = SizeSpec(36f.dpToPx()) + hotseatQsbSpace = SizeSpec(36f.dpToPx()), + edgePadding = SizeSpec(48f.dpToPx()) ), ) - assertThat(hotseatSpecs.specs.size).isEqualTo(expectedSpecs.size) - assertThat(hotseatSpecs.specs[0]).isEqualTo(expectedSpecs[0]) - assertThat(hotseatSpecs.specs[1]).isEqualTo(expectedSpecs[1]) + assertThat(hotseatSpecs.heightSpecs.size).isEqualTo(expectedHeightSpecs.size) + assertThat(hotseatSpecs.heightSpecs[0]).isEqualTo(expectedHeightSpecs[0]) + assertThat(hotseatSpecs.heightSpecs[1]).isEqualTo(expectedHeightSpecs[1]) + + assertThat(hotseatSpecs.widthSpecs.size).isEqualTo(0) + } + + @Test + fun parseValidLandscapeFile() { + val hotseatSpecs = + HotseatSpecs.create(TestResourceHelper(context!!, TestR.xml.valid_hotseat_land_file)) + assertThat(hotseatSpecs.heightSpecs.size).isEqualTo(0) + + val expectedWidthSpecs = + listOf( + HotseatSpec( + maxAvailableSize = 743.dpToPx(), + specType = ResponsiveSpec.SpecType.WIDTH, + hotseatQsbSpace = SizeSpec(0f), + edgePadding = SizeSpec(48f.dpToPx()) + ), + HotseatSpec( + maxAvailableSize = 9999.dpToPx(), + specType = ResponsiveSpec.SpecType.WIDTH, + hotseatQsbSpace = SizeSpec(0f), + edgePadding = SizeSpec(64f.dpToPx()) + ), + ) + + assertThat(hotseatSpecs.widthSpecs.size).isEqualTo(expectedWidthSpecs.size) + assertThat(hotseatSpecs.widthSpecs[0]).isEqualTo(expectedWidthSpecs[0]) + assertThat(hotseatSpecs.widthSpecs[1]).isEqualTo(expectedWidthSpecs[1]) } @Test(expected = IllegalStateException::class)