diff --git a/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java index 17e8a49c83..810a3b2764 100644 --- a/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java @@ -42,4 +42,10 @@ public class DesktopTaskbarUIController extends TaskbarUIController { super.onDestroy(); mLauncher.getHotseat().setIconsAlpha(1f); } + + @Override + /** Disable taskbar stashing in desktop environment. */ + protected boolean supportsVisualStashing() { + return false; + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 0ee6853a4d..91bbef7782 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -22,6 +22,7 @@ import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HO import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH; import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS; import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_KEYGUARD; +import static com.android.launcher3.taskbar.Utilities.appendFlag; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BACK_DISABLED; @@ -699,20 +700,20 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT private static String getStateString(int flags) { StringJoiner str = new StringJoiner("|"); - str.add((flags & FLAG_SWITCHER_SUPPORTED) != 0 ? "FLAG_SWITCHER_SUPPORTED" : ""); - str.add((flags & FLAG_IME_VISIBLE) != 0 ? "FLAG_IME_VISIBLE" : ""); - str.add((flags & FLAG_ROTATION_BUTTON_VISIBLE) != 0 ? "FLAG_ROTATION_BUTTON_VISIBLE" : ""); - str.add((flags & FLAG_A11Y_VISIBLE) != 0 ? "FLAG_A11Y_VISIBLE" : ""); - str.add((flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0 - ? "FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE" : ""); - str.add((flags & FLAG_KEYGUARD_VISIBLE) != 0 ? "FLAG_KEYGUARD_VISIBLE" : ""); - str.add((flags & FLAG_KEYGUARD_OCCLUDED) != 0 ? "FLAG_KEYGUARD_OCCLUDED" : ""); - str.add((flags & FLAG_DISABLE_HOME) != 0 ? "FLAG_DISABLE_HOME" : ""); - str.add((flags & FLAG_DISABLE_RECENTS) != 0 ? "FLAG_DISABLE_RECENTS" : ""); - str.add((flags & FLAG_DISABLE_BACK) != 0 ? "FLAG_DISABLE_BACK" : ""); - str.add((flags & FLAG_NOTIFICATION_SHADE_EXPANDED) != 0 - ? "FLAG_NOTIFICATION_SHADE_EXPANDED" : ""); - str.add((flags & FLAG_SCREEN_PINNING_ACTIVE) != 0 ? "FLAG_SCREEN_PINNING_ACTIVE" : ""); + appendFlag(str, flags, FLAG_SWITCHER_SUPPORTED, "FLAG_SWITCHER_SUPPORTED"); + appendFlag(str, flags, FLAG_IME_VISIBLE, "FLAG_IME_VISIBLE"); + appendFlag(str, flags, FLAG_ROTATION_BUTTON_VISIBLE, "FLAG_ROTATION_BUTTON_VISIBLE"); + appendFlag(str, flags, FLAG_A11Y_VISIBLE, "FLAG_A11Y_VISIBLE"); + appendFlag(str, flags, FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE, + "FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE"); + appendFlag(str, flags, FLAG_KEYGUARD_VISIBLE, "FLAG_KEYGUARD_VISIBLE"); + appendFlag(str, flags, FLAG_KEYGUARD_OCCLUDED, "FLAG_KEYGUARD_OCCLUDED"); + appendFlag(str, flags, FLAG_DISABLE_HOME, "FLAG_DISABLE_HOME"); + appendFlag(str, flags, FLAG_DISABLE_RECENTS, "FLAG_DISABLE_RECENTS"); + appendFlag(str, flags, FLAG_DISABLE_BACK, "FLAG_DISABLE_BACK"); + appendFlag(str, flags, FLAG_NOTIFICATION_SHADE_EXPANDED, + "FLAG_NOTIFICATION_SHADE_EXPANDED"); + appendFlag(str, flags, FLAG_SCREEN_PINNING_ACTIVE, "FLAG_SCREEN_PINNING_ACTIVE"); return str.toString(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java index 31a6aa6977..c5615c7ba1 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAutohideSuspendController.java @@ -15,6 +15,8 @@ */ package com.android.launcher3.taskbar; +import static com.android.launcher3.taskbar.Utilities.appendFlag; + import androidx.annotation.IntDef; import com.android.quickstep.SystemUiProxy; @@ -75,10 +77,9 @@ public class TaskbarAutohideSuspendController implements private static String getStateString(int flags) { StringJoiner str = new StringJoiner("|"); - str.add((flags & FLAG_AUTOHIDE_SUSPEND_FULLSCREEN) != 0 - ? "FLAG_AUTOHIDE_SUSPEND_FULLSCREEN" : ""); - str.add((flags & FLAG_AUTOHIDE_SUSPEND_DRAGGING) != 0 - ? "FLAG_AUTOHIDE_SUSPEND_DRAGGING" : ""); + appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_FULLSCREEN, + "FLAG_AUTOHIDE_SUSPEND_FULLSCREEN"); + appendFlag(str, flags, FLAG_AUTOHIDE_SUSPEND_DRAGGING, "FLAG_AUTOHIDE_SUSPEND_DRAGGING"); return str.toString(); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 54dd0b2379..06c9ca143d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -19,6 +19,7 @@ import static android.view.HapticFeedbackConstants.LONG_PRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_HIDE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_SHOW; +import static com.android.launcher3.taskbar.Utilities.appendFlag; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; @@ -194,7 +195,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba * state. */ public boolean supportsVisualStashing() { - return !mActivity.isThreeButtonNav(); + return mControllers.uiController.supportsVisualStashing(); } /** @@ -606,16 +607,15 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba private static String getStateString(int flags) { StringJoiner str = new StringJoiner("|"); - str.add((flags & FLAG_IN_APP) != 0 ? "FLAG_IN_APP" : ""); - str.add((flags & FLAG_STASHED_IN_APP_MANUAL) != 0 ? "FLAG_STASHED_IN_APP_MANUAL" : ""); - str.add((flags & FLAG_STASHED_IN_APP_PINNED) != 0 ? "FLAG_STASHED_IN_APP_PINNED" : ""); - str.add((flags & FLAG_STASHED_IN_APP_EMPTY) != 0 ? "FLAG_STASHED_IN_APP_EMPTY" : ""); - str.add((flags & FLAG_STASHED_IN_APP_SETUP) != 0 ? "FLAG_STASHED_IN_APP_SETUP" : ""); - str.add((flags & FLAG_STASHED_IN_APP_IME) != 0 ? "FLAG_STASHED_IN_APP_IME" : ""); - str.add((flags & FLAG_IN_STASHED_LAUNCHER_STATE) != 0 - ? "FLAG_IN_STASHED_LAUNCHER_STATE" : ""); - str.add((flags & FLAG_STASHED_IN_APP_ALL_APPS) != 0 ? "FLAG_STASHED_IN_APP_ALL_APPS" : ""); - str.add((flags & FLAG_IN_SETUP) != 0 ? "FLAG_IN_SETUP" : ""); + appendFlag(str, flags, FLAGS_IN_APP, "FLAG_IN_APP"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_MANUAL, "FLAG_STASHED_IN_APP_MANUAL"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_PINNED, "FLAG_STASHED_IN_APP_PINNED"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_EMPTY, "FLAG_STASHED_IN_APP_EMPTY"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_SETUP, "FLAG_STASHED_IN_APP_SETUP"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_IME, "FLAG_STASHED_IN_APP_IME"); + appendFlag(str, flags, FLAG_IN_STASHED_LAUNCHER_STATE, "FLAG_IN_STASHED_LAUNCHER_STATE"); + appendFlag(str, flags, FLAG_STASHED_IN_APP_ALL_APPS, "FLAG_STASHED_IN_APP_ALL_APPS"); + appendFlag(str, flags, FLAG_IN_SETUP, "FLAG_IN_SETUP"); return str.toString(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java index d5c399b619..fa185d6804 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java @@ -48,6 +48,11 @@ public class TaskbarUIController { return true; } + protected boolean supportsVisualStashing() { + if (mControllers == null) return false; + return !mControllers.taskbarActivityContext.isThreeButtonNav(); + } + protected void onStashedInAppChanged() { } public Stream getAppIconsForEdu() { diff --git a/quickstep/src/com/android/launcher3/taskbar/Utilities.java b/quickstep/src/com/android/launcher3/taskbar/Utilities.java new file mode 100644 index 0000000000..fda6453e7d --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/Utilities.java @@ -0,0 +1,33 @@ +/* + * 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.launcher3.taskbar; + +import java.util.StringJoiner; + +/** + * Various utilities shared amongst the Taskbar's classes. + */ +public final class Utilities { + + private Utilities() {} + + static void appendFlag(StringJoiner str, int flags, int flag, String flagName) { + if ((flags & flag) != 0) { + str.add(flagName); + } + } +} diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index ff67b096da..a38728a357 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -174,7 +174,7 @@ public class TouchInteractionService extends Service SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy, pip, splitscreen, onehanded, shellTransitions, startingWindow, recentTasks, launcherUnlockAnimationController, backAnimation); - TouchInteractionService.this.initInputMonitor(); + TouchInteractionService.this.initInputMonitor("TISBinder#onInitialize()"); preloadOverview(true /* fromInit */); }); sIsInitialized = true; @@ -372,7 +372,8 @@ public class TouchInteractionService extends Service sConnected = true; } - private void disposeEventHandlers() { + private void disposeEventHandlers(String reason) { + Log.d(TAG, "disposeEventHandlers: Reason: " + reason); if (mInputEventReceiver != null) { mInputEventReceiver.dispose(); mInputEventReceiver = null; @@ -383,8 +384,8 @@ public class TouchInteractionService extends Service } } - private void initInputMonitor() { - disposeEventHandlers(); + private void initInputMonitor(String reason) { + disposeEventHandlers("Initializing input monitor due to: " + reason); if (mDeviceState.isButtonNavMode()) { return; @@ -401,7 +402,7 @@ public class TouchInteractionService extends Service * Called when the navigation mode changes, guaranteed to be after the device state has updated. */ private void onNavigationModeChanged() { - initInputMonitor(); + initInputMonitor("onNavigationModeChanged()"); resetHomeBounceSeenOnQuickstepEnabledFirstTime(); } @@ -520,7 +521,7 @@ public class TouchInteractionService extends Service mInputConsumer.unregisterInputConsumer(); mOverviewComponentObserver.onDestroy(); } - disposeEventHandlers(); + disposeEventHandlers("TouchInteractionService onDestroy()"); mDeviceState.destroy(); SystemUiProxy.INSTANCE.get(this).clearProxy(); ProtoTracer.INSTANCE.get(this).stop(); diff --git a/quickstep/src/com/android/quickstep/ViewUtils.java b/quickstep/src/com/android/quickstep/ViewUtils.java index ab26d15284..1fef544e3e 100644 --- a/quickstep/src/com/android/quickstep/ViewUtils.java +++ b/quickstep/src/com/android/quickstep/ViewUtils.java @@ -83,7 +83,7 @@ public class ViewUtils { } private boolean schedule() { - if (mViewRoot.getView() != null) { + if (mViewRoot != null && mViewRoot.getView() != null) { mViewRoot.registerRtFrameCallback(this); mViewRoot.getView().invalidate(); return true; diff --git a/res/drawable/drop_target_frame.xml b/res/drawable/drop_target_frame.xml index 9f04103510..666a96e940 100644 --- a/res/drawable/drop_target_frame.xml +++ b/res/drawable/drop_target_frame.xml @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 422240c939..662b86ebbe 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -22,22 +22,8 @@ 24dp - 15.28dp 4dp - 36dp - 20dp 16dp - 45dp - - - 28dp - 16dp - 2dp - 6dp - 6dp - - - 24dp diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml deleted file mode 100644 index daca048878..0000000000 --- a/res/values-sw600dp-land/dimens.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - 44dp - - - 11.33dp - 11.33dp - - - 0dp - 16dp - - - 52dp - diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 73edc6f8bd..4a10e5689a 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -32,22 +32,8 @@ 32dp - 9dp 7dp - 9dp - 0dp - 97dp - - - 34dp - 16dp - 16dp - 16dp - 56dp - - - 6dp diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml index eb5c751588..9821526d4d 100644 --- a/res/values-sw720dp-land/dimens.xml +++ b/res/values-sw720dp-land/dimens.xml @@ -15,23 +15,9 @@ --> - - 0dp - 32dp - - - 21.93dp - 29.33dp - - - 64dp - - - 32dp - - + 49dp - + 0dp diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 3ec211a142..7ebc3f886b 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -16,23 +16,7 @@ - 28dp - - - 27.59dp - 36dp - - - 20sp - 72dp - 24dp - 20dp - 32dp - 32dp - 32dp - - - 164dp + 65dp 30dp diff --git a/res/values/config.xml b/res/values/config.xml index 5e90bea98a..e2fd0e3bc8 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -22,6 +22,9 @@ + + 85 + 50 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2ee4c45991..ce5456515b 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -19,14 +19,14 @@ 4dp - 10.77dp + 8dp 8dp 7dp 8dp 16dp - 10.77dp + 5.5dp 8dp @@ -34,7 +34,6 @@ 2dp 0dp 0dp - 76dp - 56dp + 52dp 20dp - 36dp - 16dp 13dp @@ -210,9 +207,6 @@ 2dp 4dp 8dp - 16dp - 8dp - 22dp 30dp @@ -367,9 +361,8 @@ - 28dp - 6dp - 6dp + 22dp + 6dp 48dp diff --git a/res/values/strings.xml b/res/values/strings.xml index 267f9c35c2..f699fca9b5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -217,7 +217,7 @@ Disabled %1$s - {count, plural, offset:1 + {count, plural, =1 {{app_name} has # notification} other {{app_name} has # notifications} } diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index f7133c49dd..d235180314 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -148,8 +148,7 @@ public class CellLayout extends ViewGroup { private boolean mVisualizeDropLocation = true; private RectF mVisualizeGridRect = new RectF(); private Paint mVisualizeGridPaint = new Paint(); - private int mGridVisualizationPaddingX; - private int mGridVisualizationPaddingY; + private int mGridVisualizationPadding; private int mGridVisualizationRoundingRadius; private float mGridAlpha = 0f; private int mGridColor = 0; @@ -261,10 +260,8 @@ public class CellLayout extends ViewGroup { mBackground.setAlpha(0); mGridColor = Themes.getAttrColor(getContext(), R.attr.workspaceAccentColor); - mGridVisualizationPaddingX = res.getDimensionPixelSize( - R.dimen.grid_visualization_horizontal_cell_spacing); - mGridVisualizationPaddingY = res.getDimensionPixelSize( - R.dimen.grid_visualization_vertical_cell_spacing); + mGridVisualizationPadding = + res.getDimensionPixelSize(R.dimen.grid_visualization_cell_spacing); mGridVisualizationRoundingRadius = res.getDimensionPixelSize(R.dimen.grid_visualization_rounding_radius); mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * deviceProfile.iconSizePx); @@ -594,8 +591,8 @@ public class CellLayout extends ViewGroup { protected void visualizeGrid(Canvas canvas) { DeviceProfile dp = mActivity.getDeviceProfile(); - int paddingX = Math.min((mCellWidth - dp.iconSizePx) / 2, mGridVisualizationPaddingX); - int paddingY = Math.min((mCellHeight - dp.iconSizePx) / 2, mGridVisualizationPaddingY); + int paddingX = (int) Math.min((mCellWidth - dp.iconSizePx) / 2, mGridVisualizationPadding); + int paddingY = (int) Math.min((mCellHeight - dp.iconSizePx) / 2, mGridVisualizationPadding); mVisualizeGridRect.set(paddingX, paddingY, mCellWidth - paddingX, mCellHeight - paddingY); diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 500244cdda..3489c31306 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -97,16 +97,18 @@ public class DeviceProfile { private static final float TALL_DEVICE_EXTRA_SPACE_THRESHOLD_DP = 252; private static final float TALL_DEVICE_MORE_EXTRA_SPACE_THRESHOLD_DP = 268; + // To evenly space the icons, increase the left/right margins for tablets in portrait mode. + private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4; + // Workspace public final int desiredWorkspaceHorizontalMarginOriginalPx; public int desiredWorkspaceHorizontalMarginPx; public Point cellLayoutBorderSpaceOriginalPx; public Point cellLayoutBorderSpacePx; - public Rect cellLayoutPaddingPx = new Rect(); - + public final int cellLayoutPaddingLeftRightPx; + public final int cellLayoutBottomPaddingPx; public final int edgeMarginPx; - public float workspaceSpringLoadShrunkTop; - public float workspaceSpringLoadShrunkBottom; + public float workspaceSpringLoadShrinkFactor; public final int workspaceSpringLoadedBottomSpace; private final int extraSpace; @@ -162,7 +164,6 @@ public class DeviceProfile { public int hotseatBarSizePx; public int hotseatBarTopPaddingPx; public final int hotseatBarBottomPaddingPx; - 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; @@ -208,13 +209,8 @@ public class DeviceProfile { // Drop Target public int dropTargetBarSizePx; - public int dropTargetBarTopMarginPx; - public int dropTargetBarBottomMarginPx; public int dropTargetDragPaddingPx; public int dropTargetTextSizePx; - public int dropTargetHorizontalPaddingPx; - public int dropTargetVerticalPaddingPx; - public int dropTargetGapPx; // Insets private final Rect mInsets = new Rect(); @@ -325,6 +321,23 @@ public class DeviceProfile { folderCellLayoutBorderSpacePx = new Point(folderCellLayoutBorderSpaceOriginalPx, folderCellLayoutBorderSpaceOriginalPx); + int cellLayoutPaddingLeftRightMultiplier = !isVerticalBarLayout() && isTablet + ? PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER : 1; + int cellLayoutPadding = isScalableGrid + ? 0 + : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding); + + if (isTwoPanels) { + cellLayoutPaddingLeftRightPx = 0; + cellLayoutBottomPaddingPx = 0; + } else if (isLandscape) { + cellLayoutPaddingLeftRightPx = 0; + cellLayoutBottomPaddingPx = cellLayoutPadding; + } else { + cellLayoutPaddingLeftRightPx = cellLayoutPaddingLeftRightMultiplier * cellLayoutPadding; + cellLayoutBottomPaddingPx = 0; + } + workspacePageIndicatorHeight = res.getDimensionPixelSize( R.dimen.workspace_page_indicator_height); mWorkspacePageIndicatorOverlapWorkspace = @@ -334,15 +347,8 @@ public class DeviceProfile { res.getDimensionPixelSize(R.dimen.dynamic_grid_icon_drawable_padding); dropTargetBarSizePx = res.getDimensionPixelSize(R.dimen.dynamic_grid_drop_target_size); - dropTargetBarTopMarginPx = res.getDimensionPixelSize(R.dimen.drop_target_top_margin); - dropTargetBarBottomMarginPx = res.getDimensionPixelSize(R.dimen.drop_target_bottom_margin); dropTargetDragPaddingPx = res.getDimensionPixelSize(R.dimen.drop_target_drag_padding); dropTargetTextSizePx = res.getDimensionPixelSize(R.dimen.drop_target_text_size); - dropTargetHorizontalPaddingPx = res.getDimensionPixelSize( - R.dimen.drop_target_button_drawable_horizontal_padding); - dropTargetVerticalPaddingPx = res.getDimensionPixelSize( - R.dimen.drop_target_button_drawable_vertical_padding); - dropTargetGapPx = res.getDimensionPixelSize(R.dimen.drop_target_button_gap); workspaceSpringLoadedBottomSpace = res.getDimensionPixelSize(R.dimen.dynamic_grid_min_spring_loaded_space); @@ -383,8 +389,6 @@ public class DeviceProfile { + res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_bottom_padding); qsbWidth = 0; } - 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. @@ -478,12 +482,6 @@ public class DeviceProfile { // Recalculate the available dimensions using the new hotseat size. updateAvailableDimensions(res); } - - int cellLayoutPadding = - isTwoPanels ? cellLayoutBorderSpacePx.x / 2 : res.getDimensionPixelSize( - R.dimen.cell_layout_padding); - cellLayoutPaddingPx = new Rect(cellLayoutPadding, cellLayoutPadding, cellLayoutPadding, - cellLayoutPadding); updateWorkspacePadding(); flingToDeleteThresholdVelocity = res.getDimensionPixelSize( @@ -596,6 +594,7 @@ public class DeviceProfile { float appWidgetScaleX = (float) profile.getCellSize().x / getCellSize().x; float appWidgetScaleY = (float) profile.getCellSize().y / getCellSize().y; profile.appWidgetScale.set(appWidgetScaleX, appWidgetScaleY); + profile.updateWorkspacePadding(); return profile; } @@ -630,19 +629,18 @@ public class DeviceProfile { } private void updateAllAppsContainerWidth(Resources res) { - int cellLayoutHorizontalPadding = - (cellLayoutPaddingPx.left + cellLayoutPaddingPx.right) / 2; + if (isTablet) { allAppsLeftRightPadding = - res.getDimensionPixelSize(R.dimen.all_apps_bottom_sheet_horizontal_padding); - + res.getDimensionPixelSize(R.dimen.all_apps_bottom_sheet_horizontal_padding) + + cellLayoutPaddingLeftRightPx; int usedWidth = (allAppsCellWidthPx * numShownAllAppsColumns) + (allAppsBorderSpacePx.x * (numShownAllAppsColumns - 1)) + allAppsLeftRightPadding * 2; allAppsLeftRightMargin = Math.max(1, (availableWidthPx - usedWidth) / 2); } else { allAppsLeftRightPadding = - desiredWorkspaceHorizontalMarginPx + cellLayoutHorizontalPadding; + desiredWorkspaceHorizontalMarginPx + cellLayoutPaddingLeftRightPx; } } @@ -652,12 +650,11 @@ public class DeviceProfile { private int updateAvailableDimensions(Resources res) { updateIconSize(1f, res); - updateWorkspacePadding(); Point workspacePadding = getTotalWorkspacePadding(); // Check to see if the icons fit within the available height. float usedHeight = getCellLayoutHeight(); - final int maxHeight = getWorkspaceHeight(workspacePadding); + final int maxHeight = availableHeightPx - workspacePadding.y; float extraHeight = Math.max(0, maxHeight - usedHeight); float scaleY = maxHeight / usedHeight; boolean shouldScale = scaleY < 1f; @@ -667,7 +664,10 @@ public class DeviceProfile { // We scale to fit the cellWidth and cellHeight in the available space. // The benefit of scalable grids is that we can get consistent aspect ratios between // devices. - float usedWidth = getCellLayoutWidth() + (desiredWorkspaceHorizontalMarginPx * 2); + int numColumns = isTwoPanels ? inv.numColumns * 2 : inv.numColumns; + float usedWidth = (cellWidthPx * numColumns) + + (cellLayoutBorderSpacePx.x * (numColumns - 1)) + + (desiredWorkspaceHorizontalMarginPx * 2); // We do not subtract padding here, as we also scale the workspace padding if needed. scaleX = availableWidthPx / usedWidth; shouldScale = true; @@ -684,14 +684,7 @@ public class DeviceProfile { } private int getCellLayoutHeight() { - return (cellHeightPx * inv.numRows) + (cellLayoutBorderSpacePx.y * (inv.numRows - 1)) - + cellLayoutPaddingPx.top + cellLayoutPaddingPx.bottom; - } - - private int getCellLayoutWidth() { - int numColumns = isTwoPanels ? inv.numColumns * 2 : inv.numColumns; - return (cellWidthPx * numColumns) + (cellLayoutBorderSpacePx.x * (numColumns - 1)) - + cellLayoutPaddingPx.left + cellLayoutPaddingPx.right; + return (cellHeightPx * inv.numRows) + (cellLayoutBorderSpacePx.y * (inv.numRows - 1)); } /** @@ -751,6 +744,18 @@ public class DeviceProfile { } updateHotseatIconSize(iconSizePx); + if (!isVerticalLayout) { + int expectedWorkspaceHeight = availableHeightPx - hotseatBarSizePx + - workspacePageIndicatorHeight - edgeMarginPx; + float minRequiredHeight = dropTargetBarSizePx + workspaceSpringLoadedBottomSpace; + workspaceSpringLoadShrinkFactor = Math.min( + res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f, + 1 - (minRequiredHeight / expectedWorkspaceHeight)); + } else { + workspaceSpringLoadShrinkFactor = + res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f; + } + // Folder icon folderIconSizePx = IconNormalizer.getNormalizedCircleSize(iconSizePx); folderIconOffsetYPx = (iconSizePx - folderIconSizePx) / 2; @@ -860,6 +865,7 @@ public class DeviceProfile { public void updateInsets(Rect insets) { mInsets.set(insets); + updateWorkspacePadding(); } /** @@ -886,62 +892,23 @@ public class DeviceProfile { int numColumns = isTwoPanels ? inv.numColumns * 2 : inv.numColumns; int screenWidthPx = getWorkspaceWidth(padding); result.x = calculateCellWidth(screenWidthPx, cellLayoutBorderSpacePx.x, numColumns); - int screenHeightPx = getWorkspaceHeight(padding); - result.y = calculateCellHeight(screenHeightPx, cellLayoutBorderSpacePx.y, inv.numRows); + result.y = calculateCellHeight(availableHeightPx - padding.y + - cellLayoutBottomPaddingPx, cellLayoutBorderSpacePx.y, inv.numRows); return result; } - /** - * Gets the space in px from the bottom of last item in the vertical-bar hotseat to the - * bottom of the screen. - */ - public int getVerticalHotseatLastItemBottomOffset() { - int cellHeight = calculateCellHeight( - heightPx - mHotseatPadding.top - mHotseatPadding.bottom, hotseatBorderSpace, - numShownHotseatIcons); - int hotseatSize = (cellHeight * numShownHotseatIcons) - + (hotseatBorderSpace * (numShownHotseatIcons - 1)); - int extraHotseatEndSpacing = (heightPx - hotseatSize) / 2; - int extraIconEndSpacing = (cellHeight - iconSizePx) / 2; - return extraHotseatEndSpacing + extraIconEndSpacing + mHotseatPadding.bottom; - } - - /** - * Gets the scaled top of the workspace in px for the spring-loaded edit state. - */ - public float getWorkspaceSpringLoadShrunkTop() { - workspaceSpringLoadShrunkTop = mInsets.top + dropTargetBarTopMarginPx + dropTargetBarSizePx - + dropTargetBarBottomMarginPx; - return workspaceSpringLoadShrunkTop; - } - - /** - * Gets the scaled bottom of the workspace in px for the spring-loaded edit state. - */ - public float getWorkspaceSpringLoadShrunkBottom() { - int topOfHotseat = hotseatBarSizePx + springLoadedHotseatBarTopMarginPx; - workspaceSpringLoadShrunkBottom = - heightPx - (isVerticalBarLayout() ? getVerticalHotseatLastItemBottomOffset() - : topOfHotseat); - return workspaceSpringLoadShrunkBottom; - } - public int getWorkspaceWidth() { return getWorkspaceWidth(getTotalWorkspacePadding()); } public int getWorkspaceWidth(Point workspacePadding) { int cellLayoutTotalPadding = - (isTwoPanels ? 2 : 1) * (cellLayoutPaddingPx.left + cellLayoutPaddingPx.right); + isTwoPanels ? 4 * cellLayoutPaddingLeftRightPx : 2 * cellLayoutPaddingLeftRightPx; return availableWidthPx - workspacePadding.x - cellLayoutTotalPadding; } - private int getWorkspaceHeight(Point workspacePadding) { - return availableHeightPx - workspacePadding.y - (cellLayoutPaddingPx.top - + cellLayoutPaddingPx.bottom); - } - public Point getTotalWorkspacePadding() { + updateWorkspacePadding(); return new Point(workspacePadding.left + workspacePadding.right, workspacePadding.top + workspacePadding.bottom); } @@ -967,26 +934,12 @@ public class DeviceProfile { int hotseatTop = hotseatBarSizePx; int paddingBottom = hotseatTop + workspacePageIndicatorHeight + workspaceBottomPadding - mWorkspacePageIndicatorOverlapWorkspace; - int paddingTop = workspaceTopPadding + (isScalableGrid ? 0 : edgeMarginPx); - int paddingSide = desiredWorkspaceHorizontalMarginPx; - padding.set(paddingSide, paddingTop, paddingSide, paddingBottom); + padding.set(desiredWorkspaceHorizontalMarginPx, + workspaceTopPadding + (isScalableGrid ? 0 : edgeMarginPx), + desiredWorkspaceHorizontalMarginPx, + paddingBottom); } - insetPadding(workspacePadding, cellLayoutPaddingPx); - } - - private void insetPadding(Rect paddings, Rect insets) { - insets.left = Math.min(insets.left, paddings.left); - paddings.left -= insets.left; - - insets.top = Math.min(insets.top, paddings.top); - paddings.top -= insets.top; - - insets.right = Math.min(insets.right, paddings.right); - paddings.right -= insets.right; - - insets.bottom = Math.min(insets.bottom, paddings.bottom); - paddings.bottom -= insets.bottom; } /** @@ -1000,17 +953,16 @@ public class DeviceProfile { // Workspace icons are moved up by a small factor. The variable diffOverlapFactor // is set to account for that difference. float diffOverlapFactor = iconSizePx * (ICON_OVERLAP_FACTOR - 1) / 2; - int paddingTop = Math.max((int) (mInsets.top + cellLayoutPaddingPx.top - - diffOverlapFactor), 0); - int paddingBottom = Math.max((int) (mInsets.bottom + cellLayoutPaddingPx.bottom + int paddingTop = Math.max((int) (mInsets.top - diffOverlapFactor), 0); + int paddingBottom = Math.max((int) (mInsets.bottom + cellLayoutBottomPaddingPx + diffOverlapFactor), 0); if (isSeascape()) { - mHotseatPadding.set(mInsets.left + hotseatBarSidePaddingStartPx, paddingTop, - hotseatBarSidePaddingEndPx, paddingBottom); + mHotseatPadding.set(mInsets.left + hotseatBarSidePaddingStartPx, + mInsets.top, hotseatBarSidePaddingEndPx, mInsets.bottom); } else { - mHotseatPadding.set(hotseatBarSidePaddingEndPx, paddingTop, - mInsets.right + hotseatBarSidePaddingStartPx, paddingBottom); + mHotseatPadding.set(hotseatBarSidePaddingEndPx, mInsets.top, + mInsets.right + hotseatBarSidePaddingStartPx, mInsets.bottom); } } else if (isTaskbarPresent) { int hotseatHeight = workspacePadding.bottom; @@ -1049,12 +1001,14 @@ public class DeviceProfile { float workspaceCellWidth = (float) widthPx / inv.numColumns; float hotseatCellWidth = (float) widthPx / numShownHotseatIcons; int hotseatAdjustment = Math.round((workspaceCellWidth - hotseatCellWidth) / 2); - mHotseatPadding.set(hotseatAdjustment + workspacePadding.left + cellLayoutPaddingPx.left - + mInsets.left, hotseatBarTopPaddingPx, - hotseatAdjustment + workspacePadding.right + cellLayoutPaddingPx.right + mHotseatPadding.set( + hotseatAdjustment + workspacePadding.left + cellLayoutPaddingLeftRightPx + + mInsets.left, + hotseatBarTopPaddingPx, + hotseatAdjustment + workspacePadding.right + cellLayoutPaddingLeftRightPx + mInsets.right, hotseatBarSizePx - hotseatCellHeightPx - hotseatBarTopPaddingPx - + mInsets.bottom); + + cellLayoutBottomPaddingPx + mInsets.bottom); } return mHotseatPadding; } @@ -1138,8 +1092,6 @@ public class DeviceProfile { .getInfo().rotation == Surface.ROTATION_270; if (mIsSeascape != isSeascape) { mIsSeascape = isSeascape; - // Hotseat changing sides requires updating workspace left/right paddings - updateWorkspacePadding(); return true; } } @@ -1217,11 +1169,6 @@ public class DeviceProfile { cellLayoutBorderSpacePx.x)); writer.println(prefix + pxToDpStr("cellLayoutBorderSpacePx Vertical", cellLayoutBorderSpacePx.y)); - writer.println(prefix + pxToDpStr("cellLayoutPaddingPx.left", cellLayoutPaddingPx.left)); - writer.println(prefix + pxToDpStr("cellLayoutPaddingPx.top", cellLayoutPaddingPx.top)); - writer.println(prefix + pxToDpStr("cellLayoutPaddingPx.right", cellLayoutPaddingPx.right)); - writer.println( - prefix + pxToDpStr("cellLayoutPaddingPx.bottom", cellLayoutPaddingPx.bottom)); writer.println(prefix + pxToDpStr("iconSizePx", iconSizePx)); writer.println(prefix + pxToDpStr("iconTextSizePx", iconTextSizePx)); @@ -1259,12 +1206,6 @@ public class DeviceProfile { hotseatBarSidePaddingStartPx)); writer.println(prefix + pxToDpStr("hotseatBarSidePaddingEndPx", hotseatBarSidePaddingEndPx)); - writer.println(prefix + pxToDpStr("springLoadedHotseatBarTopMarginPx", - springLoadedHotseatBarTopMarginPx)); - writer.println(prefix + pxToDpStr("mHotseatPadding.top", mHotseatPadding.top)); - writer.println(prefix + pxToDpStr("mHotseatPadding.bottom", mHotseatPadding.bottom)); - writer.println(prefix + pxToDpStr("mHotseatPadding.left", mHotseatPadding.left)); - writer.println(prefix + pxToDpStr("mHotseatPadding.right", mHotseatPadding.right)); writer.println(prefix + "\tnumShownHotseatIcons: " + numShownHotseatIcons); writer.println(prefix + pxToDpStr("hotseatBorderSpace", hotseatBorderSpace)); writer.println(prefix + "\tisQsbInline: " + isQsbInline); @@ -1315,16 +1256,6 @@ public class DeviceProfile { writer.println(prefix + pxToDpStr("overviewPageSpacing", overviewPageSpacing)); writer.println(prefix + pxToDpStr("overviewRowSpacing", overviewRowSpacing)); writer.println(prefix + pxToDpStr("overviewGridSideMargin", overviewGridSideMargin)); - - writer.println(prefix + pxToDpStr("dropTargetBarTopMarginPx", dropTargetBarTopMarginPx)); - writer.println(prefix + pxToDpStr("dropTargetBarSizePx", dropTargetBarSizePx)); - writer.println( - prefix + pxToDpStr("dropTargetBarBottomMarginPx", dropTargetBarBottomMarginPx)); - - writer.println( - prefix + pxToDpStr("workspaceSpringLoadShrunkTop", workspaceSpringLoadShrunkTop)); - writer.println(prefix + pxToDpStr("workspaceSpringLoadShrunkBottom", - workspaceSpringLoadShrunkBottom)); } private static Context getContext(Context c, Info info, int orientation, WindowBounds bounds) { diff --git a/src/com/android/launcher3/DropTargetBar.java b/src/com/android/launcher3/DropTargetBar.java index 73289fb878..9fb14f68cb 100644 --- a/src/com/android/launcher3/DropTargetBar.java +++ b/src/com/android/launcher3/DropTargetBar.java @@ -17,6 +17,8 @@ package com.android.launcher3; import static com.android.launcher3.ButtonDropTarget.TOOLTIP_DEFAULT; +import static com.android.launcher3.ButtonDropTarget.TOOLTIP_LEFT; +import static com.android.launcher3.ButtonDropTarget.TOOLTIP_RIGHT; import static com.android.launcher3.anim.AlphaUpdateListener.updateVisibility; import android.animation.TimeInterpolator; @@ -39,8 +41,6 @@ import com.android.launcher3.dragndrop.DragController.DragListener; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.testing.TestProtocol; -import java.util.Arrays; - /* * The top bar containing various drop targets: Delete/App Info/Uninstall. */ @@ -94,28 +94,30 @@ public class DropTargetBar extends FrameLayout lp.rightMargin = insets.right; int tooltipLocation = TOOLTIP_DEFAULT; - int horizontalMargin; - if (grid.isTablet) { - // XXX: If the icon size changes across orientations, we will have to take - // that into account here too. - horizontalMargin = ((grid.widthPx - 2 * grid.edgeMarginPx - - (grid.inv.numColumns * grid.cellWidthPx)) - / (2 * (grid.inv.numColumns + 1))) - + grid.edgeMarginPx; + if (grid.isVerticalBarLayout()) { + lp.width = grid.dropTargetBarSizePx; + lp.height = grid.availableHeightPx - 2 * grid.edgeMarginPx; + lp.gravity = grid.isSeascape() ? Gravity.RIGHT : Gravity.LEFT; + tooltipLocation = grid.isSeascape() ? TOOLTIP_LEFT : TOOLTIP_RIGHT; } else { - horizontalMargin = getContext().getResources() - .getDimensionPixelSize(R.dimen.drop_target_bar_margin_horizontal); - } - lp.topMargin += grid.dropTargetBarTopMarginPx; - lp.bottomMargin += grid.dropTargetBarBottomMarginPx; - lp.width = grid.availableWidthPx - 2 * horizontalMargin; - if (mIsVertical) { - lp.leftMargin = (grid.widthPx - lp.width) / 2; - lp.rightMargin = (grid.widthPx - lp.width) / 2; - } - lp.height = grid.dropTargetBarSizePx; - lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.TOP; + int gap; + if (grid.isTablet) { + // XXX: If the icon size changes across orientations, we will have to take + // that into account here too. + gap = ((grid.widthPx - 2 * grid.edgeMarginPx + - (grid.inv.numColumns * grid.cellWidthPx)) + / (2 * (grid.inv.numColumns + 1))) + + grid.edgeMarginPx; + } else { + gap = getContext().getResources() + .getDimensionPixelSize(R.dimen.drop_target_bar_margin_horizontal); + } + lp.width = grid.availableWidthPx - 2 * gap; + lp.topMargin += grid.edgeMarginPx; + lp.height = grid.dropTargetBarSizePx; + lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.TOP; + } setLayoutParams(lp); for (ButtonDropTarget button : mDropTargets) { button.setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.dropTargetTextSizePx); @@ -137,7 +139,19 @@ public class DropTargetBar extends FrameLayout int height = MeasureSpec.getSize(heightMeasureSpec); int visibleCount = getVisibleButtonsCount(); - if (visibleCount > 0) { + if (visibleCount == 0) { + // do nothing + } else if (mIsVertical) { + int widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY); + int heightSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST); + + for (ButtonDropTarget button : mDropTargets) { + if (button.getVisibility() != GONE) { + button.setTextVisible(false); + button.measure(widthSpec, heightSpec); + } + } + } else { int availableWidth = width / visibleCount; boolean textVisible = true; for (ButtonDropTarget buttons : mDropTargets) { @@ -162,91 +176,31 @@ public class DropTargetBar extends FrameLayout protected void onLayout(boolean changed, int left, int top, int right, int bottom) { int visibleCount = getVisibleButtonsCount(); if (visibleCount == 0) { - return; - } + // do nothing + } else if (mIsVertical) { + int gap = getResources().getDimensionPixelSize(R.dimen.drop_target_vertical_gap); + int start = gap; + int end; - Launcher launcher = Launcher.getLauncher(getContext()); - Workspace workspace = launcher.getWorkspace(); - DeviceProfile dp = launcher.getDeviceProfile(); - int buttonHorizontalPadding = dp.dropTargetHorizontalPaddingPx; - int buttonVerticalPadding = dp.dropTargetVerticalPaddingPx; - int barCenter = (right - left) / 2; - - ButtonDropTarget[] visibleButtons = Arrays.stream(mDropTargets) - .filter(b -> b.getVisibility() != GONE) - .toArray(ButtonDropTarget[]::new); - Arrays.stream(visibleButtons).forEach( - b -> b.setPadding(buttonHorizontalPadding, buttonVerticalPadding, - buttonHorizontalPadding, buttonVerticalPadding)); - - if (visibleCount == 1) { - ButtonDropTarget button = visibleButtons[0]; - button.layout(barCenter - (button.getMeasuredWidth() / 2), 0, - barCenter + (button.getMeasuredWidth() / 2), button.getMeasuredHeight()); - } else if (visibleCount == 2) { - int buttonGap = dp.dropTargetGapPx; - - if (dp.isTwoPanels) { - ButtonDropTarget leftButton = visibleButtons[0]; - leftButton.layout(barCenter - leftButton.getMeasuredWidth() - (buttonGap / 2), 0, - barCenter - (buttonGap / 2), leftButton.getMeasuredHeight()); - - ButtonDropTarget rightButton = visibleButtons[1]; - rightButton.layout(barCenter + (buttonGap / 2), 0, - barCenter + rightButton.getMeasuredWidth() + (buttonGap / 2), - rightButton.getMeasuredHeight()); - } else if (dp.isTablet) { - int numberOfMargins = visibleCount - 1; - int buttonWidths = Arrays.stream(mDropTargets) - .filter(b -> b.getVisibility() != GONE) - .mapToInt(ButtonDropTarget::getMeasuredWidth) - .sum(); - int totalWidth = buttonWidths + (numberOfMargins * buttonGap); - int buttonsStartMargin = barCenter - (totalWidth / 2); - - int start = buttonsStartMargin; - for (ButtonDropTarget button : visibleButtons) { - int margin = (start != buttonsStartMargin) ? buttonGap : 0; - button.layout(start + margin, 0, start + margin + button.getMeasuredWidth(), - button.getMeasuredHeight()); - start += button.getMeasuredWidth() + margin; + for (ButtonDropTarget button : mDropTargets) { + if (button.getVisibility() != GONE) { + end = start + button.getMeasuredHeight(); + button.layout(0, start, button.getMeasuredWidth(), end); + start = end + gap; } - } else if (mIsVertical) { - // Center buttons over workspace, not screen. - int verticalCenter = (workspace.getRight() - workspace.getLeft()) / 2; - ButtonDropTarget leftButton = visibleButtons[0]; - leftButton.layout(verticalCenter - leftButton.getMeasuredWidth() - (buttonGap / 2), - 0, verticalCenter - (buttonGap / 2), leftButton.getMeasuredHeight()); + } + } else { + int frameSize = (right - left) / visibleCount; - ButtonDropTarget rightButton = visibleButtons[1]; - rightButton.layout(verticalCenter + (buttonGap / 2), 0, - verticalCenter + rightButton.getMeasuredWidth() + (buttonGap / 2), - rightButton.getMeasuredHeight()); - } else if (dp.isPhone) { - // Buttons aligned to outer edges of scaled workspace. - float shrunkTop = dp.getWorkspaceSpringLoadShrunkTop(); - float shrunkBottom = dp.getWorkspaceSpringLoadShrunkBottom(); - float scale = - (shrunkBottom - shrunkTop) / launcher.getWorkspace().getNormalChildHeight(); - int workspaceWidth = (int) (launcher.getWorkspace().getNormalChildWidth() * scale); - int start = barCenter - (workspaceWidth / 2); - int end = barCenter + (workspaceWidth / 2); - - ButtonDropTarget leftButton = visibleButtons[0]; - ButtonDropTarget rightButton = visibleButtons[1]; - - // If the text within the buttons is too long, the buttons can overlap - int overlap = start + leftButton.getMeasuredWidth() + rightButton.getMeasuredWidth() - - end; - if (overlap > 0) { - start -= overlap / 2; - end += overlap / 2; + int start = frameSize / 2; + int halfWidth; + for (ButtonDropTarget button : mDropTargets) { + if (button.getVisibility() != GONE) { + halfWidth = button.getMeasuredWidth() / 2; + button.layout(start - halfWidth, 0, + start + halfWidth, button.getMeasuredHeight()); + start = start + frameSize; } - - leftButton.layout(start, 0, start + leftButton.getMeasuredWidth(), - leftButton.getMeasuredHeight()); - rightButton.layout(end - rightButton.getMeasuredWidth(), 0, end, - rightButton.getMeasuredHeight()); } } } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 6ec789a003..635b7cc723 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -325,14 +325,37 @@ public class Workspace extends PagedView setPageSpacing(Math.max(maxInsets, maxPadding)); } - updateCellLayoutPadding(); + updateWorkspaceScreensPadding(); updateWorkspaceWidgetsSizes(); } - private void updateCellLayoutPadding() { - Rect padding = mLauncher.getDeviceProfile().cellLayoutPaddingPx; - mWorkspaceScreens.forEach( - s -> s.setPadding(padding.left, padding.top, padding.right, padding.bottom)); + private void updateWorkspaceScreensPadding() { + DeviceProfile grid = mLauncher.getDeviceProfile(); + int paddingLeftRight = grid.cellLayoutPaddingLeftRightPx; + int paddingBottom = grid.cellLayoutBottomPaddingPx; + + int panelCount = getPanelCount(); + int rightPanelModulus = mIsRtl ? 0 : panelCount - 1; + int leftPanelModulus = mIsRtl ? panelCount - 1 : 0; + int numberOfScreens = mScreenOrder.size(); + for (int i = 0; i < numberOfScreens; i++) { + int paddingLeft = paddingLeftRight; + int paddingRight = paddingLeftRight; + // Add missing cellLayout border in-between panels. + if (panelCount > 1) { + if (i % panelCount == leftPanelModulus) { + paddingRight += grid.cellLayoutBorderSpacePx.x / 2; + } else if (i % panelCount == rightPanelModulus) { // right side panel + paddingLeft += grid.cellLayoutBorderSpacePx.x / 2; + } else { // middle panel + paddingLeft += grid.cellLayoutBorderSpacePx.x / 2; + paddingRight += grid.cellLayoutBorderSpacePx.x / 2; + } + } + // SparseArrayMap doesn't keep the order + mWorkspaceScreens.get(mScreenOrder.get(i)) + .setPadding(paddingLeft, 0, paddingRight, paddingBottom); + } } private void updateWorkspaceWidgetsSizes() { @@ -630,7 +653,7 @@ public class Workspace extends PagedView mLauncher.getStateManager().getState(), newScreen, insertIndex); updatePageScrollValues(); - updateCellLayoutPadding(); + updateWorkspaceScreensPadding(); return newScreen; } diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 7727fae4a8..420180b049 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -261,6 +261,10 @@ public final class FeatureFlags { public static final BooleanFlag ENABLE_ONE_SEARCH_MOTION = new DeviceFlag( "ENABLE_ONE_SEARCH_MOTION", true, "Enables animations in OneSearch."); + public static final BooleanFlag USE_LOCAL_ICON_OVERRIDES = getDebugFlag( + "USE_LOCAL_ICON_OVERRIDES", true, + "Use inbuilt monochrome icons if app doesn't provide one"); + public static void initialize(Context context) { synchronized (sDebugFlags) { for (DebugFlag flag : sDebugFlags) { diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java index 3dfece7660..cc170643c9 100644 --- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java +++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java @@ -225,21 +225,21 @@ public class LauncherPreviewRenderer extends ContextWrapper mHotseat.resetLayout(false); CellLayout firstScreen = mRootView.findViewById(R.id.workspace); - firstScreen.setPadding(mDp.workspacePadding.left + mDp.cellLayoutPaddingPx.left, - mDp.workspacePadding.top + mDp.cellLayoutPaddingPx.top, + firstScreen.setPadding(mDp.workspacePadding.left + mDp.cellLayoutPaddingLeftRightPx, + mDp.workspacePadding.top, (mDp.isTwoPanels ? mDp.cellLayoutBorderSpacePx.x / 2 - : mDp.workspacePadding.right) + mDp.cellLayoutPaddingPx.right, - mDp.workspacePadding.bottom + mDp.cellLayoutPaddingPx.bottom + : mDp.workspacePadding.right) + mDp.cellLayoutPaddingLeftRightPx, + mDp.workspacePadding.bottom ); mWorkspaceScreens.put(FIRST_SCREEN_ID, firstScreen); if (mDp.isTwoPanels) { CellLayout rightPanel = mRootView.findViewById(R.id.workspace_right); rightPanel.setPadding( - mDp.cellLayoutBorderSpacePx.x / 2 + mDp.cellLayoutPaddingPx.left, - mDp.workspacePadding.top + mDp.cellLayoutPaddingPx.top, - mDp.workspacePadding.right + mDp.cellLayoutPaddingPx.right, - mDp.workspacePadding.bottom + mDp.cellLayoutPaddingPx.bottom + mDp.cellLayoutBorderSpacePx.x / 2 + mDp.cellLayoutPaddingLeftRightPx, + mDp.workspacePadding.top, + mDp.workspacePadding.right + mDp.cellLayoutPaddingLeftRightPx, + mDp.workspacePadding.bottom ); mWorkspaceScreens.put(Workspace.SECOND_SCREEN_ID, rightPanel); } diff --git a/src/com/android/launcher3/icons/LauncherIconProvider.java b/src/com/android/launcher3/icons/LauncherIconProvider.java index a7379bbd96..c4d5f2b5b5 100644 --- a/src/com/android/launcher3/icons/LauncherIconProvider.java +++ b/src/com/android/launcher3/icons/LauncherIconProvider.java @@ -23,6 +23,7 @@ import android.util.ArrayMap; import android.util.Log; import com.android.launcher3.R; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.util.Themes; import org.xmlpull.v1.XmlPullParser; @@ -55,7 +56,8 @@ public class LauncherIconProvider extends IconProvider { */ public void setIconThemeSupported(boolean isSupported) { mSupportsIconTheme = isSupported; - mThemedIconMap = isSupported ? null : DISABLED_MAP; + mThemedIconMap = isSupported && FeatureFlags.USE_LOCAL_ICON_OVERRIDES.get() + ? null : DISABLED_MAP; } @Override diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java index 9201006cd7..967f2c8400 100644 --- a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java +++ b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java @@ -113,17 +113,13 @@ public class SecondaryDragLayer extends BaseDragLayer for (int i = 0; i < count; i++) { final View child = getChildAt(i); if (child == mAppsView) { - int horizontalPadding = (2 * grid.desiredWorkspaceHorizontalMarginPx) - + grid.cellLayoutPaddingPx.left + grid.cellLayoutPaddingPx.right; - int verticalPadding = - grid.cellLayoutPaddingPx.top + grid.cellLayoutPaddingPx.bottom; + int padding = 2 * (grid.desiredWorkspaceHorizontalMarginPx + + grid.cellLayoutPaddingLeftRightPx); - int maxWidth = - grid.allAppsCellWidthPx * grid.numShownAllAppsColumns + horizontalPadding; + int maxWidth = grid.allAppsCellWidthPx * grid.numShownAllAppsColumns + padding; int appsWidth = Math.min(width, maxWidth); - int maxHeight = - grid.allAppsCellHeightPx * grid.numShownAllAppsColumns + verticalPadding; + int maxHeight = grid.allAppsCellHeightPx * grid.numShownAllAppsColumns + padding; int appsHeight = Math.min(height, maxHeight); mAppsView.measure( diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java index 9be3cc5539..d52594e409 100644 --- a/src/com/android/launcher3/states/SpringLoadedState.java +++ b/src/com/android/launcher3/states/SpringLoadedState.java @@ -18,6 +18,7 @@ package com.android.launcher3.states; import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME; import android.content.Context; +import android.graphics.Rect; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; @@ -51,15 +52,28 @@ public class SpringLoadedState extends LauncherState { return super.getWorkspaceScaleAndTranslation(launcher); } - float shrunkTop = grid.getWorkspaceSpringLoadShrunkTop(); - float shrunkBottom = grid.getWorkspaceSpringLoadShrunkBottom(); - float scale = (shrunkBottom - shrunkTop) / ws.getNormalChildHeight(); + if (grid.isVerticalBarLayout()) { + float scale = grid.workspaceSpringLoadShrinkFactor; + return new ScaleAndTranslation(scale, 0, 0); + } + + float scale = grid.workspaceSpringLoadShrinkFactor; + Rect insets = launcher.getDragLayer().getInsets(); + + float scaledHeight = scale * ws.getNormalChildHeight(); + float shrunkTop = insets.top + grid.dropTargetBarSizePx; + float shrunkBottom = ws.getMeasuredHeight() - insets.bottom + - grid.workspacePadding.bottom + - grid.workspaceSpringLoadedBottomSpace; + float totalShrunkSpace = shrunkBottom - shrunkTop; + + float desiredCellTop = shrunkTop + (totalShrunkSpace - scaledHeight) / 2; float halfHeight = ws.getHeight() / 2; float myCenter = ws.getTop() + halfHeight; float cellTopFromCenter = halfHeight - ws.getChildAt(0).getTop(); float actualCellTop = myCenter - cellTopFromCenter * scale; - return new ScaleAndTranslation(scale, 0, (shrunkTop - actualCellTop) / scale); + return new ScaleAndTranslation(scale, 0, (desiredCellTop - actualCellTop) / scale); } @Override diff --git a/tests/src/com/android/launcher3/DeviceProfileBaseTest.kt b/tests/src/com/android/launcher3/DeviceProfileBaseTest.kt index e598df961d..f91f1c4288 100644 --- a/tests/src/com/android/launcher3/DeviceProfileBaseTest.kt +++ b/tests/src/com/android/launcher3/DeviceProfileBaseTest.kt @@ -88,11 +88,11 @@ abstract class DeviceProfileBaseTest { protected fun newScalableInvariantDeviceProfile(): InvariantDeviceProfile = InvariantDeviceProfile().apply { isScalable = true - numColumns = 5 - numRows = 5 - numShownHotseatIcons = 5 + numColumns = 4 + numRows = 4 + numShownHotseatIcons = 4 numDatabaseHotseatIcons = 6 - numShrunkenHotseatIcons = 4 + numShrunkenHotseatIcons = 5 horizontalMargin = FloatArray(4) { 22f } borderSpaces = listOf( PointF(16f, 16f), diff --git a/tests/src/com/android/launcher3/HotseatSizeTest.kt b/tests/src/com/android/launcher3/HotseatSizeTest.kt index ca697d7c96..a44939f4cf 100644 --- a/tests/src/com/android/launcher3/HotseatSizeTest.kt +++ b/tests/src/com/android/launcher3/HotseatSizeTest.kt @@ -43,11 +43,11 @@ class HotseatSizeTest : DeviceProfileBaseTest() { val dp = newDP() assertThat(dp.isQsbInline).isFalse() - assertThat(dp.numShownHotseatIcons).isEqualTo(5) + assertThat(dp.numShownHotseatIcons).isEqualTo(4) } @Test - fun hotseat_size_is_max_for_foldables() { + fun hotseat_size_is_max_when_large_screen() { initializeVarsForTablet(isLandscape = true) inv = newScalableInvariantDeviceProfile().apply { deviceType = TYPE_MULTI_DISPLAY @@ -61,7 +61,7 @@ class HotseatSizeTest : DeviceProfileBaseTest() { } @Test - fun hotseat_size_is_shrunk_if_needed() { + fun hotseat_size_is_shrunk_if_needed_when_large_screen() { initializeVarsForTablet(isLandscape = true) inv = newScalableInvariantDeviceProfile().apply { deviceType = TYPE_MULTI_DISPLAY @@ -79,7 +79,7 @@ class HotseatSizeTest : DeviceProfileBaseTest() { if (dp.hotseatQsbHeight > 0) { assertThat(dp.isQsbInline).isTrue() - assertThat(dp.numShownHotseatIcons).isEqualTo(4) + assertThat(dp.numShownHotseatIcons).isEqualTo(5) } else { // Launcher3 doesn't have QSB height assertThat(dp.isQsbInline).isFalse() assertThat(dp.numShownHotseatIcons).isEqualTo(6) @@ -91,7 +91,7 @@ class HotseatSizeTest : DeviceProfileBaseTest() { * inline qsb */ @Test - fun hotseat_size_is_shrunk_even_in_portrait() { + fun hotseat_size_is_shrunk_even_in_portrait_when_large_screen() { initializeVarsForTablet() inv = newScalableInvariantDeviceProfile().apply { deviceType = TYPE_MULTI_DISPLAY @@ -109,7 +109,7 @@ class HotseatSizeTest : DeviceProfileBaseTest() { if (dp.hotseatQsbHeight > 0) { assertThat(dp.isQsbInline).isFalse() - assertThat(dp.numShownHotseatIcons).isEqualTo(4) + assertThat(dp.numShownHotseatIcons).isEqualTo(5) } else { // Launcher3 doesn't have QSB height assertThat(dp.isQsbInline).isFalse() assertThat(dp.numShownHotseatIcons).isEqualTo(6) @@ -117,7 +117,7 @@ class HotseatSizeTest : DeviceProfileBaseTest() { } @Test - fun hotseat_size_is_default_when_folded() { + fun hotseat_size_is_default_when_small_screen() { initializeVarsForPhone() inv = newScalableInvariantDeviceProfile().apply { deviceType = TYPE_MULTI_DISPLAY @@ -126,7 +126,33 @@ class HotseatSizeTest : DeviceProfileBaseTest() { val dp = newDP() - assertThat(dp.numShownHotseatIcons).isEqualTo(5) + assertThat(dp.numShownHotseatIcons).isEqualTo(4) + } + + @Test + fun hotseat_size_is_not_shrunk_on_gesture_tablet() { + initializeVarsForTablet(isLandscape = true) + inv = newScalableInvariantDeviceProfile().apply { + deviceType = TYPE_TABLET + inlineQsb = booleanArrayOf( + false, + true, // landscape + false, + false + ) + numShownHotseatIcons = 6 + } + + isGestureMode = true + val dp = newDP() + + if (dp.hotseatQsbHeight > 0) { + assertThat(dp.isQsbInline).isTrue() + assertThat(dp.numShownHotseatIcons).isEqualTo(6) + } else { // Launcher3 doesn't have QSB height + assertThat(dp.isQsbInline).isFalse() + assertThat(dp.numShownHotseatIcons).isEqualTo(6) + } } @Test @@ -140,6 +166,7 @@ class HotseatSizeTest : DeviceProfileBaseTest() { false, false ) + numShownHotseatIcons = 6 } isGestureMode = false @@ -147,10 +174,10 @@ class HotseatSizeTest : DeviceProfileBaseTest() { if (dp.hotseatQsbHeight > 0) { assertThat(dp.isQsbInline).isTrue() - assertThat(dp.numShownHotseatIcons).isEqualTo(4) + assertThat(dp.numShownHotseatIcons).isEqualTo(5) } else { // Launcher3 doesn't have QSB height assertThat(dp.isQsbInline).isFalse() - assertThat(dp.numShownHotseatIcons).isEqualTo(5) + assertThat(dp.numShownHotseatIcons).isEqualTo(6) } } @@ -169,6 +196,7 @@ class HotseatSizeTest : DeviceProfileBaseTest() { false, false ) + numShownHotseatIcons = 6 } isGestureMode = false @@ -176,10 +204,10 @@ class HotseatSizeTest : DeviceProfileBaseTest() { if (dp.hotseatQsbHeight > 0) { assertThat(dp.isQsbInline).isFalse() - assertThat(dp.numShownHotseatIcons).isEqualTo(4) + assertThat(dp.numShownHotseatIcons).isEqualTo(5) } else { // Launcher3 doesn't have QSB height assertThat(dp.isQsbInline).isFalse() - assertThat(dp.numShownHotseatIcons).isEqualTo(5) + assertThat(dp.numShownHotseatIcons).isEqualTo(6) } }