Merge "Convert TaskIconCache and TaskThumbnailCache to kotlin" into main
diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
deleted file mode 100644
index 721c831..0000000
--- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2019 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.uioverrides;
-
-import static com.android.app.animation.Interpolators.ACCELERATE_DECELERATE;
-import static com.android.app.animation.Interpolators.AGGRESSIVE_EASE_IN_OUT;
-import static com.android.app.animation.Interpolators.FINAL_FRAME;
-import static com.android.app.animation.Interpolators.INSTANT;
-import static com.android.app.animation.Interpolators.LINEAR;
-import static com.android.launcher3.Flags.enableLargeDesktopWindowingTile;
-import static com.android.launcher3.LauncherState.QUICK_SWITCH_FROM_HOME;
-import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SPLIT_SELECTION_EXIT_HOME;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
-import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
-import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
-import static com.android.quickstep.views.RecentsView.DESKTOP_CAROUSEL_DETACH_PROGRESS;
-import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;
-import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
-import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;
-import static com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA;
-
-import android.util.FloatProperty;
-import android.view.animation.Interpolator;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.config.FeatureFlags;
-import com.android.launcher3.statemanager.StateManager.StateHandler;
-import com.android.launcher3.states.StateAnimationConfig;
-import com.android.quickstep.views.RecentsView;
-
-/**
- * State handler for recents view. Manages UI changes and animations for recents view based off the
- * current {@link LauncherState}.
- *
- * @param <T> the recents view
- */
-public abstract class BaseRecentsViewStateController<T extends RecentsView>
- implements StateHandler<LauncherState> {
- protected final T mRecentsView;
- protected final QuickstepLauncher mLauncher;
-
- public BaseRecentsViewStateController(@NonNull QuickstepLauncher launcher) {
- mLauncher = launcher;
- mRecentsView = launcher.getOverviewPanel();
- }
-
- @Override
- public void setState(@NonNull LauncherState state) {
- float[] scaleAndOffset = state.getOverviewScaleAndOffset(mLauncher);
- RECENTS_SCALE_PROPERTY.set(mRecentsView, scaleAndOffset[0]);
- ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, scaleAndOffset[1]);
- TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f);
-
- getContentAlphaProperty().set(mRecentsView, state.isRecentsViewVisible ? 1f : 0);
- getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());
- RECENTS_GRID_PROGRESS.set(mRecentsView,
- state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f);
- TASK_THUMBNAIL_SPLASH_ALPHA.set(mRecentsView, state.showTaskThumbnailSplash() ? 1f : 0f);
- if (enableLargeDesktopWindowingTile()) {
- DESKTOP_CAROUSEL_DETACH_PROGRESS.set(mRecentsView,
- state.detachDesktopCarousel() ? 1f : 0f);
- }
- }
-
- @Override
- public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
- PendingAnimation builder) {
- if (config.hasAnimationFlag(SKIP_OVERVIEW)) {
- return;
- }
- setStateWithAnimationInternal(toState, config, builder);
- builder.addEndListener(success -> {
- if (!success && !toState.isRecentsViewVisible) {
- mRecentsView.reset();
- }
- });
- }
-
- /**
- * Core logic for animating the recents view UI.
- *
- * @param toState state to animate to
- * @param config current animation config
- * @param setter animator set builder
- */
- void setStateWithAnimationInternal(@NonNull final LauncherState toState,
- @NonNull StateAnimationConfig config, @NonNull PendingAnimation setter) {
- float[] scaleAndOffset = toState.getOverviewScaleAndOffset(mLauncher);
- setter.setFloat(mRecentsView, RECENTS_SCALE_PROPERTY, scaleAndOffset[0],
- config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR));
- setter.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1],
- config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));
- setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,
- config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));
-
- boolean exitingOverview =
- !FeatureFlags.enableSplitContextually() && !toState.isRecentsViewVisible;
- if (mRecentsView.isSplitSelectionActive() && exitingOverview) {
- setter.add(mRecentsView.getSplitSelectController().getSplitAnimationController()
- .createPlaceholderDismissAnim(mLauncher, LAUNCHER_SPLIT_SELECTION_EXIT_HOME,
- setter.getDuration()));
- setter.setViewAlpha(
- mRecentsView.getSplitInstructionsView(),
- 0,
- config.getInterpolator(
- ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE,
- LINEAR
- )
- );
- }
-
- setter.setFloat(mRecentsView, getContentAlphaProperty(),
- toState.isRecentsViewVisible ? 1 : 0,
- config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));
-
- setter.setFloat(
- mRecentsView, getTaskModalnessProperty(),
- toState.getOverviewModalness(),
- config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR));
-
- LauncherState fromState = mLauncher.getStateManager().getState();
- setter.setFloat(mRecentsView, TASK_THUMBNAIL_SPLASH_ALPHA,
- toState.showTaskThumbnailSplash() ? 1f : 0f,
- getOverviewInterpolator(fromState, toState));
-
- setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS,
- toState.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f,
- getOverviewInterpolator(fromState, toState));
-
- if (enableLargeDesktopWindowingTile()) {
- setter.setFloat(mRecentsView, DESKTOP_CAROUSEL_DETACH_PROGRESS,
- toState.detachDesktopCarousel() ? 1f : 0f,
- getOverviewInterpolator(fromState, toState));
- }
- }
-
- private Interpolator getOverviewInterpolator(LauncherState fromState, LauncherState toState) {
- return fromState == QUICK_SWITCH_FROM_HOME
- ? ACCELERATE_DECELERATE
- : toState.isRecentsViewVisible ? INSTANT : FINAL_FRAME;
- }
-
- abstract FloatProperty getTaskModalnessProperty();
-
- /**
- * Get property for content alpha for the recents view.
- *
- * @return the float property for the view's content alpha
- */
- abstract FloatProperty getContentAlphaProperty();
-}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
deleted file mode 100644
index 111069f..0000000
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2017 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.uioverrides;
-
-import static com.android.app.animation.Interpolators.LINEAR;
-import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;
-import static com.android.launcher3.LauncherState.OVERVIEW;
-import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;
-import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
-import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;
-import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;
-import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;
-import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;
-import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION;
-import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_SPLIT_TRANSLATION;
-import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL;
-import static com.android.wm.shell.Flags.enableSplitContextual;
-
-import android.animation.AnimatorSet;
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.util.FloatProperty;
-import android.util.Log;
-import android.util.Pair;
-
-import androidx.annotation.NonNull;
-
-import com.android.launcher3.LauncherState;
-import com.android.launcher3.Utilities;
-import com.android.launcher3.anim.AnimatedFloat;
-import com.android.launcher3.anim.AnimatorListeners;
-import com.android.launcher3.anim.PendingAnimation;
-import com.android.launcher3.anim.PropertySetter;
-import com.android.launcher3.states.StateAnimationConfig;
-import com.android.quickstep.orientation.RecentsPagedOrientationHandler;
-import com.android.quickstep.util.AnimUtils;
-import com.android.quickstep.util.SplitAnimationTimings;
-import com.android.quickstep.views.ClearAllButton;
-import com.android.quickstep.views.LauncherRecentsView;
-import com.android.quickstep.views.RecentsView;
-
-/**
- * State handler for handling UI changes for {@link LauncherRecentsView}. In addition to managing
- * the basic view properties, this class also manages changes in the task visuals.
- */
-@TargetApi(Build.VERSION_CODES.O)
-public final class RecentsViewStateController extends
- BaseRecentsViewStateController<LauncherRecentsView> {
-
- public RecentsViewStateController(QuickstepLauncher launcher) {
- super(launcher);
- }
-
- @Override
- public void setState(@NonNull LauncherState state) {
- super.setState(state);
- if (state.isRecentsViewVisible) {
- mRecentsView.updateEmptyMessage();
- } else {
- mRecentsView.resetTaskVisuals();
- }
- setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, new StateAnimationConfig(), state);
- mRecentsView.setFullscreenProgress(state.getOverviewFullscreenProgress());
- // In Overview, we may be layering app surfaces behind Launcher, so we need to notify
- // DepthController to prevent optimizations which might occlude the layers behind
- mLauncher.getDepthController().setHasContentBehindLauncher(state.isRecentsViewVisible);
-
- PendingAnimation builder =
- new PendingAnimation(state.getTransitionDuration(mLauncher, true));
-
- handleSplitSelectionState(state, builder, /* animate */false);
- }
-
- @Override
- void setStateWithAnimationInternal(@NonNull LauncherState toState,
- @NonNull StateAnimationConfig config, @NonNull PendingAnimation builder) {
- super.setStateWithAnimationInternal(toState, config, builder);
-
- if (toState.isRecentsViewVisible) {
- // While animating into recents, update the visible task data as needed
- builder.addOnFrameCallback(() -> mRecentsView.loadVisibleTaskData(FLAG_UPDATE_ALL));
- mRecentsView.updateEmptyMessage();
- // TODO(b/246283207): Remove logging once root cause of flake detected.
- if (Utilities.isRunningInTestHarness()) {
- Log.d("b/246283207", "RecentsView#setStateWithAnimationInternal getCurrentPage(): "
- + mRecentsView.getCurrentPage()
- + ", getScrollForPage(getCurrentPage())): "
- + mRecentsView.getScrollForPage(mRecentsView.getCurrentPage()));
- }
- } else {
- builder.addListener(
- AnimatorListeners.forSuccessCallback(mRecentsView::resetTaskVisuals));
- }
- // In Overview, we may be layering app surfaces behind Launcher, so we need to notify
- // DepthController to prevent optimizations which might occlude the layers behind
- builder.addListener(AnimatorListeners.forSuccessCallback(() ->
- mLauncher.getDepthController().setHasContentBehindLauncher(
- toState.isRecentsViewVisible)));
-
- handleSplitSelectionState(toState, builder, /* animate */true);
-
- setAlphas(builder, config, toState);
- builder.setFloat(mRecentsView, FULLSCREEN_PROGRESS,
- toState.getOverviewFullscreenProgress(), LINEAR);
- }
-
- /**
- * Create or dismiss split screen select animations.
- * @param builder if null then this will run the split select animations right away, otherwise
- * will add animations to builder.
- */
- private void handleSplitSelectionState(@NonNull LauncherState toState,
- @NonNull PendingAnimation builder, boolean animate) {
- boolean goingToOverviewFromWorkspaceContextual = enableSplitContextual() &&
- toState == OVERVIEW && mLauncher.isSplitSelectionActive();
- if (toState != OVERVIEW_SPLIT_SELECT && !goingToOverviewFromWorkspaceContextual) {
- // Not going to split
- return;
- }
-
- // Create transition animations to split select
- RecentsPagedOrientationHandler orientationHandler =
- ((RecentsView) mLauncher.getOverviewPanel()).getPagedOrientationHandler();
- Pair<FloatProperty<RecentsView>, FloatProperty<RecentsView>> taskViewsFloat =
- orientationHandler.getSplitSelectTaskOffset(
- TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION,
- mLauncher.getDeviceProfile());
-
- SplitAnimationTimings timings =
- AnimUtils.getDeviceOverviewToSplitTimings(mLauncher.getDeviceProfile().isTablet);
- if (!goingToOverviewFromWorkspaceContextual) {
- // This animation is already done for the contextual case, don't redo it
- mRecentsView.createSplitSelectInitAnimation(builder,
- toState.getTransitionDuration(mLauncher, true /* isToState */));
- }
- // Shift tasks vertically downward to get out of placeholder view
- builder.setFloat(mRecentsView, taskViewsFloat.first,
- toState.getSplitSelectTranslation(mLauncher),
- timings.getGridSlidePrimaryInterpolator());
- // Zero out horizontal translation
- builder.setFloat(mRecentsView, taskViewsFloat.second,
- 0,
- timings.getGridSlideSecondaryInterpolator());
-
- mRecentsView.handleDesktopTaskInSplitSelectState(builder,
- timings.getDesktopTaskFadeInterpolator());
-
- if (!animate) {
- AnimatorSet as = builder.buildAnim();
- as.start();
- as.end();
- }
- }
-
- private void setAlphas(PropertySetter propertySetter, StateAnimationConfig config,
- LauncherState state) {
- float clearAllButtonAlpha = state.areElementsVisible(mLauncher, CLEAR_ALL_BUTTON) ? 1 : 0;
- propertySetter.setFloat(mRecentsView.getClearAllButton(), ClearAllButton.VISIBILITY_ALPHA,
- clearAllButtonAlpha, LINEAR);
- float overviewButtonAlpha = state.areElementsVisible(mLauncher, OVERVIEW_ACTIONS) ? 1 : 0;
- propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),
- AnimatedFloat.VALUE, overviewButtonAlpha, config.getInterpolator(
- ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));
- }
-
- @Override
- FloatProperty<RecentsView> getTaskModalnessProperty() {
- return TASK_MODALNESS;
- }
-
- @Override
- FloatProperty<RecentsView> getContentAlphaProperty() {
- return CONTENT_ALPHA;
- }
-}
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt
new file mode 100644
index 0000000..f196548
--- /dev/null
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2025 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.uioverrides
+
+import com.android.app.animation.Interpolators.ACCELERATE_DECELERATE
+import com.android.app.animation.Interpolators.AGGRESSIVE_EASE_IN_OUT
+import com.android.app.animation.Interpolators.FINAL_FRAME
+import com.android.app.animation.Interpolators.INSTANT
+import com.android.app.animation.Interpolators.LINEAR
+import com.android.launcher3.Flags.enableLargeDesktopWindowingTile
+import com.android.launcher3.LauncherState
+import com.android.launcher3.anim.AnimatedFloat
+import com.android.launcher3.anim.AnimatorListeners.forSuccessCallback
+import com.android.launcher3.anim.PendingAnimation
+import com.android.launcher3.anim.PropertySetter
+import com.android.launcher3.config.FeatureFlags.enableSplitContextually
+import com.android.launcher3.logging.StatsLogManager.LauncherEvent
+import com.android.launcher3.statemanager.StateManager.StateHandler
+import com.android.launcher3.states.StateAnimationConfig
+import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE
+import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE
+import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL
+import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE
+import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE
+import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X
+import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y
+import com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW
+import com.android.quickstep.util.AnimUtils
+import com.android.quickstep.views.ClearAllButton
+import com.android.quickstep.views.RecentsView
+import com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET
+import com.android.quickstep.views.RecentsView.CONTENT_ALPHA
+import com.android.quickstep.views.RecentsView.DESKTOP_CAROUSEL_DETACH_PROGRESS
+import com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS
+import com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS
+import com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY
+import com.android.quickstep.views.RecentsView.TASK_MODALNESS
+import com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION
+import com.android.quickstep.views.RecentsView.TASK_SECONDARY_SPLIT_TRANSLATION
+import com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION
+import com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA
+import com.android.quickstep.views.TaskView.Companion.FLAG_UPDATE_ALL
+import com.android.wm.shell.Flags.enableSplitContextual
+
+/**
+ * State handler for handling UI changes for [com.android.quickstep.views.LauncherRecentsView]. In
+ * addition to managing the basic view properties, this class also manages changes in the task
+ * visuals.
+ */
+class RecentsViewStateController(private val launcher: QuickstepLauncher) :
+ StateHandler<LauncherState> {
+ private val recentsView: RecentsView<*, *> = launcher.getOverviewPanel()
+
+ override fun setState(state: LauncherState) {
+ val scaleAndOffset = state.getOverviewScaleAndOffset(launcher)
+ RECENTS_SCALE_PROPERTY.set(recentsView, scaleAndOffset[0])
+ ADJACENT_PAGE_HORIZONTAL_OFFSET.set(recentsView, scaleAndOffset[1])
+ TASK_SECONDARY_TRANSLATION.set(recentsView, 0f)
+
+ CONTENT_ALPHA.set(recentsView, if (state.isRecentsViewVisible) 1f else 0f)
+ TASK_MODALNESS.set(recentsView, state.overviewModalness)
+ RECENTS_GRID_PROGRESS.set(
+ recentsView,
+ if (state.displayOverviewTasksAsGrid(launcher.deviceProfile)) 1f else 0f,
+ )
+ TASK_THUMBNAIL_SPLASH_ALPHA.set(
+ recentsView,
+ if (state.showTaskThumbnailSplash()) 1f else 0f,
+ )
+ if (enableLargeDesktopWindowingTile()) {
+ DESKTOP_CAROUSEL_DETACH_PROGRESS.set(
+ recentsView,
+ if (state.detachDesktopCarousel()) 1f else 0f,
+ )
+ }
+
+ if (state.isRecentsViewVisible) {
+ recentsView.updateEmptyMessage()
+ } else {
+ recentsView.resetTaskVisuals()
+ }
+ setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, StateAnimationConfig(), state)
+ recentsView.setFullscreenProgress(state.overviewFullscreenProgress)
+ // In Overview, we may be layering app surfaces behind Launcher, so we need to notify
+ // DepthController to prevent optimizations which might occlude the layers behind
+ launcher.depthController.setHasContentBehindLauncher(state.isRecentsViewVisible)
+
+ val builder = PendingAnimation(state.getTransitionDuration(launcher, true).toLong())
+ handleSplitSelectionState(state, builder, animate = false)
+ }
+
+ override fun setStateWithAnimation(
+ toState: LauncherState,
+ config: StateAnimationConfig,
+ builder: PendingAnimation,
+ ) {
+ if (config.hasAnimationFlag(SKIP_OVERVIEW)) return
+
+ val scaleAndOffset = toState.getOverviewScaleAndOffset(launcher)
+ builder.setFloat(
+ recentsView,
+ RECENTS_SCALE_PROPERTY,
+ scaleAndOffset[0],
+ config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR),
+ )
+ builder.setFloat(
+ recentsView,
+ ADJACENT_PAGE_HORIZONTAL_OFFSET,
+ scaleAndOffset[1],
+ config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR),
+ )
+ builder.setFloat(
+ recentsView,
+ TASK_SECONDARY_TRANSLATION,
+ 0f,
+ config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR),
+ )
+
+ val exitingOverview = !enableSplitContextually() && !toState.isRecentsViewVisible
+ if (recentsView.isSplitSelectionActive && exitingOverview) {
+ builder.add(
+ recentsView.splitSelectController.splitAnimationController
+ .createPlaceholderDismissAnim(
+ launcher,
+ LauncherEvent.LAUNCHER_SPLIT_SELECTION_EXIT_HOME,
+ builder.duration,
+ )
+ )
+ builder.setViewAlpha(
+ recentsView.splitInstructionsView,
+ 0f,
+ config.getInterpolator(ANIM_OVERVIEW_SPLIT_SELECT_INSTRUCTIONS_FADE, LINEAR),
+ )
+ }
+
+ builder.setFloat(
+ recentsView,
+ CONTENT_ALPHA,
+ if (toState.isRecentsViewVisible) 1f else 0f,
+ config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT),
+ )
+
+ builder.setFloat(
+ recentsView,
+ TASK_MODALNESS,
+ toState.overviewModalness,
+ config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR),
+ )
+
+ val fromState = launcher.stateManager.state
+ builder.setFloat(
+ recentsView,
+ TASK_THUMBNAIL_SPLASH_ALPHA,
+ if (toState.showTaskThumbnailSplash()) 1f else 0f,
+ getOverviewInterpolator(fromState, toState),
+ )
+
+ builder.setFloat(
+ recentsView,
+ RECENTS_GRID_PROGRESS,
+ if (toState.displayOverviewTasksAsGrid(launcher.deviceProfile)) 1f else 0f,
+ getOverviewInterpolator(fromState, toState),
+ )
+
+ if (enableLargeDesktopWindowingTile()) {
+ builder.setFloat(
+ recentsView,
+ DESKTOP_CAROUSEL_DETACH_PROGRESS,
+ if (toState.detachDesktopCarousel()) 1f else 0f,
+ getOverviewInterpolator(fromState, toState),
+ )
+ }
+
+ if (toState.isRecentsViewVisible) {
+ // While animating into recents, update the visible task data as needed
+ builder.addOnFrameCallback { recentsView.loadVisibleTaskData(FLAG_UPDATE_ALL) }
+ recentsView.updateEmptyMessage()
+ } else {
+ builder.addListener(forSuccessCallback { recentsView.resetTaskVisuals() })
+ }
+ // In Overview, we may be layering app surfaces behind Launcher, so we need to notify
+ // DepthController to prevent optimizations which might occlude the layers behind
+ builder.addListener(
+ forSuccessCallback {
+ launcher.depthController.setHasContentBehindLauncher(toState.isRecentsViewVisible)
+ }
+ )
+
+ handleSplitSelectionState(toState, builder, animate = true)
+
+ setAlphas(builder, config, toState)
+ builder.setFloat(
+ recentsView,
+ FULLSCREEN_PROGRESS,
+ toState.overviewFullscreenProgress,
+ LINEAR,
+ )
+
+ builder.addEndListener { success: Boolean ->
+ if (!success && !toState.isRecentsViewVisible) {
+ recentsView.reset()
+ }
+ }
+ }
+
+ /**
+ * Create or dismiss split screen select animations.
+ *
+ * @param builder if null then this will run the split select animations right away, otherwise
+ * will add animations to builder.
+ */
+ private fun handleSplitSelectionState(
+ toState: LauncherState,
+ builder: PendingAnimation,
+ animate: Boolean,
+ ) {
+ val goingToOverviewFromWorkspaceContextual =
+ enableSplitContextual() &&
+ toState == LauncherState.OVERVIEW &&
+ launcher.isSplitSelectionActive
+ if (
+ toState != LauncherState.OVERVIEW_SPLIT_SELECT &&
+ !goingToOverviewFromWorkspaceContextual
+ ) {
+ // Not going to split
+ return
+ }
+
+ // Create transition animations to split select
+ val orientationHandler = recentsView.pagedOrientationHandler
+ val taskViewsFloat =
+ orientationHandler.getSplitSelectTaskOffset(
+ TASK_PRIMARY_SPLIT_TRANSLATION,
+ TASK_SECONDARY_SPLIT_TRANSLATION,
+ launcher.deviceProfile,
+ )
+
+ val timings = AnimUtils.getDeviceOverviewToSplitTimings(launcher.deviceProfile.isTablet)
+ if (!goingToOverviewFromWorkspaceContextual) {
+ // This animation is already done for the contextual case, don't redo it
+ recentsView.createSplitSelectInitAnimation(
+ builder,
+ toState.getTransitionDuration(launcher, true),
+ )
+ }
+ // Shift tasks vertically downward to get out of placeholder view
+ builder.setFloat(
+ recentsView,
+ taskViewsFloat.first,
+ toState.getSplitSelectTranslation(launcher),
+ timings.gridSlidePrimaryInterpolator,
+ )
+ // Zero out horizontal translation
+ builder.setFloat(
+ recentsView,
+ taskViewsFloat.second,
+ 0f,
+ timings.gridSlideSecondaryInterpolator,
+ )
+
+ recentsView.handleDesktopTaskInSplitSelectState(
+ builder,
+ timings.desktopTaskFadeInterpolator,
+ )
+
+ if (!animate) {
+ builder.buildAnim().apply {
+ start()
+ end()
+ }
+ }
+ }
+
+ private fun setAlphas(
+ propertySetter: PropertySetter,
+ config: StateAnimationConfig,
+ state: LauncherState,
+ ) {
+ val clearAllButtonAlpha =
+ if (state.areElementsVisible(launcher, LauncherState.CLEAR_ALL_BUTTON)) 1f else 0f
+ propertySetter.setFloat(
+ recentsView.clearAllButton,
+ ClearAllButton.VISIBILITY_ALPHA,
+ clearAllButtonAlpha,
+ LINEAR,
+ )
+ val overviewButtonAlpha =
+ if (state.areElementsVisible(launcher, LauncherState.OVERVIEW_ACTIONS)) 1f else 0f
+ propertySetter.setFloat(
+ launcher.actionsView.visibilityAlpha,
+ AnimatedFloat.VALUE,
+ overviewButtonAlpha,
+ config.getInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR),
+ )
+ }
+
+ private fun getOverviewInterpolator(fromState: LauncherState, toState: LauncherState) =
+ when {
+ fromState == LauncherState.QUICK_SWITCH_FROM_HOME -> ACCELERATE_DECELERATE
+ toState.isRecentsViewVisible -> INSTANT
+ else -> FINAL_FRAME
+ }
+}
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
index daac9fb..44fdaec 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java
@@ -136,7 +136,7 @@
setter.add(pa.buildAnim());
}
- Pair<FloatProperty<RecentsView>, FloatProperty<RecentsView>> taskViewsFloat =
+ Pair<FloatProperty<RecentsView<?, ?>>, FloatProperty<RecentsView<?, ?>>> taskViewsFloat =
mRecentsView.getPagedOrientationHandler().getSplitSelectTaskOffset(
TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION,
mRecentsViewContainer.getDeviceProfile());
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index cdf4efe..7c745a2 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -269,8 +269,8 @@
private static final String TAG = "RecentsView";
private static final boolean DEBUG = false;
- public static final FloatProperty<RecentsView> CONTENT_ALPHA =
- new FloatProperty<RecentsView>("contentAlpha") {
+ public static final FloatProperty<RecentsView<?, ?>> CONTENT_ALPHA =
+ new FloatProperty<>("contentAlpha") {
@Override
public void setValue(RecentsView view, float v) {
view.setContentAlpha(v);
@@ -282,8 +282,8 @@
}
};
- public static final FloatProperty<RecentsView> FULLSCREEN_PROGRESS =
- new FloatProperty<RecentsView>("fullscreenProgress") {
+ public static final FloatProperty<RecentsView<?, ?>> FULLSCREEN_PROGRESS =
+ new FloatProperty<>("fullscreenProgress") {
@Override
public void setValue(RecentsView recentsView, float v) {
recentsView.setFullscreenProgress(v);
@@ -295,8 +295,8 @@
}
};
- public static final FloatProperty<RecentsView> TASK_MODALNESS =
- new FloatProperty<RecentsView>("taskModalness") {
+ public static final FloatProperty<RecentsView<?, ?>> TASK_MODALNESS =
+ new FloatProperty<>("taskModalness") {
@Override
public void setValue(RecentsView recentsView, float v) {
recentsView.setTaskModalness(v);
@@ -308,8 +308,8 @@
}
};
- public static final FloatProperty<RecentsView> ADJACENT_PAGE_HORIZONTAL_OFFSET =
- new FloatProperty<RecentsView>("adjacentPageHorizontalOffset") {
+ public static final FloatProperty<RecentsView<?, ?>> ADJACENT_PAGE_HORIZONTAL_OFFSET =
+ new FloatProperty<>("adjacentPageHorizontalOffset") {
@Override
public void setValue(RecentsView recentsView, float v) {
if (recentsView.mAdjacentPageHorizontalOffset != v) {
@@ -324,8 +324,8 @@
}
};
- public static final FloatProperty<RecentsView> RUNNING_TASK_ATTACH_ALPHA =
- new FloatProperty<RecentsView>("runningTaskAttachAlpha") {
+ public static final FloatProperty<RecentsView<?, ?>> RUNNING_TASK_ATTACH_ALPHA =
+ new FloatProperty<>("runningTaskAttachAlpha") {
@Override
public void setValue(RecentsView recentsView, float v) {
recentsView.mRunningTaskAttachAlpha = v;
@@ -349,8 +349,8 @@
* Can be used to tint the color of the RecentsView to simulate a scrim that can views
* excluded from. Really should be a proper scrim.
*/
- private static final FloatProperty<RecentsView> COLOR_TINT =
- new FloatProperty<RecentsView>("colorTint") {
+ private static final FloatProperty<RecentsView<?, ?>> COLOR_TINT =
+ new FloatProperty<>("colorTint") {
@Override
public void setValue(RecentsView recentsView, float v) {
recentsView.setColorTint(v);
@@ -368,8 +368,8 @@
* more specific, we'd want to create a similar FloatProperty just for a TaskView's
* offsetX/Y property
*/
- public static final FloatProperty<RecentsView> TASK_SECONDARY_TRANSLATION =
- new FloatProperty<RecentsView>("taskSecondaryTranslation") {
+ public static final FloatProperty<RecentsView<?, ?>> TASK_SECONDARY_TRANSLATION =
+ new FloatProperty<>("taskSecondaryTranslation") {
@Override
public void setValue(RecentsView recentsView, float v) {
recentsView.setTaskViewsResistanceTranslation(v);
@@ -387,8 +387,8 @@
* more specific, we'd want to create a similar FloatProperty just for a TaskView's
* offsetX/Y property
*/
- public static final FloatProperty<RecentsView> TASK_PRIMARY_SPLIT_TRANSLATION =
- new FloatProperty<RecentsView>("taskPrimarySplitTranslation") {
+ public static final FloatProperty<RecentsView<?, ?>> TASK_PRIMARY_SPLIT_TRANSLATION =
+ new FloatProperty<>("taskPrimarySplitTranslation") {
@Override
public void setValue(RecentsView recentsView, float v) {
recentsView.setTaskViewsPrimarySplitTranslation(v);
@@ -400,8 +400,8 @@
}
};
- public static final FloatProperty<RecentsView> TASK_SECONDARY_SPLIT_TRANSLATION =
- new FloatProperty<RecentsView>("taskSecondarySplitTranslation") {
+ public static final FloatProperty<RecentsView<?, ?>> TASK_SECONDARY_SPLIT_TRANSLATION =
+ new FloatProperty<>("taskSecondarySplitTranslation") {
@Override
public void setValue(RecentsView recentsView, float v) {
recentsView.setTaskViewsSecondarySplitTranslation(v);
@@ -414,8 +414,8 @@
};
/** Same as normal SCALE_PROPERTY, but also updates page offsets that depend on this scale. */
- public static final FloatProperty<RecentsView> RECENTS_SCALE_PROPERTY =
- new FloatProperty<RecentsView>("recentsScale") {
+ public static final FloatProperty<RecentsView<?, ?>> RECENTS_SCALE_PROPERTY =
+ new FloatProperty<>("recentsScale") {
@Override
public void setValue(RecentsView view, float scale) {
view.setScaleX(scale);
@@ -444,8 +444,8 @@
* Progress of Recents view from carousel layout to grid layout. If Recents is not shown as a
* grid, then the value remains 0.
*/
- public static final FloatProperty<RecentsView> RECENTS_GRID_PROGRESS =
- new FloatProperty<RecentsView>("recentsGrid") {
+ public static final FloatProperty<RecentsView<?, ?>> RECENTS_GRID_PROGRESS =
+ new FloatProperty<>("recentsGrid") {
@Override
public void setValue(RecentsView view, float gridProgress) {
view.setGridProgress(gridProgress);
@@ -457,7 +457,7 @@
}
};
- public static final FloatProperty<RecentsView> DESKTOP_CAROUSEL_DETACH_PROGRESS =
+ public static final FloatProperty<RecentsView<?, ?>> DESKTOP_CAROUSEL_DETACH_PROGRESS =
new FloatProperty<>("desktopCarouselDetachProgress") {
@Override
public void setValue(RecentsView view, float offset) {
@@ -476,8 +476,8 @@
* Alpha of the task thumbnail splash, where being in BackgroundAppState has a value of 1, and
* being in any other state has a value of 0.
*/
- public static final FloatProperty<RecentsView> TASK_THUMBNAIL_SPLASH_ALPHA =
- new FloatProperty<RecentsView>("taskThumbnailSplashAlpha") {
+ public static final FloatProperty<RecentsView<?, ?>> TASK_THUMBNAIL_SPLASH_ALPHA =
+ new FloatProperty<>("taskThumbnailSplashAlpha") {
@Override
public void setValue(RecentsView view, float taskThumbnailSplashAlpha) {
view.setTaskThumbnailSplashAlpha(taskThumbnailSplashAlpha);
@@ -5484,7 +5484,7 @@
firstFloatingTaskView.update(mTempRectF, /*progress=*/1f);
RecentsPagedOrientationHandler orientationHandler = getPagedOrientationHandler();
- Pair<FloatProperty<RecentsView>, FloatProperty<RecentsView>> taskViewsFloat =
+ Pair<FloatProperty<RecentsView<?, ?>>, FloatProperty<RecentsView<?, ?>>> taskViewsFloat =
orientationHandler.getSplitSelectTaskOffset(
TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION,
mContainer.getDeviceProfile());
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index ec6a9c3..961dc58 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -337,7 +337,6 @@
@Test
@NavigationModeSwitch
@PortraitLandscape
- @ScreenRecord // b/313464374
@TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) // b/325659406
public void testQuickSwitchFromApp() throws Exception {
startTestActivity(2);
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index db5d7d4..b8fdfe7 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -1315,7 +1315,6 @@
applyFromApplicationInfo((AppInfo) info);
} else if (info instanceof WorkspaceItemInfo) {
applyFromWorkspaceItem((WorkspaceItemInfo) info);
- mActivity.invalidateParent(info);
} else if (info != null) {
applyFromItemInfoWithIcon(info);
}
@@ -1329,12 +1328,11 @@
* Verifies that the current icon is high-res otherwise posts a request to load the icon.
*/
public void verifyHighRes() {
- if (mIconLoadRequest != null) {
- mIconLoadRequest.cancel();
- mIconLoadRequest = null;
- }
if (getTag() instanceof ItemInfoWithIcon info && !mHighResUpdateInProgress
&& info.getMatchingLookupFlag().useLowRes()) {
+ if (mIconLoadRequest != null) {
+ mIconLoadRequest.cancel();
+ }
mIconLoadRequest = LauncherAppState.getInstance(getContext()).getIconCache()
.updateIconInBackground(BubbleTextView.this, info);
}
diff --git a/src/com/android/launcher3/DropTargetHandler.kt b/src/com/android/launcher3/DropTargetHandler.kt
index 4d3fe52..66c948a 100644
--- a/src/com/android/launcher3/DropTargetHandler.kt
+++ b/src/com/android/launcher3/DropTargetHandler.kt
@@ -66,6 +66,11 @@
fun onDeleteComplete(item: ItemInfo) {
removeItemAndStripEmptyScreens(null /* view */, item)
+ AbstractFloatingView.closeOpenViews(
+ mLauncher,
+ false,
+ AbstractFloatingView.TYPE_WIDGET_RESIZE_FRAME,
+ )
var pageItem: ItemInfo = item
if (item.container <= 0) {
val v = mLauncher.workspace.getHomescreenIconByItemId(item.container)
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index b38efc2..b9e4710 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -72,7 +72,6 @@
import static com.android.launcher3.Utilities.postAsyncCallback;
import static com.android.launcher3.config.FeatureFlags.FOLDABLE_SINGLE_PAGE;
import static com.android.launcher3.config.FeatureFlags.MULTI_SELECT_EDIT_MODE;
-import static com.android.launcher3.folder.FolderGridOrganizer.createFolderGridOrganizer;
import static com.android.launcher3.logging.KeyboardStateManager.KeyboardState.HIDE;
import static com.android.launcher3.logging.KeyboardStateManager.KeyboardState.SHOW;
import static com.android.launcher3.logging.StatsLogManager.EventEnum;
@@ -206,7 +205,6 @@
import com.android.launcher3.model.ModelWriter;
import com.android.launcher3.model.StringCache;
import com.android.launcher3.model.data.AppInfo;
-import com.android.launcher3.model.data.AppPairInfo;
import com.android.launcher3.model.data.CollectionInfo;
import com.android.launcher3.model.data.FolderInfo;
import com.android.launcher3.model.data.ItemInfo;
@@ -831,26 +829,6 @@
return true;
}
- @Override
- public void invalidateParent(ItemInfo info) {
- if (info.container >= 0) {
- View collectionIcon = getWorkspace().getHomescreenIconByItemId(info.container);
- if (collectionIcon instanceof FolderIcon folderIcon
- && collectionIcon.getTag() instanceof FolderInfo) {
- if (createFolderGridOrganizer(getDeviceProfile())
- .setFolderInfo((FolderInfo) folderIcon.getTag())
- .isItemInPreview(info.rank)) {
- folderIcon.invalidate();
- }
- } else if (collectionIcon instanceof AppPairIcon appPairIcon
- && collectionIcon.getTag() instanceof AppPairInfo appPairInfo) {
- if (appPairInfo.getContents().contains(info)) {
- appPairIcon.getIconDrawableArea().redraw();
- }
- }
- }
- }
-
/**
* Returns whether we should delay spring loaded mode -- for shortcuts and widgets that have
* a configuration step, this allows the proper animations to run after other transitions.
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index 81d6631..78b53a9 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -199,6 +199,8 @@
host.requestFocus();
host.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
host.performAccessibilityAction(ACTION_ACCESSIBILITY_FOCUS, null);
+ AbstractFloatingView.closeOpenViews(mContext, /* animate= */ false,
+ AbstractFloatingView.TYPE_WIDGET_RESIZE_FRAME);
});
return true;
} else if (action == DEEP_SHORTCUTS) {
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index 8d751e6..22f1164 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -24,7 +24,6 @@
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Path;
-import android.graphics.drawable.Drawable;
import android.util.ArrayMap;
import android.util.AttributeSet;
import android.util.Log;
@@ -541,19 +540,10 @@
ShortcutAndWidgetContainer parent = page.getShortcutsAndWidgets();
for (int i = parent.getChildCount() - 1; i >= 0; i--) {
View iconView = parent.getChildAt(i);
- Drawable d = null;
if (iconView instanceof BubbleTextView btv) {
btv.verifyHighRes();
- d = btv.getIcon();
} else if (iconView instanceof AppPairIcon api) {
api.verifyHighRes();
- d = api.getIconDrawableArea().getDrawable();
- }
-
- // Set the callback back to the actual icon, in case
- // it was captured by the FolderIcon
- if (d != null) {
- d.setCallback(iconView);
}
}
}
diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java
index 2276ac7..5ee6a25 100644
--- a/src/com/android/launcher3/folder/PreviewItemManager.java
+++ b/src/com/android/launcher3/folder/PreviewItemManager.java
@@ -17,6 +17,7 @@
package com.android.launcher3.folder;
import static com.android.launcher3.BubbleTextView.DISPLAY_FOLDER;
+import static com.android.launcher3.LauncherSettings.Favorites.DESKTOP_ICON_FLAG;
import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ENTER_INDEX;
import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.EXIT_INDEX;
import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.MAX_NUM_ITEMS_IN_PREVIEW;
@@ -43,12 +44,14 @@
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.Flags;
+import com.android.launcher3.LauncherAppState;
import com.android.launcher3.Utilities;
import com.android.launcher3.apppairs.AppPairIcon;
import com.android.launcher3.apppairs.AppPairIconDrawingParams;
import com.android.launcher3.apppairs.AppPairIconGraphic;
import com.android.launcher3.model.data.AppPairInfo;
import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.model.data.ItemInfoWithIcon;
import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.util.Themes;
import com.android.launcher3.views.ActivityContext;
@@ -460,6 +463,18 @@
// Set the callback to FolderIcon as it is responsible to drawing the icon. The
// callback will be released when the folder is opened.
p.drawable.setCallback(mIcon);
+
+ // Verify high res
+ if (item instanceof ItemInfoWithIcon info
+ && info.getMatchingLookupFlag().isVisuallyLessThan(DESKTOP_ICON_FLAG)) {
+ LauncherAppState.getInstance(mContext).getIconCache().updateIconInBackground(
+ newInfo -> {
+ if (p.item == newInfo) {
+ setDrawable(p, newInfo);
+ mIcon.invalidate();
+ }
+ }, info);
+ }
}
/**
diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java
index b8481c5..b164b7f 100644
--- a/src/com/android/launcher3/views/ActivityContext.java
+++ b/src/com/android/launcher3/views/ActivityContext.java
@@ -105,13 +105,6 @@
return null;
}
- /**
- * For items with tree hierarchy, notifies the activity to invalidate the parent when a root
- * is invalidated
- * @param info info associated with a root node.
- */
- default void invalidateParent(ItemInfo info) { }
-
default AccessibilityDelegate getAccessibilityDelegate() {
return null;
}
diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
index b877d7a..94ae69c 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java
@@ -1,5 +1,7 @@
package com.android.launcher3.widget;
+import static com.android.launcher3.InvariantDeviceProfile.TYPE_PHONE;
+
import android.appwidget.AppWidgetProviderInfo;
import android.content.ComponentName;
import android.content.Context;
@@ -14,6 +16,7 @@
import androidx.annotation.Nullable;
import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Flags;
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.icons.cache.BaseIconCache;
@@ -108,6 +111,13 @@
Point cellSize = new Point();
for (DeviceProfile dp : idp.supportedProfiles) {
+ // On phones we no longer support regular landscape, only fixed landscape for this
+ // reason we don't need to take regular landscape into account in phones
+ if (Flags.oneGridSpecs() && dp.inv.deviceType == TYPE_PHONE
+ && dp.inv.isFixedLandscape != dp.isLandscape) {
+ continue;
+ }
+
dp.getCellSize(cellSize);
Rect widgetPadding = dp.widgetPadding;
diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/TestWorkspaceBuilder.kt b/tests/multivalentTests/src/com/android/launcher3/celllayout/board/TestWorkspaceBuilder.kt
index 8952b85..2e556e8 100644
--- a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/TestWorkspaceBuilder.kt
+++ b/tests/multivalentTests/src/com/android/launcher3/celllayout/board/TestWorkspaceBuilder.kt
@@ -80,6 +80,15 @@
)
}
+ /**
+ * Sets the test app for app icons to the specified Component
+ *
+ * @param testAppComponent ComponentName to use for app icons
+ */
+ fun setTestAppComponent(testAppComponent: ComponentName) {
+ appComponentName = testAppComponent
+ }
+
private fun addCorrespondingWidgetRect(
widgetRect: WidgetRect,
transaction: FavoriteItemsTransaction,
diff --git a/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt b/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt
index 7f481b7..548cf5b 100644
--- a/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt
+++ b/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt
@@ -17,21 +17,22 @@
package com.android.launcher3.folder
import android.R
-import android.content.Context
import android.graphics.Bitmap
import android.os.Process
-import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
-import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import com.android.launcher3.LauncherAppState
import com.android.launcher3.LauncherPrefs.Companion.THEMED_ICONS
import com.android.launcher3.LauncherPrefs.Companion.get
import com.android.launcher3.graphics.PreloadIconDrawable
+import com.android.launcher3.icons.BitmapInfo
import com.android.launcher3.icons.FastBitmapDrawable
+import com.android.launcher3.icons.IconCache
+import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver
+import com.android.launcher3.icons.PlaceHolderIconDrawable
import com.android.launcher3.icons.UserBadgeDrawable
import com.android.launcher3.icons.mono.MonoThemedBitmap
import com.android.launcher3.model.data.FolderInfo
-import com.android.launcher3.model.data.ItemInfo
import com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_ARCHIVED
import com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE
import com.android.launcher3.model.data.WorkspaceItemInfo
@@ -40,6 +41,7 @@
import com.android.launcher3.util.FlagOp
import com.android.launcher3.util.LauncherLayoutBuilder
import com.android.launcher3.util.LauncherModelHelper
+import com.android.launcher3.util.LauncherModelHelper.SandboxModelContext
import com.android.launcher3.util.TestUtil
import com.android.launcher3.util.UserIconInfo
import com.google.common.truth.Truth.assertThat
@@ -47,6 +49,13 @@
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
/** Tests for [PreviewItemManager] */
@SmallTest
@@ -54,22 +63,27 @@
class PreviewItemManagerTest {
private lateinit var previewItemManager: PreviewItemManager
- private lateinit var context: Context
- private lateinit var folderItems: ArrayList<ItemInfo>
+ private lateinit var context: SandboxModelContext
+ private lateinit var folderItems: ArrayList<WorkspaceItemInfo>
private lateinit var modelHelper: LauncherModelHelper
private lateinit var folderIcon: FolderIcon
+ private lateinit var iconCache: IconCache
private var defaultThemedIcons = false
@Before
fun setup() {
- getInstrumentation().runOnMainSync {
- folderIcon =
- FolderIcon(ActivityContextWrapper(ApplicationProvider.getApplicationContext()))
- }
- context = getInstrumentation().targetContext
- previewItemManager = PreviewItemManager(folderIcon)
modelHelper = LauncherModelHelper()
+ context = modelHelper.sandboxContext
+ folderIcon = FolderIcon(ActivityContextWrapper(context))
+
+ val app = spy(LauncherAppState.getInstance(context))
+ iconCache = spy(app.iconCache)
+ doReturn(iconCache).whenever(app).iconCache
+ context.putObject(LauncherAppState.INSTANCE, app)
+ doReturn(null).whenever(iconCache).updateIconInBackground(any(), any())
+
+ previewItemManager = PreviewItemManager(folderIcon)
modelHelper
.setupDefaultLayoutProvider(
LauncherLayoutBuilder()
@@ -82,33 +96,35 @@
.build()
)
.loadModelSync()
- folderItems = modelHelper.bgDataModel.collections.valueAt(0).getContents()
+
+ // Use getAppContents() to "cast" contents to WorkspaceItemInfo so we can set bitmaps
+ folderItems = modelHelper.bgDataModel.collections.valueAt(0).getAppContents()
folderIcon.mInfo = modelHelper.bgDataModel.collections.valueAt(0) as FolderInfo
folderIcon.mInfo.getContents().addAll(folderItems)
- // Use getAppContents() to "cast" contents to WorkspaceItemInfo so we can set bitmaps
- val folderApps = modelHelper.bgDataModel.collections.valueAt(0).getAppContents()
// Set first icon to be themed.
- folderApps[0].bitmap.themedBitmap =
+ folderItems[0].bitmap.themedBitmap =
MonoThemedBitmap(
- folderApps[0].bitmap.icon,
+ folderItems[0].bitmap.icon,
Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888),
)
// Set second icon to be non-themed.
- folderApps[1].bitmap.themedBitmap = null
+ folderItems[1].bitmap.themedBitmap = null
// Set third icon to be themed with badge.
- folderApps[2].bitmap.themedBitmap =
+ folderItems[2].bitmap.themedBitmap =
MonoThemedBitmap(
- folderApps[2].bitmap.icon,
+ folderItems[2].bitmap.icon,
Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888),
)
- folderApps[2].bitmap = folderApps[2].bitmap.withFlags(profileFlagOp(UserIconInfo.TYPE_WORK))
+ folderItems[2].bitmap =
+ folderItems[2].bitmap.withFlags(profileFlagOp(UserIconInfo.TYPE_WORK))
// Set fourth icon to be non-themed with badge.
- folderApps[3].bitmap = folderApps[3].bitmap.withFlags(profileFlagOp(UserIconInfo.TYPE_WORK))
- folderApps[3].bitmap.themedBitmap = null
+ folderItems[3].bitmap =
+ folderItems[3].bitmap.withFlags(profileFlagOp(UserIconInfo.TYPE_WORK))
+ folderItems[3].bitmap.themedBitmap = null
defaultThemedIcons = get(context).get(THEMED_ICONS)
}
@@ -232,6 +248,31 @@
assertThat(drawingParams.drawable).isInstanceOf(PreloadIconDrawable::class.java)
}
+ @Test
+ fun `Preview item loads and apply high res icon`() {
+ val drawingParams = PreviewItemDrawingParams(0f, 0f, 0f)
+ val originalBitmap = folderItems[3].bitmap
+ folderItems[3].bitmap = BitmapInfo.LOW_RES_INFO
+
+ previewItemManager.setDrawable(drawingParams, folderItems[3])
+ assertThat(drawingParams.drawable).isInstanceOf(PlaceHolderIconDrawable::class.java)
+
+ val callbackCaptor = argumentCaptor<ItemInfoUpdateReceiver>()
+ verify(iconCache).updateIconInBackground(callbackCaptor.capture(), eq(folderItems[3]))
+
+ // Restore high-res icon
+ folderItems[3].bitmap = originalBitmap
+
+ // Calling with a different item info will ignore the update
+ callbackCaptor.firstValue.reapplyItemInfo(folderItems[2])
+ assertThat(drawingParams.drawable).isInstanceOf(PlaceHolderIconDrawable::class.java)
+
+ // Calling with correct value will update the drawable to high-res
+ callbackCaptor.firstValue.reapplyItemInfo(folderItems[3])
+ assertThat(drawingParams.drawable).isNotInstanceOf(PlaceHolderIconDrawable::class.java)
+ assertThat(drawingParams.drawable).isInstanceOf(FastBitmapDrawable::class.java)
+ }
+
private fun profileFlagOp(type: Int) =
UserIconInfo(Process.myUserHandle(), type).applyBitmapInfoFlags(FlagOp.NO_OP)
}