Merge "Add DeviceProfile tests on all attributes across different configurations." into tm-qpr-dev (e700efde) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import com.android.launcher3.R;
		import com.android.launcher3.anim.Interpolators;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.model.data.WorkspaceItemInfo;
		import com.android.launcher3.uioverrides.ApiWrapper;
		import com.android.launcher3.uioverrides.PredictedAppIcon;
		import com.android.launcher3.views.AbstractSlideInView;

		@@ -107,8 +106,7 @@ public class HotseatEduDialog extends AbstractSlideInView<Launcher> implements I
		mDismissBtn.setOnClickListener(this::onDismiss);

		LinearLayout buttonContainer = findViewById(R.id.button_container);
		int adjustedMarginEnd = ApiWrapper.getHotseatEndOffset(context)
		- buttonContainer.getPaddingEnd();
		int adjustedMarginEnd = grid.hotseatBarEndOffset - buttonContainer.getPaddingEnd();
		if (InvariantDeviceProfile.INSTANCE.get(context)
		.getDeviceProfile(context).isTaskbarPresent && adjustedMarginEnd > 0) {
		((LinearLayout.LayoutParams) buttonContainer.getLayoutParams()).setMarginEnd(

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import com.android.launcher3.icons.ThemedIconDrawable;
		import com.android.launcher3.model.data.FolderInfo;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.model.data.WorkspaceItemInfo;
		import com.android.launcher3.uioverrides.ApiWrapper;
		import com.android.launcher3.util.LauncherBindableItemsContainer;
		import com.android.launcher3.views.ActivityContext;
		import com.android.launcher3.views.AllAppsButton;
		@@ -292,7 +291,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
		countExcludingQsb--;
		}
		int spaceNeeded = countExcludingQsb * (mItemMarginLeftRight * 2 + mIconTouchSize);
		int navSpaceNeeded = ApiWrapper.getHotseatEndOffset(getContext());
		int navSpaceNeeded = deviceProfile.hotseatBarEndOffset;
		boolean layoutRtl = isLayoutRtl();
		int iconEnd = right - (right - left - spaceNeeded) / 2;
		boolean needMoreSpaceForNav = layoutRtl ?

quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java

+0 −25

Original line number	Diff line number	Diff line
		@@ -17,14 +17,9 @@
		package com.android.launcher3.uioverrides;

		import android.app.Person;
		import android.content.Context;
		import android.content.pm.ShortcutInfo;
		import android.content.res.Resources;

		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.util.DisplayController;
		import com.android.launcher3.util.DisplayController.NavigationMode;

		public class ApiWrapper {

		@@ -34,24 +29,4 @@ public class ApiWrapper {
		Person[] persons = si.getPersons();
		return persons == null ? Utilities.EMPTY_PERSON_ARRAY : persons;
		}

		/**
		* Returns the minimum space that should be left empty at the end of hotseat
		*/
		public static int getHotseatEndOffset(Context context) {
		if (DisplayController.getNavigationMode(context) == NavigationMode.THREE_BUTTONS) {
		Resources res = context.getResources();
		/*
		* 3 nav buttons +
		* Little space at the end for contextual buttons +
		* Little space between icons and nav buttons
		*/
		return 3 * res.getDimensionPixelSize(R.dimen.taskbar_nav_buttons_size)
		+ res.getDimensionPixelSize(R.dimen.taskbar_contextual_button_margin)
		+ res.getDimensionPixelSize(R.dimen.taskbar_hotseat_nav_spacing);
		} else {
		return 0;
		}

		}
		}

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import androidx.annotation.Nullable;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.Insettable;
		import com.android.launcher3.R;
		import com.android.launcher3.uioverrides.ApiWrapper;
		import com.android.launcher3.util.DisplayController;
		import com.android.launcher3.util.DisplayController.NavigationMode;
		import com.android.launcher3.util.MultiValueAlpha;
		@@ -206,10 +205,9 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
		if (mDp == null) {
		return;
		}
		boolean alignFor3ButtonTaskbar = mDp.isTaskbarPresent && !mDp.isGestureMode;
		if (alignFor3ButtonTaskbar) {
		if (mDp.areNavButtonsInline) {
		// Add extra horizontal spacing
		int additionalPadding = ApiWrapper.getHotseatEndOffset(getContext());
		int additionalPadding = mDp.hotseatBarEndOffset;
		if (isLayoutRtl()) {
		setPadding(mInsets.left + additionalPadding, 0, mInsets.right, 0);
		} else {

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

0 → 100644

+486 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.quickstep

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.launcher3.DeviceProfile
		import com.android.launcher3.DeviceProfileBaseTest
		import com.google.common.truth.Truth.assertThat
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith

		/**
		* Tests for DeviceProfile for phone with 3-Button navigation.
		*/
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class DeviceProfilePhone3ButtonTest : DeviceProfileBaseTest() {

		lateinit var dp: DeviceProfile

		@Before
		fun before() {
		initializeVarsForPhone(isGestureMode = false)
		dp = newDP()
		}

		@Test
		fun isScalableGrid() {
		assertThat(dp.isScalableGrid).isTrue()
		}

		@Test
		fun cellWidthPx() {
		assertThat(dp.cellWidthPx).isEqualTo(265)
		}

		@Test
		fun cellHeightPx() {
		assertThat(dp.cellHeightPx).isEqualTo(343)
		}

		@Test
		fun getCellSizeX() {
		assertThat(dp.getCellSize().x).isEqualTo(265)
		}

		@Test
		fun getCellSizeY() {
		assertThat(dp.getCellSize().y).isEqualTo(552)
		}

		@Test
		fun cellLayoutBorderSpacePxX() {
		assertThat(dp.cellLayoutBorderSpacePx.x).isEqualTo(66)
		}

		@Test
		fun cellLayoutBorderSpacePxY() {
		assertThat(dp.cellLayoutBorderSpacePx.y).isEqualTo(66)
		}

		@Test
		fun cellLayoutPaddingPxLeft() {
		assertThat(dp.cellLayoutPaddingPx.left).isEqualTo(38)
		}

		@Test
		fun cellLayoutPaddingPxTop() {
		assertThat(dp.cellLayoutPaddingPx.top).isEqualTo(0)
		}

		@Test
		fun cellLayoutPaddingPxRight() {
		assertThat(dp.cellLayoutPaddingPx.right).isEqualTo(38)
		}

		@Test
		fun cellLayoutPaddingPxBottom() {
		assertThat(dp.cellLayoutPaddingPx.bottom).isEqualTo(38)
		}

		@Test
		fun iconSizePx() {
		assertThat(dp.iconSizePx).isEqualTo(196)
		}

		@Test
		fun iconTextSizePx() {
		assertThat(dp.iconTextSizePx).isEqualTo(49)
		}

		@Test
		fun iconDrawablePaddingPx() {
		assertThat(dp.iconDrawablePaddingPx).isEqualTo(25)
		}

		@Test
		fun folderCellWidthPx() {
		assertThat(dp.folderCellWidthPx).isEqualTo(265)
		}

		@Test
		fun folderCellHeightPx() {
		assertThat(dp.folderCellHeightPx).isEqualTo(343)
		}

		@Test
		fun folderChildIconSizePx() {
		assertThat(dp.folderChildIconSizePx).isEqualTo(196)
		}

		@Test
		fun folderChildTextSizePx() {
		assertThat(dp.folderChildTextSizePx).isEqualTo(49)
		}

		@Test
		fun folderChildDrawablePaddingPx() {
		assertThat(dp.folderChildDrawablePaddingPx).isEqualTo(27)
		}

		@Test
		fun folderCellLayoutBorderSpaceOriginalPx() {
		assertThat(dp.folderCellLayoutBorderSpaceOriginalPx).isEqualTo(0)
		}

		@Test
		fun folderCellLayoutBorderSpacePxX() {
		assertThat(dp.folderCellLayoutBorderSpacePx.x).isEqualTo(0)
		}

		@Test
		fun folderCellLayoutBorderSpacePxY() {
		assertThat(dp.folderCellLayoutBorderSpacePx.y).isEqualTo(0)
		}

		@Test
		fun bottomSheetTopPadding() {
		assertThat(dp.bottomSheetTopPadding).isEqualTo(38)
		}

		@Test
		fun allAppsShiftRange() {
		assertThat(dp.allAppsShiftRange).isEqualTo(1050)
		}

		@Test
		fun allAppsTopPadding() {
		assertThat(dp.allAppsTopPadding).isEqualTo(0)
		}

		@Test
		fun allAppsIconSizePx() {
		assertThat(dp.allAppsIconSizePx).isEqualTo(232)
		}

		@Test
		fun allAppsIconTextSizePx() {
		assertThat(dp.allAppsIconTextSizePx).isEqualTo(58)
		}

		@Test
		fun allAppsIconDrawablePaddingPx() {
		assertThat(dp.allAppsIconDrawablePaddingPx).isEqualTo(25)
		}

		@Test
		fun allAppsCellHeightPx() {
		assertThat(dp.allAppsCellHeightPx).isEqualTo(409)
		}

		@Test
		fun allAppsCellWidthPx() {
		assertThat(dp.allAppsCellWidthPx).isEqualTo(265)
		}

		@Test
		fun allAppsBorderSpacePxX() {
		assertThat(dp.allAppsBorderSpacePx.x).isEqualTo(66)
		}

		@Test
		fun allAppsBorderSpacePxY() {
		assertThat(dp.allAppsBorderSpacePx.y).isEqualTo(66)
		}

		@Test
		fun numShownAllAppsColumns() {
		assertThat(dp.numShownAllAppsColumns).isEqualTo(0)
		}

		@Test
		fun allAppsLeftRightPadding() {
		assertThat(dp.allAppsLeftRightPadding).isEqualTo(91)
		}

		@Test
		fun allAppsLeftRightMargin() {
		assertThat(dp.allAppsLeftRightMargin).isEqualTo(0)
		}

		@Test
		fun hotseatBarSizePx() {
		assertThat(dp.hotseatBarSizePx).isEqualTo(669)
		}

		@Test
		fun hotseatCellHeightPx() {
		assertThat(dp.hotseatCellHeightPx).isEqualTo(221)
		}

		@Test
		fun hotseatBarBottomPaddingPx() {
		assertThat(dp.hotseatBarBottomSpacePx).isEqualTo(168)
		}

		@Test
		fun hotseatBarSidePaddingStartPx() {
		assertThat(dp.hotseatBarSidePaddingStartPx).isEqualTo(0)
		}

		@Test
		fun hotseatBarSidePaddingEndPx() {
		assertThat(dp.hotseatBarSidePaddingEndPx).isEqualTo(0)
		}

		@Test
		fun hotseatQsbSpace() {
		assertThat(dp.hotseatQsbSpace).isEqualTo(126)
		}

		@Test
		fun hotseatQsbHeight() {
		assertThat(dp.hotseatQsbHeight).isEqualTo(221)
		}

		@Test
		fun springLoadedHotseatBarTopMarginPx() {
		assertThat(dp.springLoadedHotseatBarTopMarginPx).isEqualTo(266)
		}

		@Test
		fun numShownHotseatIcons() {
		assertThat(dp.numShownHotseatIcons).isEqualTo(4)
		}

		@Test
		fun hotseatBorderSpace() {
		assertThat(dp.hotseatBorderSpace).isEqualTo(135)
		}

		@Test
		fun isQsbInline() {
		assertThat(dp.isQsbInline).isEqualTo(false)
		}

		@Test
		fun qsbWidth() {
		assertThat(dp.qsbWidth).isEqualTo(1189)
		}

		@Test
		fun isTaskbarPresent() {
		assertThat(dp.isTaskbarPresent).isEqualTo(false)
		}

		@Test
		fun isTaskbarPresentInApps() {
		assertThat(dp.isTaskbarPresentInApps).isEqualTo(false)
		}

		@Test
		fun taskbarSize() {
		assertThat(dp.taskbarSize).isEqualTo(0)
		}

		@Test
		fun desiredWorkspaceHorizontalMarginPx() {
		assertThat(dp.desiredWorkspaceHorizontalMarginPx).isEqualTo(91)
		}

		@Test
		fun workspacePaddingLeft() {
		assertThat(dp.workspacePadding.left).isEqualTo(53)
		}

		@Test
		fun workspacePaddingTop() {
		assertThat(dp.workspacePadding.top).isEqualTo(0)
		}

		@Test
		fun workspacePaddingRight() {
		assertThat(dp.workspacePadding.right).isEqualTo(53)
		}

		@Test
		fun workspacePaddingBottom() {
		assertThat(dp.workspacePadding.bottom).isEqualTo(573)
		}

		@Test
		fun iconScale() {
		assertThat(dp.iconScale).isEqualTo(1)
		}

		@Test
		fun cellScaleToFit() {
		assertThat(dp.cellScaleToFit).isEqualTo(1.182266f)
		}

		@Test
		fun workspaceTopPadding() {
		assertThat(dp.workspaceTopPadding).isEqualTo(0)
		}

		@Test
		fun workspaceBottomPadding() {
		assertThat(dp.workspaceBottomPadding).isEqualTo(0)
		}

		@Test
		fun overviewTaskMarginPx() {
		assertThat(dp.overviewTaskMarginPx).isEqualTo(56)
		}

		@Test
		fun overviewTaskMarginGridPx() {
		assertThat(dp.overviewTaskMarginGridPx).isEqualTo(0)
		}

		@Test
		fun overviewTaskIconSizePx() {
		assertThat(dp.overviewTaskIconSizePx).isEqualTo(168)
		}

		@Test
		fun overviewTaskIconDrawableSizePx() {
		assertThat(dp.overviewTaskIconDrawableSizePx).isEqualTo(154)
		}

		@Test
		fun overviewTaskIconDrawableSizeGridPx() {
		assertThat(dp.overviewTaskIconDrawableSizeGridPx).isEqualTo(0)
		}

		@Test
		fun overviewTaskThumbnailTopMarginPx() {
		assertThat(dp.overviewTaskThumbnailTopMarginPx).isEqualTo(280)
		}

		@Test
		fun overviewActionsTopMarginPx() {
		assertThat(dp.overviewActionsTopMarginPx).isEqualTo(84)
		}

		@Test
		fun overviewActionsHeight() {
		assertThat(dp.overviewActionsHeight).isEqualTo(168)
		}

		@Test
		fun overviewActionsButtonSpacing() {
		assertThat(dp.overviewActionsButtonSpacing).isEqualTo(126)
		}

		@Test
		fun overviewPageSpacing() {
		assertThat(dp.overviewPageSpacing).isEqualTo(56)
		}

		@Test
		fun overviewRowSpacing() {
		assertThat(dp.overviewRowSpacing).isEqualTo(-112)
		}

		@Test
		fun overviewGridSideMargin() {
		assertThat(dp.overviewGridSideMargin).isEqualTo(0)
		}

		@Test
		fun dropTargetBarTopMarginPx() {
		assertThat(dp.dropTargetBarTopMarginPx).isEqualTo(112)
		}

		@Test
		fun dropTargetBarSizePx() {
		assertThat(dp.dropTargetBarSizePx).isEqualTo(196)
		}

		@Test
		fun dropTargetBarBottomMarginPx() {
		assertThat(dp.dropTargetBarBottomMarginPx).isEqualTo(56)
		}

		@Test
		fun workspaceSpringLoadedMinNextPageVisiblePx() {
		assertThat(dp.workspaceSpringLoadedMinNextPageVisiblePx).isEqualTo(84)
		}

		@Test
		fun getWorkspaceSpringLoadScale() {
		assertThat(dp.workspaceSpringLoadScale).isEqualTo(0.74417657f)
		}

		@Test
		fun getCellLayoutHeight() {
		assertThat(dp.cellLayoutHeight).isEqualTo(2447)
		}

		@Test
		fun getCellLayoutWidth() {
		assertThat(dp.cellLayoutWidth).isEqualTo(1334)
		}

		@Test
		fun getPanelCount() {
		assertThat(dp.panelCount).isEqualTo(1)
		}

		@Test
		fun isVerticalBarLayout() {
		assertThat(dp.isVerticalBarLayout).isEqualTo(false)
		}

		@Test
		fun getCellLayoutSpringLoadShrunkTop() {
		assertThat(dp.cellLayoutSpringLoadShrunkTop).isEqualTo(364)
		}

		@Test
		fun getCellLayoutSpringLoadShrunkBottom() {
		assertThat(dp.cellLayoutSpringLoadShrunkBottom).isEqualTo(2185)
		}

		@Test
		fun getQsbOffsetY() {
		assertThat(dp.qsbOffsetY).isEqualTo(147)
		}

		@Test
		fun getTaskbarOffsetY() {
		assertThat(dp.taskbarOffsetY).isEqualTo(558)
		}

		@Test
		fun getHotseatLayoutPaddingLeft() {
		assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(125)
		}

		@Test
		fun getHotseatLayoutPaddingTop() {
		assertThat(dp.getHotseatLayoutPadding(context).top).isEqualTo(0)
		}

		@Test
		fun getHotseatLayoutPaddingRight() {
		assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(125)
		}

		@Test
		fun getHotseatLayoutPaddingBottom() {
		assertThat(dp.getHotseatLayoutPadding(context).bottom).isEqualTo(448)
		}

		@Test
		fun hotseatBarEndOffset() {
		assertThat(dp.hotseatBarEndOffset).isEqualTo(0)
		}
		}
		No newline at end of file