From 1cfe6d490adec80a5d4fc53559ac2619fac3c5f4 Mon Sep 17 00:00:00 2001 From: Jeremy Sim Date: Fri, 15 Jul 2022 14:40:38 -0700 Subject: [PATCH] Update calculation method for Overview UI placement on tablets This update slightly changes the calculation method for Overview UI placement, in order to line up better with spec. (The previous calculation caused a small 30dp divergence on tablets.) Bug: 236760307 Test: Manual by measuring pixels and comparing to spec Change-Id: I94e9e7b5a6a24c37693425ac8ec71cd066003658 --- quickstep/res/values-sw600dp/dimens.xml | 11 +++++++++-- quickstep/res/values-sw720dp/dimens.xml | 13 +++++++++++-- quickstep/res/values/dimens.xml | 19 ++++++++++++------- .../com/android/quickstep/views/TaskView.java | 7 +++---- .../DeviceProfilePhone3ButtonTest.kt | 9 ++------- .../quickstep/DeviceProfilePhoneTest.kt | 9 ++------- ...DeviceProfileTabletLandscape3ButtonTest.kt | 9 ++------- .../DeviceProfileTabletLandscapeTest.kt | 9 ++------- .../DeviceProfileTabletPortrait3ButtonTest.kt | 9 ++------- .../DeviceProfileTabletPortraitTest.kt | 9 ++------- ...viceProfileTwoPanelLandscape3ButtonTest.kt | 9 ++------- .../DeviceProfileTwoPanelLandscapeTest.kt | 9 ++------- ...eviceProfileTwoPanelPortrait3ButtonTest.kt | 9 ++------- .../DeviceProfileTwoPanelPortraitTest.kt | 9 ++------- .../DeviceProfileVerticalBar3ButtonTest.kt | 9 ++------- .../quickstep/DeviceProfileVerticalBarTest.kt | 9 ++------- res/values/dimens.xml | 1 - src/com/android/launcher3/DeviceProfile.java | 13 ++----------- .../touch/LandscapePagedViewHandler.java | 1 + .../touch/PortraitPagedViewHandler.java | 5 +++-- .../touch/SeascapePagedViewHandler.java | 1 + 21 files changed, 66 insertions(+), 113 deletions(-) diff --git a/quickstep/res/values-sw600dp/dimens.xml b/quickstep/res/values-sw600dp/dimens.xml index 7494683880..cfbbf8dbf3 100644 --- a/quickstep/res/values-sw600dp/dimens.xml +++ b/quickstep/res/values-sw600dp/dimens.xml @@ -14,16 +14,23 @@ * limitations under the License. */ --> + 25dp - + + 48dp + 44dp + 12dp + 44dp - 12dp + 28dp + 36dp + 64dp diff --git a/quickstep/res/values-sw720dp/dimens.xml b/quickstep/res/values-sw720dp/dimens.xml index ceaa8f866b..284ce11582 100644 --- a/quickstep/res/values-sw720dp/dimens.xml +++ b/quickstep/res/values-sw720dp/dimens.xml @@ -14,14 +14,23 @@ * limitations under the License. */ --> + - + + + 0.7 + 48dp + 44dp + 16dp + 44dp - 16dp + 36dp + 44dp + 64dp diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 0232f8652c..35215e1ad7 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -31,14 +31,19 @@ 50dp - - 48dp - 44dp - 16dp - 16dp - 72dp - + + 0.7 + + 48dp + + 44dp + + 16dp + + 16dp + + 72dp 1.1 diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 5602d8889c..d52faada7c 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -866,10 +866,9 @@ public class TaskView extends FrameLayout implements Reusable { int thumbnailTopMargin = deviceProfile.overviewTaskThumbnailTopMarginPx; int taskIconHeight = deviceProfile.overviewTaskIconSizePx; - int taskMargin = isGridTask ? deviceProfile.overviewTaskMarginGridPx - : deviceProfile.overviewTaskMarginPx; - int taskIconMargin = thumbnailTopMargin - taskIconHeight - taskMargin; - orientationHandler.setTaskIconParams(iconParams, taskIconMargin, taskIconHeight, + int taskMargin = deviceProfile.overviewTaskMarginPx; + + orientationHandler.setTaskIconParams(iconParams, taskMargin, taskIconHeight, thumbnailTopMargin, isRtl); iconParams.width = iconParams.height = taskIconHeight; mIconView.setLayoutParams(iconParams); diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfilePhone3ButtonTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfilePhone3ButtonTest.kt index 3daf81d8a6..f41de7213c 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfilePhone3ButtonTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfilePhone3ButtonTest.kt @@ -339,11 +339,6 @@ class DeviceProfilePhone3ButtonTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(56) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(0) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(168) @@ -361,7 +356,7 @@ class DeviceProfilePhone3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(280) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(224) } @Test @@ -386,7 +381,7 @@ class DeviceProfilePhone3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(-112) + assertThat(dp.overviewRowSpacing).isEqualTo(0) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfilePhoneTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfilePhoneTest.kt index e588c71277..fe3fd00623 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfilePhoneTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfilePhoneTest.kt @@ -339,11 +339,6 @@ class DeviceProfilePhoneTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(56) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(0) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(168) @@ -361,7 +356,7 @@ class DeviceProfilePhoneTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(280) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(224) } @Test @@ -386,7 +381,7 @@ class DeviceProfilePhoneTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(-112) + assertThat(dp.overviewRowSpacing).isEqualTo(0) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletLandscape3ButtonTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletLandscape3ButtonTest.kt index d0c9346e5a..33866f09f2 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletLandscape3ButtonTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletLandscape3ButtonTest.kt @@ -339,11 +339,6 @@ class DeviceProfileTabletLandscape3ButtonTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(32) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(32) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(96) @@ -361,7 +356,7 @@ class DeviceProfileTabletLandscape3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(160) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(128) } @Test @@ -386,7 +381,7 @@ class DeviceProfileTabletLandscape3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(40) + assertThat(dp.overviewRowSpacing).isEqualTo(72) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletLandscapeTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletLandscapeTest.kt index 456ed2cfc0..e61a8900cb 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletLandscapeTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletLandscapeTest.kt @@ -339,11 +339,6 @@ class DeviceProfileTabletLandscapeTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(32) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(32) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(96) @@ -361,7 +356,7 @@ class DeviceProfileTabletLandscapeTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(160) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(128) } @Test @@ -386,7 +381,7 @@ class DeviceProfileTabletLandscapeTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(40) + assertThat(dp.overviewRowSpacing).isEqualTo(72) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletPortrait3ButtonTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletPortrait3ButtonTest.kt index eed359896f..3f350debd8 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletPortrait3ButtonTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletPortrait3ButtonTest.kt @@ -339,11 +339,6 @@ class DeviceProfileTabletPortrait3ButtonTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(32) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(32) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(96) @@ -361,7 +356,7 @@ class DeviceProfileTabletPortrait3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(160) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(128) } @Test @@ -386,7 +381,7 @@ class DeviceProfileTabletPortrait3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(40) + assertThat(dp.overviewRowSpacing).isEqualTo(72) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletPortraitTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletPortraitTest.kt index 4be3e45dce..444f7ea063 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletPortraitTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileTabletPortraitTest.kt @@ -339,11 +339,6 @@ class DeviceProfileTabletPortraitTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(32) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(32) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(96) @@ -361,7 +356,7 @@ class DeviceProfileTabletPortraitTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(160) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(128) } @Test @@ -386,7 +381,7 @@ class DeviceProfileTabletPortraitTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(40) + assertThat(dp.overviewRowSpacing).isEqualTo(72) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelLandscape3ButtonTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelLandscape3ButtonTest.kt index 6728540f71..92ab2b1616 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelLandscape3ButtonTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelLandscape3ButtonTest.kt @@ -339,11 +339,6 @@ class DeviceProfileTwoPanelLandscape3ButtonTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(32) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(32) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(96) @@ -361,7 +356,7 @@ class DeviceProfileTwoPanelLandscape3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(160) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(128) } @Test @@ -386,7 +381,7 @@ class DeviceProfileTwoPanelLandscape3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(40) + assertThat(dp.overviewRowSpacing).isEqualTo(72) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelLandscapeTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelLandscapeTest.kt index ba3ef55e3c..6c730ca082 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelLandscapeTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelLandscapeTest.kt @@ -339,11 +339,6 @@ class DeviceProfileTwoPanelLandscapeTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(32) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(32) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(96) @@ -361,7 +356,7 @@ class DeviceProfileTwoPanelLandscapeTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(160) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(128) } @Test @@ -386,7 +381,7 @@ class DeviceProfileTwoPanelLandscapeTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(40) + assertThat(dp.overviewRowSpacing).isEqualTo(72) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelPortrait3ButtonTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelPortrait3ButtonTest.kt index a4b446aea1..9048b3b920 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelPortrait3ButtonTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelPortrait3ButtonTest.kt @@ -339,11 +339,6 @@ class DeviceProfileTwoPanelPortrait3ButtonTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(32) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(32) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(96) @@ -361,7 +356,7 @@ class DeviceProfileTwoPanelPortrait3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(160) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(128) } @Test @@ -386,7 +381,7 @@ class DeviceProfileTwoPanelPortrait3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(40) + assertThat(dp.overviewRowSpacing).isEqualTo(72) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelPortraitTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelPortraitTest.kt index 0c5968e1ef..b737c3adb1 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelPortraitTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileTwoPanelPortraitTest.kt @@ -339,11 +339,6 @@ class DeviceProfileTwoPanelPortraitTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(32) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(32) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(96) @@ -361,7 +356,7 @@ class DeviceProfileTwoPanelPortraitTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(160) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(128) } @Test @@ -386,7 +381,7 @@ class DeviceProfileTwoPanelPortraitTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(40) + assertThat(dp.overviewRowSpacing).isEqualTo(72) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileVerticalBar3ButtonTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileVerticalBar3ButtonTest.kt index 2bad6bb20b..d90f56b416 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileVerticalBar3ButtonTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileVerticalBar3ButtonTest.kt @@ -339,11 +339,6 @@ class DeviceProfileVerticalBar3ButtonTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(56) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(0) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(168) @@ -361,7 +356,7 @@ class DeviceProfileVerticalBar3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(280) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(224) } @Test @@ -386,7 +381,7 @@ class DeviceProfileVerticalBar3ButtonTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(-112) + assertThat(dp.overviewRowSpacing).isEqualTo(0) } @Test diff --git a/quickstep/tests/src/com/android/quickstep/DeviceProfileVerticalBarTest.kt b/quickstep/tests/src/com/android/quickstep/DeviceProfileVerticalBarTest.kt index 6256a43f75..522a65074e 100644 --- a/quickstep/tests/src/com/android/quickstep/DeviceProfileVerticalBarTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DeviceProfileVerticalBarTest.kt @@ -339,11 +339,6 @@ class DeviceProfileVerticalBarTest : DeviceProfileBaseTest() { assertThat(dp.overviewTaskMarginPx).isEqualTo(56) } - @Test - fun overviewTaskMarginGridPx() { - assertThat(dp.overviewTaskMarginGridPx).isEqualTo(0) - } - @Test fun overviewTaskIconSizePx() { assertThat(dp.overviewTaskIconSizePx).isEqualTo(168) @@ -361,7 +356,7 @@ class DeviceProfileVerticalBarTest : DeviceProfileBaseTest() { @Test fun overviewTaskThumbnailTopMarginPx() { - assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(280) + assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(224) } @Test @@ -386,7 +381,7 @@ class DeviceProfileVerticalBarTest : DeviceProfileBaseTest() { @Test fun overviewRowSpacing() { - assertThat(dp.overviewRowSpacing).isEqualTo(-112) + assertThat(dp.overviewRowSpacing).isEqualTo(0) } @Test diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b19e73920b..29bc170e5d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -381,7 +381,6 @@ 0dp 0dp 0dp - 0dp 0dp 0dp 0dp diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 3a2227afe4..3611b8a180 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -191,7 +191,6 @@ public class DeviceProfile { // Overview public int overviewTaskMarginPx; - public int overviewTaskMarginGridPx; public int overviewTaskIconSizePx; public int overviewTaskIconDrawableSizePx; public int overviewTaskIconDrawableSizeGridPx; @@ -426,25 +425,18 @@ public class DeviceProfile { } overviewTaskMarginPx = res.getDimensionPixelSize(R.dimen.overview_task_margin); - overviewTaskMarginGridPx = res.getDimensionPixelSize(R.dimen.overview_task_margin_grid); overviewTaskIconSizePx = res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_size); overviewTaskIconDrawableSizePx = res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_drawable_size); overviewTaskIconDrawableSizeGridPx = res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_drawable_size_grid); - overviewTaskThumbnailTopMarginPx = overviewTaskIconSizePx + overviewTaskMarginPx * 2; + overviewTaskThumbnailTopMarginPx = overviewTaskIconSizePx + overviewTaskMarginPx; overviewActionsTopMarginPx = res.getDimensionPixelSize(R.dimen.overview_actions_top_margin); overviewPageSpacing = res.getDimensionPixelSize(R.dimen.overview_page_spacing); overviewActionsButtonSpacing = res.getDimensionPixelSize( R.dimen.overview_actions_button_spacing); overviewActionsHeight = res.getDimensionPixelSize(R.dimen.overview_actions_height); - // Grid task's top margin is only overviewTaskIconSizePx + overviewTaskMarginGridPx, but - // overviewTaskThumbnailTopMarginPx is applied to all TaskThumbnailView, so exclude the - // extra margin when calculating row spacing. - int extraTopMargin = overviewTaskThumbnailTopMarginPx - overviewTaskIconSizePx - - overviewTaskMarginGridPx; - overviewRowSpacing = res.getDimensionPixelSize(R.dimen.overview_grid_row_spacing) - - extraTopMargin; + overviewRowSpacing = res.getDimensionPixelSize(R.dimen.overview_grid_row_spacing); overviewGridSideMargin = res.getDimensionPixelSize(R.dimen.overview_grid_side_margin); // Calculate all of the remaining variables. @@ -1379,7 +1371,6 @@ public class DeviceProfile { writer.println(prefix + pxToDpStr("workspaceBottomPadding", workspaceBottomPadding)); writer.println(prefix + pxToDpStr("overviewTaskMarginPx", overviewTaskMarginPx)); - writer.println(prefix + pxToDpStr("overviewTaskMarginGridPx", overviewTaskMarginGridPx)); writer.println(prefix + pxToDpStr("overviewTaskIconSizePx", overviewTaskIconSizePx)); writer.println(prefix + pxToDpStr("overviewTaskIconDrawableSizePx", overviewTaskIconDrawableSizePx)); diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java index fa4eb7036c..e3cdee4b30 100644 --- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java +++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java @@ -523,6 +523,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { iconParams.rightMargin = -taskIconHeight - taskIconMargin / 2; iconParams.leftMargin = 0; iconParams.topMargin = thumbnailTopMargin / 2; + iconParams.bottomMargin = 0; } @Override diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java index 181dca56ee..738e6b1886 100644 --- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java +++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java @@ -52,9 +52,9 @@ import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.SplitConfigurationOptions; +import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; -import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.views.BaseDragLayer; import java.util.List; @@ -658,8 +658,9 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { public void setTaskIconParams(FrameLayout.LayoutParams iconParams, int taskIconMargin, int taskIconHeight, int thumbnailTopMargin, boolean isRtl) { iconParams.gravity = TOP | CENTER_HORIZONTAL; + // Reset margins, since they may have been set on rotation iconParams.leftMargin = iconParams.rightMargin = 0; - iconParams.topMargin = taskIconMargin; + iconParams.topMargin = iconParams.bottomMargin = 0; } @Override diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java index 339f9103a7..387e980320 100644 --- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java +++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java @@ -216,6 +216,7 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler { iconParams.leftMargin = -taskIconHeight - taskIconMargin / 2; iconParams.rightMargin = 0; iconParams.topMargin = thumbnailTopMargin / 2; + iconParams.bottomMargin = 0; } @Override