diff --git a/Android.bp b/Android.bp index 1e1e0ad6cc..a4a058fce0 100644 --- a/Android.bp +++ b/Android.bp @@ -455,6 +455,9 @@ android_app { extra_check_modules: ["Launcher3LintChecker"], baseline_filename: "lint-baseline.xml", }, + kotlincflags: [ + "-Xjvm-default=all", + ], } // Library with all the dependencies for building quickstep @@ -519,6 +522,9 @@ android_library { min_sdk_version: "current", // TODO(b/319712088): re-enable use_resource_processor use_resource_processor: false, + kotlincflags: [ + "-Xjvm-default=all", + ], } // Library with all the source code and dependencies for building Quickstep @@ -552,6 +558,9 @@ android_library { min_sdk_version: "current", // TODO(b/319712088): re-enable use_resource_processor use_resource_processor: false, + kotlincflags: [ + "-Xjvm-default=all", + ], } // Build rule for Quickstep app. diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index 80d2eaca23..46f0e41cdb 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -131,13 +131,11 @@ android:writePermission="${applicationId}.permission.WRITE_SETTINGS" android:readPermission="${applicationId}.permission.READ_SETTINGS" /> - + - 48dp + 48dp 48dp diff --git a/quickstep/res/values-sw600dp/dimens.xml b/quickstep/res/values-sw600dp/dimens.xml index 49965822ea..3e726519ac 100644 --- a/quickstep/res/values-sw600dp/dimens.xml +++ b/quickstep/res/values-sw600dp/dimens.xml @@ -37,7 +37,7 @@ 24dp - 120dp + 120dp 38sp 15sp diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml index dab58d7715..2313a07b79 100644 --- a/quickstep/res/values-uk/strings.xml +++ b/quickstep/res/values-uk/strings.xml @@ -92,7 +92,7 @@ "Натисніть кнопку головного екрана, щоб відкрити його" "Тепер ви можете використовувати %1$s" "пристрій" - "Системні налаштування навігації" + "Налаштування навігації в системі" "Поділитися" "Знімок екрана" "Розділити" diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml index 1cd2e87f14..06ca97a2a1 100644 --- a/quickstep/res/values-uz/strings.xml +++ b/quickstep/res/values-uz/strings.xml @@ -90,7 +90,7 @@ "Hammasi tayyor!" "Boshiga qaytish uchun tepaga suring" "Bosh ekranga oʻtish uchun bosh ekran tugmasini bosing" - "%1$s xizmatga tayyor" + "Sizning %1$s xizmatga tayyor" "qurilma" "Tizim navigatsiya sozlamalari" "Ulashish" diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml index a530325f04..d699cdf49e 100644 --- a/quickstep/res/values/config.xml +++ b/quickstep/res/values/config.xml @@ -27,7 +27,6 @@ com.android.quickstep.InstantAppResolverImpl com.android.launcher3.appprediction.PredictionAppTracker com.android.quickstep.QuickstepProcessInitializer - com.android.launcher3.model.QuickstepModelDelegate com.android.launcher3.secondarydisplay.SecondaryDisplayPredictionsImpl com.android.launcher3.taskbar.TaskbarModelCallbacksFactory com.android.launcher3.taskbar.TaskbarViewCallbacksFactory diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 05f0695b7c..52ebdae31c 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -277,7 +277,7 @@ 24dp - 40dp + 40dp 36sp 14sp diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml index 5f2a63dc4f..f8ca8d9adf 100644 --- a/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml @@ -321,6 +321,7 @@ google-sans-text-medium @dimen/task_thumbnail_icon_menu_text_size @color/materialColorOnSurface + false 0.025 20sp diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index c7483851b1..84ae0fe43a 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -56,7 +56,6 @@ import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVIT import static com.android.launcher3.testing.shared.TestProtocol.WALLPAPER_OPEN_ANIMATION_FINISHED_MESSAGE; import static com.android.launcher3.util.DisplayController.isTransientTaskbar; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.Executors.ORDERED_BG_EXECUTOR; import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs; import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION; @@ -79,7 +78,6 @@ import android.app.role.RoleManager; import android.content.ComponentName; import android.content.Context; import android.content.res.Resources; -import android.database.ContentObserver; import android.graphics.Color; import android.graphics.Matrix; import android.graphics.Point; @@ -94,7 +92,6 @@ import android.os.Looper; import android.os.SystemProperties; import android.os.UserHandle; import android.provider.Settings; -import android.provider.Settings.Global; import android.util.Pair; import android.util.Size; import android.view.CrossWindowBlurListeners; @@ -226,7 +223,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener private static final int TASKBAR_TO_HOME_DURATION_FAST = 300; private static final int TASKBAR_TO_HOME_DURATION_SLOW = 1000; protected static final int CONTENT_SCALE_DURATION = 350; - protected static final int CONTENT_SCRIM_DURATION = 350; private static final int MAX_NUM_TASKS = 5; @@ -244,16 +240,12 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener private final StartingWindowListener mStartingWindowListener = new StartingWindowListener(this); - private ContentObserver mAnimationRemovalObserver = new ContentObserver( - ORDERED_BG_EXECUTOR.getHandler()) { - @Override - public void onChange(boolean selfChange) { - mAreAnimationsEnabled = Global.getFloat(mLauncher.getContentResolver(), - Global.ANIMATOR_DURATION_SCALE, 1f) > 0 - || Global.getFloat(mLauncher.getContentResolver(), - Global.TRANSITION_ANIMATION_SCALE, 1f) > 0; - } - }; + + // TODO(b/397690719): Investigate the memory leak from TaskStackChangeListeners#mImpl + // This is a temporary fix of memory leak b/397690719. We track registered + // {@link TaskRestartedDuringLaunchListener}, and remove them on activity destroy. + private final List mRegisteredTaskStackChangeListener = + new ArrayList<>(); private DeviceProfile mDeviceProfile; @@ -282,7 +274,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener // Pairs of window starting type and starting window background color for starting tasks // Will never be larger than MAX_NUM_TASKS private LinkedHashMap> mTaskStartParams; - private boolean mAreAnimationsEnabled = true; private final Interpolator mOpeningXInterpolator; private final Interpolator mOpeningInterpolator; @@ -293,7 +284,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener mHandler = new Handler(Looper.getMainLooper()); mDeviceProfile = mLauncher.getDeviceProfile(); mBackAnimationController = new LauncherBackAnimationController(mLauncher, this); - checkAndMonitorIfAnimationsAreEnabled(); Resources res = mLauncher.getResources(); mClosingWindowTransY = res.getDimensionPixelSize(R.dimen.closing_window_trans_y); @@ -338,7 +328,14 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener TaskRestartedDuringLaunchListener restartedListener = new TaskRestartedDuringLaunchListener(); restartedListener.register(onEndCallback::executeAllAndDestroy); - onEndCallback.add(restartedListener::unregister); + mRegisteredTaskStackChangeListener.add(restartedListener); + onEndCallback.add(new Runnable() { + @Override + public void run() { + restartedListener.unregister(); + mRegisteredTaskStackChangeListener.remove(restartedListener); + } + }); RemoteAnimationRunnerCompat runner = createAppLaunchRunner(v, onEndCallback); @@ -1208,8 +1205,12 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener unregisterRemoteTransitions(); mLauncher.removeOnDeviceProfileChangeListener(this); SystemUiProxy.INSTANCE.get(mLauncher).setStartingWindowListener(null); - ORDERED_BG_EXECUTOR.execute(() -> mLauncher.getContentResolver() - .unregisterContentObserver(mAnimationRemovalObserver)); + if (BuildConfig.IS_STUDIO_BUILD && !mRegisteredTaskStackChangeListener.isEmpty()) { + throw new IllegalStateException("Failed to run onEndCallback created from" + + " getActivityLaunchOptions()"); + } + mRegisteredTaskStackChangeListener.forEach(TaskRestartedDuringLaunchListener::unregister); + mRegisteredTaskStackChangeListener.clear(); } /** @@ -1257,17 +1258,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener } } - private void checkAndMonitorIfAnimationsAreEnabled() { - ORDERED_BG_EXECUTOR.execute(() -> { - mAnimationRemovalObserver.onChange(true); - mLauncher.getContentResolver().registerContentObserver(Global.getUriFor( - Global.ANIMATOR_DURATION_SCALE), false, mAnimationRemovalObserver); - mLauncher.getContentResolver().registerContentObserver(Global.getUriFor( - Global.TRANSITION_ANIMATION_SCALE), false, mAnimationRemovalObserver); - - }); - } - private boolean launcherIsATargetWithMode(RemoteAnimationTarget[] targets, int mode) { for (RemoteAnimationTarget target : targets) { if (target.mode == mode && target.taskInfo != null @@ -1403,7 +1393,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener (LauncherAppWidgetHostView) launcherView, targetRect, windowSize, mDeviceProfile.isMultiWindowMode ? 0 : getWindowCornerRadius(mLauncher), isTransluscent, fallbackBackgroundColor); - } else if (launcherView != null && mAreAnimationsEnabled) { + } else if (launcherView != null && !RemoveAnimationSettingsTracker.INSTANCE.get( + mLauncher).isRemoveAnimationEnabled()) { floatingIconView = getFloatingIconView(mLauncher, launcherView, null, mLauncher.getTaskbarUIController() == null ? null @@ -1793,8 +1784,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener } /** Get animation duration for taskbar for going to home. */ - public static int getTaskbarToHomeDuration(boolean isPinnedTaskbar) { - return getTaskbarToHomeDuration(false, isPinnedTaskbar); + public static int getTaskbarToHomeDuration(boolean isPinnedTaskbarAndNotInDesktopMode) { + return getTaskbarToHomeDuration(false, isPinnedTaskbarAndNotInDesktopMode); } /** @@ -1803,8 +1794,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener * @param shouldOverrideToFastAnimation should overwrite scaling reveal home animation duration */ public static int getTaskbarToHomeDuration(boolean shouldOverrideToFastAnimation, - boolean isPinnedTaskbar) { - if (isPinnedTaskbar) { + boolean isPinnedTaskbarAndNotInDesktopMode) { + if (isPinnedTaskbarAndNotInDesktopMode) { return PINNED_TASKBAR_TRANSITION_DURATION; } else if (enableScalingRevealHomeAnimation() && !shouldOverrideToFastAnimation) { return TASKBAR_TO_HOME_DURATION_SLOW; diff --git a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java b/quickstep/src/com/android/launcher3/WidgetPickerActivity.java index 1cf7dda3af..f992913cde 100644 --- a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java +++ b/quickstep/src/com/android/launcher3/WidgetPickerActivity.java @@ -322,13 +322,14 @@ public class WidgetPickerActivity extends BaseActivity { stringCache.loadStrings(this); bindStringCache(stringCache); - bindWidgets(mModel.getWidgetsByPackageItem(), mModel.getDefaultWidgetsFilter()); + bindWidgets(mModel.getWidgetsByPackageItemForPicker(), + mModel.getDefaultWidgetsFilter()); // Open sheet once widgets are available, so that it doesn't interrupt the open // animation. openWidgetsSheet(); if (mUiSurface != null) { mWidgetPredictionsRequester = new WidgetPredictionsRequester(app.getContext(), - mUiSurface, mModel.getWidgetsByComponentKey()); + mUiSurface, mModel.getWidgetsByComponentKeyForPicker()); mWidgetPredictionsRequester.request(mAddedWidgets, this::bindRecommendedWidgets); } }); diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchAnimatorHelper.kt b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchAnimatorHelper.kt new file mode 100644 index 0000000000..688018b14f --- /dev/null +++ b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchAnimatorHelper.kt @@ -0,0 +1,211 @@ +/* + * 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.desktop + +import android.animation.Animator +import android.animation.AnimatorSet +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Rect +import android.util.Log +import android.view.Choreographer +import android.view.SurfaceControl.Transaction +import android.view.WindowManager.TRANSIT_CLOSE +import android.view.WindowManager.TRANSIT_OPEN +import android.view.WindowManager.TRANSIT_TO_BACK +import android.window.DesktopModeFlags +import android.window.TransitionInfo +import android.window.TransitionInfo.Change +import androidx.core.animation.addListener +import androidx.core.util.Supplier +import com.android.app.animation.Interpolators +import com.android.internal.jank.Cuj +import com.android.internal.jank.InteractionJankMonitor +import com.android.internal.policy.ScreenDecorationsUtils +import com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType +import com.android.launcher3.desktop.DesktopAppLaunchTransition.Companion.LAUNCH_CHANGE_MODES +import com.android.wm.shell.shared.animation.MinimizeAnimator +import com.android.wm.shell.shared.animation.WindowAnimator + +/** + * Helper class responsible for creating and managing animators for desktop app launch and related + * transitions. + * + *

This class handles the complex logic of creating various animators, including launch, + * minimize, and trampoline close animations, based on the provided transition information and + * launch type. It also utilizes {@link InteractionJankMonitor} to monitor animation jank. + * + * @param context The application context. + * @param launchType The type of app launch, containing animation parameters. + * @param cujType The CUJ (Critical User Journey) type for jank monitoring. + */ +class DesktopAppLaunchAnimatorHelper( + private val context: Context, + private val launchType: AppLaunchType, + @Cuj.CujType private val cujType: Int, + private val transactionSupplier: Supplier, +) { + + private val interactionJankMonitor = InteractionJankMonitor.getInstance() + + fun createAnimators(info: TransitionInfo, finishCallback: (Animator) -> Unit): List { + val launchChange = getLaunchChange(info) + requireNotNull(launchChange) { + val changesString = + info.changes.joinToString(", ") { change -> + "Change: mode=${change.mode}, " + + "taskId=${change.taskInfo?.id}, " + + "isFreeform=${change.taskInfo?.isFreeform}" + } + Log.e( + TAG, + "No launch change found: Transition type=${info.type}, changes=$changesString", + ) + "expected an app launch Change" + } + + val transaction = transactionSupplier.get() + + val minimizeChange = getMinimizeChange(info) + val trampolineCloseChange = getTrampolineCloseChange(info) + + val launchAnimator = + createLaunchAnimator( + launchChange, + transaction, + finishCallback, + isTrampoline = trampolineCloseChange != null, + ) + val animatorsList = mutableListOf(launchAnimator) + if (minimizeChange != null) { + val minimizeAnimator = + createMinimizeAnimator(minimizeChange, transaction, finishCallback) + animatorsList.add(minimizeAnimator) + } + if (trampolineCloseChange != null) { + val trampolineCloseAnimator = + createTrampolineCloseAnimator(trampolineCloseChange, transaction) + animatorsList.add(trampolineCloseAnimator) + } + return animatorsList + } + + private fun getLaunchChange(info: TransitionInfo): Change? = + info.changes.firstOrNull { change -> change.mode in LAUNCH_CHANGE_MODES } + + private fun getMinimizeChange(info: TransitionInfo): Change? = + info.changes.firstOrNull { change -> change.mode == TRANSIT_TO_BACK } + + private fun getTrampolineCloseChange(info: TransitionInfo): Change? { + if ( + info.changes.size < 2 || + !DesktopModeFlags.ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX.isTrue + ) { + return null + } + val openChange = + info.changes.firstOrNull { change -> + change.mode == TRANSIT_OPEN && change.taskInfo?.isFreeform == true + } + val closeChange = + info.changes.firstOrNull { change -> + change.mode == TRANSIT_CLOSE && change.taskInfo?.isFreeform == true + } + val openPackage = openChange?.taskInfo?.baseIntent?.component?.packageName + val closePackage = closeChange?.taskInfo?.baseIntent?.component?.packageName + return if (openPackage != null && closePackage != null && openPackage == closePackage) { + closeChange + } else { + null + } + } + + private fun createLaunchAnimator( + change: Change, + transaction: Transaction, + onAnimFinish: (Animator) -> Unit, + isTrampoline: Boolean, + ): Animator { + val boundsAnimator = + WindowAnimator.createBoundsAnimator( + context.resources.displayMetrics, + launchType.boundsAnimationParams, + change, + transaction, + ) + val alphaAnimator = + ValueAnimator.ofFloat(0f, 1f).apply { + duration = launchType.alphaDurationMs + interpolator = Interpolators.LINEAR + addUpdateListener { animation -> + transaction + .setAlpha(change.leash, animation.animatedValue as Float) + .setFrameTimeline(Choreographer.getInstance().vsyncId) + .apply() + } + } + val clipRect = Rect(change.endAbsBounds).apply { offsetTo(0, 0) } + transaction.setCrop(change.leash, clipRect) + transaction.setCornerRadius( + change.leash, + ScreenDecorationsUtils.getWindowCornerRadius(context), + ) + return AnimatorSet().apply { + interactionJankMonitor.begin(change.leash, context, context.mainThreadHandler, cujType) + if (isTrampoline) { + play(alphaAnimator) + } else { + playTogether(boundsAnimator, alphaAnimator) + } + addListener( + onEnd = { animation -> + onAnimFinish(animation) + interactionJankMonitor.end(cujType) + } + ) + } + } + + private fun createMinimizeAnimator( + change: Change, + transaction: Transaction, + onAnimFinish: (Animator) -> Unit, + ): Animator { + return MinimizeAnimator.create( + context, + change, + transaction, + onAnimFinish, + interactionJankMonitor, + context.mainThreadHandler, + ) + } + + private fun createTrampolineCloseAnimator(change: Change, transaction: Transaction): Animator { + return ValueAnimator.ofFloat(1f, 0f).apply { + duration = 100L + interpolator = Interpolators.LINEAR + addUpdateListener { animation -> + transaction.setAlpha(change.leash, animation.animatedValue as Float).apply() + } + } + } + + private companion object { + const val TAG = "DesktopAppLaunchAnimatorHelper" + } +} diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransition.kt b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransition.kt index 2406fb6620..79072a6441 100644 --- a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransition.kt +++ b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransition.kt @@ -17,27 +17,19 @@ package com.android.launcher3.desktop import android.animation.Animator -import android.animation.AnimatorSet -import android.animation.ValueAnimator import android.content.Context -import android.graphics.Rect import android.os.IBinder -import android.view.Choreographer +import android.util.Log import android.view.SurfaceControl.Transaction import android.view.WindowManager.TRANSIT_OPEN -import android.view.WindowManager.TRANSIT_TO_BACK import android.view.WindowManager.TRANSIT_TO_FRONT import android.window.IRemoteTransitionFinishedCallback import android.window.RemoteTransitionStub import android.window.TransitionInfo -import android.window.TransitionInfo.Change -import androidx.core.animation.addListener +import androidx.core.util.Supplier import com.android.app.animation.Interpolators import com.android.internal.jank.Cuj -import com.android.internal.jank.InteractionJankMonitor -import com.android.internal.policy.ScreenDecorationsUtils import com.android.quickstep.RemoteRunnable -import com.android.wm.shell.shared.animation.MinimizeAnimator import com.android.wm.shell.shared.animation.WindowAnimator import java.util.concurrent.Executor @@ -48,14 +40,18 @@ import java.util.concurrent.Executor * ([android.view.WindowManager.TRANSIT_TO_BACK]) this transition will apply a minimize animation to * that window. */ -class DesktopAppLaunchTransition( - private val context: Context, - private val mainExecutor: Executor, +class DesktopAppLaunchTransition +@JvmOverloads +constructor( + context: Context, private val launchType: AppLaunchType, @Cuj.CujType private val cujType: Int, + private val mainExecutor: Executor, + transactionSupplier: Supplier = Supplier { Transaction() }, ) : RemoteTransitionStub() { - private val interactionJankMonitor = InteractionJankMonitor.getInstance() + private val animatorHelper: DesktopAppLaunchAnimatorHelper = + DesktopAppLaunchAnimatorHelper(context, launchType, cujType, transactionSupplier) enum class AppLaunchType( val boundsAnimationParams: WindowAnimator.BoundsAnimationParams, @@ -68,15 +64,16 @@ class DesktopAppLaunchTransition( override fun startAnimation( token: IBinder, info: TransitionInfo, - t: Transaction, + transaction: Transaction, transitionFinishedCallback: IRemoteTransitionFinishedCallback, ) { + Log.v(TAG, "startAnimation: launchType=$launchType, cujType=$cujType") val safeTransitionFinishedCallback = RemoteRunnable { transitionFinishedCallback.onTransitionFinished(/* wct= */ null, /* sct= */ null) } mainExecutor.execute { runAnimators(info, safeTransitionFinishedCallback) - t.apply() + transaction.apply() } } @@ -86,78 +83,12 @@ class DesktopAppLaunchTransition( animators -= animator if (animators.isEmpty()) finishedCallback.run() } - animators += createAnimators(info, animatorFinishedCallback) + animators += animatorHelper.createAnimators(info, animatorFinishedCallback) animators.forEach { it.start() } } - private fun createAnimators( - info: TransitionInfo, - finishCallback: (Animator) -> Unit, - ): List { - val transaction = Transaction() - val launchAnimator = - createLaunchAnimator(getLaunchChange(info), transaction, finishCallback) - val minimizeChange = getMinimizeChange(info) ?: return listOf(launchAnimator) - val minimizeAnimator = - MinimizeAnimator.create( - context.resources.displayMetrics, - minimizeChange, - transaction, - finishCallback, - ) - return listOf(launchAnimator, minimizeAnimator) - } - - private fun getLaunchChange(info: TransitionInfo): Change = - requireNotNull(info.changes.firstOrNull { change -> change.mode in LAUNCH_CHANGE_MODES }) { - "expected an app launch Change" - } - - private fun getMinimizeChange(info: TransitionInfo): Change? = - info.changes.firstOrNull { change -> change.mode == TRANSIT_TO_BACK } - - private fun createLaunchAnimator( - change: Change, - transaction: Transaction, - onAnimFinish: (Animator) -> Unit, - ): Animator { - val boundsAnimator = - WindowAnimator.createBoundsAnimator( - context.resources.displayMetrics, - launchType.boundsAnimationParams, - change, - transaction, - ) - val alphaAnimator = - ValueAnimator.ofFloat(0f, 1f).apply { - duration = launchType.alphaDurationMs - interpolator = Interpolators.LINEAR - addUpdateListener { animation -> - transaction - .setAlpha(change.leash, animation.animatedValue as Float) - .setFrameTimeline(Choreographer.getInstance().vsyncId) - .apply() - } - } - val clipRect = Rect(change.endAbsBounds).apply { offsetTo(0, 0) } - transaction.setCrop(change.leash, clipRect) - transaction.setCornerRadius( - change.leash, - ScreenDecorationsUtils.getWindowCornerRadius(context), - ) - return AnimatorSet().apply { - interactionJankMonitor.begin(change.leash, context, context.mainThreadHandler, cujType) - playTogether(boundsAnimator, alphaAnimator) - addListener( - onEnd = { animation -> - onAnimFinish(animation) - interactionJankMonitor.end(cujType) - } - ) - } - } - companion object { + const val TAG = "DesktopAppLaunchTransition" /** Change modes that represent a task becoming visible / launching in Desktop mode. */ val LAUNCH_CHANGE_MODES = intArrayOf(TRANSIT_OPEN, TRANSIT_TO_FRONT) diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt index 36c5fbad36..a72b5c43c5 100644 --- a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt +++ b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt @@ -48,9 +48,9 @@ class DesktopAppLaunchTransitionManager( RemoteTransition( DesktopAppLaunchTransition( context, - MAIN_EXECUTOR, AppLaunchType.UNMINIMIZE, Cuj.CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_INTENT, + MAIN_EXECUTOR, ), "DesktopWindowLimitUnminimize", ) diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java index 40e8fc2484..74b73d4bdf 100644 --- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java +++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java @@ -47,6 +47,7 @@ import android.content.pm.LauncherApps; import android.content.pm.ShortcutInfo; import android.os.Bundle; import android.os.UserHandle; +import android.text.TextUtils; import android.util.Log; import android.util.StatsEvent; @@ -61,6 +62,7 @@ import com.android.launcher3.ConstantItem; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherPrefs; +import com.android.launcher3.dagger.ApplicationContext; import com.android.launcher3.icons.cache.CacheLookupFlag; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logging.InstanceId; @@ -89,6 +91,9 @@ import java.util.Map; import java.util.Objects; import java.util.stream.IntStream; +import javax.inject.Inject; +import javax.inject.Named; + /** * Model delegate which loads prediction items */ @@ -114,18 +119,29 @@ public class QuickstepModelDelegate extends ModelDelegate { CONTAINER_WIDGETS_PREDICTION, "widgets_prediction", DESKTOP_ICON_FLAG); private final InvariantDeviceProfile mIDP; + private final PackageManagerHelper mPmHelper; private final AppEventProducer mAppEventProducer; + private final StatsManager mStatsManager; protected boolean mActive = false; - public QuickstepModelDelegate(Context context) { + @Inject + public QuickstepModelDelegate(@ApplicationContext Context context, + InvariantDeviceProfile idp, + PackageManagerHelper pmHelper, + @Nullable @Named("ICONS_DB") String dbFileName) { super(context); - mAppEventProducer = new AppEventProducer(context, this::onAppTargetEvent); + mIDP = idp; + mPmHelper = pmHelper; - mIDP = InvariantDeviceProfile.INSTANCE.get(context); + mAppEventProducer = new AppEventProducer(context, this::onAppTargetEvent); StatsLogCompatManager.LOGS_CONSUMER.add(mAppEventProducer); - mStatsManager = context.getSystemService(StatsManager.class); + + // Only register for launcher snapshot logging if this is the primary ModelDelegate + // instance, as there will be additional instances that may be destroyed at any time. + mStatsManager = TextUtils.isEmpty(dbFileName) + ? null : context.getSystemService(StatsManager.class); } @CallSuper @@ -154,10 +170,10 @@ public class QuickstepModelDelegate extends ModelDelegate { // TODO: Implement caching and preloading WorkspaceItemFactory factory = - new WorkspaceItemFactory(mApp, ums, mPmHelper, pinnedShortcuts, numColumns, + new WorkspaceItemFactory(mContext, ums, mPmHelper, pinnedShortcuts, numColumns, state.containerId, state.lookupFlag); FixedContainerItems fci = new FixedContainerItems(state.containerId, - state.storage.read(mApp.getContext(), factory, ums.allUsers::get)); + state.storage.read(mContext, factory, ums.allUsers::get)); mDataModel.extraItems.put(state.containerId, fci); } @@ -220,7 +236,7 @@ public class QuickstepModelDelegate extends ModelDelegate { super.modelLoadComplete(); // Log snapshot of the model - LauncherPrefs prefs = LauncherPrefs.get(mApp.getContext()); + LauncherPrefs prefs = LauncherPrefs.get(mContext); long lastSnapshotTimeMillis = prefs.get(LAST_SNAPSHOT_TIME_MILLIS); // Log snapshot only if previous snapshot was older than a day long now = System.currentTimeMillis(); @@ -245,11 +261,7 @@ public class QuickstepModelDelegate extends ModelDelegate { prefs.put(LAST_SNAPSHOT_TIME_MILLIS, now); } - // Only register for launcher snapshot logging if this is the primary ModelDelegate - // instance, as there will be additional instances that may be destroyed at any time. - if (mIsPrimaryInstance) { - registerSnapshotLoggingCallback(); - } + registerSnapshotLoggingCallback(); } protected void additionalSnapshotEvents(InstanceId snapshotInstanceId){} @@ -257,9 +269,9 @@ public class QuickstepModelDelegate extends ModelDelegate { /** * Registers a callback to log launcher workspace layout using Statsd pulled atom. */ - protected void registerSnapshotLoggingCallback() { + private void registerSnapshotLoggingCallback() { if (mStatsManager == null) { - Log.d(TAG, "Failed to get StatsManager"); + Log.d(TAG, "Skipping snapshot logging"); } try { @@ -332,7 +344,7 @@ public class QuickstepModelDelegate extends ModelDelegate { super.destroy(); mActive = false; StatsLogCompatManager.LOGS_CONSUMER.remove(mAppEventProducer); - if (mIsPrimaryInstance && mStatsManager != null) { + if (mStatsManager != null) { try { mStatsManager.clearPullAtomCallback(SysUiStatsLog.LAUNCHER_LAYOUT_SNAPSHOT); } catch (RuntimeException e) { @@ -354,25 +366,24 @@ public class QuickstepModelDelegate extends ModelDelegate { if (!mActive) { return; } - Context context = mApp.getContext(); - AppPredictionManager apm = context.getSystemService(AppPredictionManager.class); + AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class); if (apm == null) { return; } registerPredictor(mAllAppsState, apm.createAppPredictionSession( - new AppPredictionContext.Builder(context) + new AppPredictionContext.Builder(mContext) .setUiSurface("home") .setPredictedTargetCount(mIDP.numDatabaseAllAppsColumns) .build())); // TODO: get bundle - registerHotseatPredictor(apm, context); + registerHotseatPredictor(apm, mContext); registerWidgetsPredictor(apm.createAppPredictionSession( - new AppPredictionContext.Builder(context) + new AppPredictionContext.Builder(mContext) .setUiSurface("widgets") - .setExtras(getBundleForWidgetsOnWorkspace(context, mDataModel)) + .setExtras(getBundleForWidgetsOnWorkspace(mContext, mDataModel)) .setPredictedTargetCount(NUM_OF_RECOMMENDED_WIDGETS_PREDICATION) .build())); } @@ -383,12 +394,11 @@ public class QuickstepModelDelegate extends ModelDelegate { if (!mActive) { return; } - Context context = mApp.getContext(); - AppPredictionManager apm = context.getSystemService(AppPredictionManager.class); + AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class); if (apm == null) { return; } - registerHotseatPredictor(apm, context); + registerHotseatPredictor(apm, mContext); } private void registerHotseatPredictor(AppPredictionManager apm, Context context) { @@ -413,7 +423,7 @@ public class QuickstepModelDelegate extends ModelDelegate { // No diff, skip return; } - mApp.getModel().enqueueModelUpdateTask(new PredictionUpdateTask(state, targets)); + mModel.enqueueModelUpdateTask(new PredictionUpdateTask(state, targets)); } private void registerWidgetsPredictor(AppPredictor predictor) { @@ -424,7 +434,7 @@ public class QuickstepModelDelegate extends ModelDelegate { // No diff, skip return; } - mApp.getModel().enqueueModelUpdateTask( + mModel.enqueueModelUpdateTask( new WidgetsPredictionUpdateTask(mWidgetsRecommendationState, targets)); }); mWidgetsRecommendationState.predictor.requestPredictionUpdate(); @@ -536,7 +546,7 @@ public class QuickstepModelDelegate extends ModelDelegate { private static class WorkspaceItemFactory implements PersistedItemArray.ItemFactory { - private final LauncherAppState mAppState; + private final Context mContext; private final UserManagerState mUMS; private final PackageManagerHelper mPmHelper; private final Map mPinnedShortcuts; @@ -546,10 +556,11 @@ public class QuickstepModelDelegate extends ModelDelegate { private int mReadCount = 0; - protected WorkspaceItemFactory(LauncherAppState appState, UserManagerState ums, + protected WorkspaceItemFactory( + Context context, UserManagerState ums, PackageManagerHelper pmHelper, Map pinnedShortcuts, int maxCount, int container, CacheLookupFlag lookupFlag) { - mAppState = appState; + mContext = context; mUMS = ums; mPmHelper = pmHelper; mPinnedShortcuts = pinnedShortcuts; @@ -566,7 +577,7 @@ public class QuickstepModelDelegate extends ModelDelegate { } switch (itemType) { case ITEM_TYPE_APPLICATION: { - LauncherActivityInfo lai = mAppState.getContext() + LauncherActivityInfo lai = mContext .getSystemService(LauncherApps.class) .resolveActivity(intent, user); if (lai == null) { @@ -574,14 +585,15 @@ public class QuickstepModelDelegate extends ModelDelegate { } AppInfo info = new AppInfo( lai, - UserCache.INSTANCE.get(mAppState.getContext()).getUserInfo(user), - ApiWrapper.INSTANCE.get(mAppState.getContext()), + UserCache.INSTANCE.get(mContext).getUserInfo(user), + ApiWrapper.INSTANCE.get(mContext), mPmHelper, mUMS.isUserQuiet(user)); info.container = mContainer; - mAppState.getIconCache().getTitleAndIcon(info, lai, mLookupFlag); + LauncherAppState.getInstance(mContext).getIconCache() + .getTitleAndIcon(info, lai, mLookupFlag); mReadCount++; - return info.makeWorkspaceItem(mAppState.getContext()); + return info.makeWorkspaceItem(mContext); } case ITEM_TYPE_DEEP_SHORTCUT: { ShortcutKey key = ShortcutKey.fromIntent(intent, user); @@ -592,9 +604,9 @@ public class QuickstepModelDelegate extends ModelDelegate { if (si == null) { return null; } - WorkspaceItemInfo wii = new WorkspaceItemInfo(si, mAppState.getContext()); + WorkspaceItemInfo wii = new WorkspaceItemInfo(si, mContext); wii.container = mContainer; - mAppState.getIconCache().getShortcutIcon(wii, si); + LauncherAppState.getInstance(mContext).getIconCache().getShortcutIcon(wii, si); mReadCount++; return wii; } diff --git a/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java b/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java index 8c98babc0a..d3ac975052 100644 --- a/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java +++ b/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java @@ -203,7 +203,7 @@ public class WidgetPredictionsRequester { List items; if (enableCategorizedWidgetSuggestions()) { WidgetRecommendationCategoryProvider categoryProvider = - WidgetRecommendationCategoryProvider.newInstance(mContext); + new WidgetRecommendationCategoryProvider(); items = widgetItems.stream() .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, categoryProvider.getWidgetRecommendationCategory(mContext, it))) diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java index 40e1c10d1c..8bd2ba8a3b 100644 --- a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java +++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java @@ -79,7 +79,7 @@ public final class WidgetsPredictionUpdateTask implements ModelUpdateTask { // Widgets (excluding shortcuts & already added widgets) that belong to apps eligible for // being in predictions. Map allEligibleWidgets = - dataModel.widgetsModel.getWidgetsByComponentKey() + dataModel.widgetsModel.getWidgetsByComponentKeyForPicker() .entrySet() .stream() .filter(entry -> entry.getValue().widgetInfo != null @@ -137,7 +137,7 @@ public final class WidgetsPredictionUpdateTask implements ModelUpdateTask { List items; if (enableCategorizedWidgetSuggestions()) { WidgetRecommendationCategoryProvider categoryProvider = - WidgetRecommendationCategoryProvider.newInstance(context); + new WidgetRecommendationCategoryProvider(); items = servicePredictedItems.stream() .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, categoryProvider.getWidgetRecommendationCategory(context, it))) diff --git a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.kt b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.kt index 3773d027ed..eb24df13e1 100644 --- a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.kt +++ b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.kt @@ -18,6 +18,7 @@ package com.android.launcher3.statehandlers import android.content.Context import android.os.Debug import android.util.Log +import android.util.Slog import android.util.SparseArray import android.view.Display.DEFAULT_DISPLAY import android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY @@ -31,7 +32,8 @@ import com.android.launcher3.statemanager.StatefulActivity import com.android.launcher3.uioverrides.QuickstepLauncher import com.android.launcher3.util.DaggerSingletonObject import com.android.launcher3.util.DaggerSingletonTracker -import com.android.launcher3.util.Executors +import com.android.launcher3.util.DisplayController +import com.android.launcher3.util.Executors.MAIN_EXECUTOR import com.android.launcher3.util.window.WindowManagerProxy.DesktopVisibilityListener import com.android.quickstep.GestureState.GestureEndTarget import com.android.quickstep.SystemUiProxy @@ -61,8 +63,6 @@ constructor( * (Used only when multiple desks are enabled). * * @property displayId The ID of the display this object represents. - * @property canCreateDesks true if it's possible to create new desks on the display represented - * by this object. * @property activeDeskId The ID of the active desk on the associated display (if any). It has a * value of `INACTIVE_DESK_ID` (-1) if there are no active desks. Note that there can only be * at most one active desk on each display. @@ -70,20 +70,40 @@ constructor( */ private data class DisplayDeskConfig( val displayId: Int, - var canCreateDesks: Boolean, var activeDeskId: Int = INACTIVE_DESK_ID, val deskIds: MutableSet, ) + /** True if it is possible to create new desks on current setup. */ + var canCreateDesks: Boolean = false + private set(value) { + if (field == value) return + field = value + desktopVisibilityListeners.forEach { it.onCanCreateDesksChanged(field) } + } + /** Maps each display by its ID to its desks configuration. */ private val displaysDesksConfigsMap = SparseArray() private val desktopVisibilityListeners: MutableSet = HashSet() private val taskbarDesktopModeListeners: MutableSet = HashSet() + // This simply indicates that user is currently in desktop mode or not. + var isInDesktopMode = false + private set + + // to track if any pending notification to be done. + var isNotifyingDesktopVisibilityPending = false + + // to let launcher hold off on notifying desktop visibility listeners. + var launcherAnimationRunning = false + // TODO: b/394387739 - Deprecate this and replace it with something that tracks the count per // desk. - /** Number of visible desktop windows in desktop mode. */ + /** + * Number of visible desktop windows in desktop mode. This can be > 0 when user goes to overview + * from desktop window mode. + */ var visibleDesktopTasksCount: Int = 0 /** * Sets the number of desktop windows that are visible and updates launcher visibility based @@ -101,13 +121,27 @@ constructor( } if (visibleTasksCount != field) { + if (visibleDesktopTasksCount == 0 && visibleTasksCount == 1) { + isInDesktopMode = true + } + if (visibleDesktopTasksCount == 1 && visibleTasksCount == 0) { + isInDesktopMode = false + } val wasVisible = field > 0 val isVisible = visibleTasksCount > 0 val wereDesktopTasksVisibleBefore = areDesktopTasksVisibleAndNotInOverview() field = visibleTasksCount val areDesktopTasksVisibleNow = areDesktopTasksVisibleAndNotInOverview() - if (wereDesktopTasksVisibleBefore != areDesktopTasksVisibleNow) { - notifyIsInDesktopModeChanged(DEFAULT_DISPLAY, areDesktopTasksVisibleNow) + + if ( + wereDesktopTasksVisibleBefore != areDesktopTasksVisibleNow || + wasVisible != isVisible + ) { + if (!launcherAnimationRunning) { + notifyIsInDesktopModeChanged(DEFAULT_DISPLAY, areDesktopTasksVisibleNow) + } else { + isNotifyingDesktopVisibilityPending = true + } } if ( @@ -146,13 +180,28 @@ constructor( } } + /** + * Returns the ID of the active desk (if any) on the display whose ID is [displayId], or + * [INACTIVE_DESK_ID] if no desk is currently active or the multiple desks feature is disabled. + */ + fun getActiveDeskId(displayId: Int): Int { + if (!DesktopModeStatus.enableMultipleDesktops(context)) { + // When the multiple desks feature is disabled, callers should not rely on the concept + // of a desk ID. + return INACTIVE_DESK_ID + } + + return getDisplayDeskConfig(displayId)?.activeDeskId ?: INACTIVE_DESK_ID + } + /** Returns whether a desk is currently active on the display with the given [displayId]. */ fun isInDesktopMode(displayId: Int): Boolean { if (!DesktopModeStatus.enableMultipleDesktops(context)) { - return areDesktopTasksVisible() + return isInDesktopMode } - val isInDesktopMode = displaysDesksConfigsMap[displayId].activeDeskId != INACTIVE_DESK_ID + val activeDeskId = getDisplayDeskConfig(displayId)?.activeDeskId ?: INACTIVE_DESK_ID + val isInDesktopMode = activeDeskId != INACTIVE_DESK_ID if (DEBUG) { Log.d(TAG, "isInDesktopMode: $isInDesktopMode") } @@ -174,15 +223,6 @@ constructor( return isInDesktopMode(displayId) && !inOverviewState } - /** Whether desktop tasks are visible in desktop mode. */ - private fun areDesktopTasksVisible(): Boolean { - val desktopTasksVisible: Boolean = visibleDesktopTasksCount > 0 - if (DEBUG) { - Log.d(TAG, "areDesktopTasksVisible: desktopVisible=$desktopTasksVisible") - } - return desktopTasksVisible - } - /** Whether desktop tasks are visible in desktop mode. */ private fun areDesktopTasksVisibleAndNotInOverview(): Boolean { val desktopTasksVisible: Boolean = visibleDesktopTasksCount > 0 @@ -216,6 +256,22 @@ constructor( ) } + /** + * Launcher Driven Desktop Mode changes. For example, swipe to home and quick switch from + * Desktop Windowing Mode. if there is any pending notification please notify desktop visibility + * listeners. + */ + fun onLauncherAnimationFromDesktopEnd() { + launcherAnimationRunning = false + if (isNotifyingDesktopVisibilityPending) { + isNotifyingDesktopVisibilityPending = false + notifyIsInDesktopModeChanged( + DEFAULT_DISPLAY, + isInDesktopModeAndNotInOverview(DEFAULT_DISPLAY), + ) + } + } + fun onLauncherStateChanged(state: RecentsState) { onLauncherStateChanged( state, @@ -325,6 +381,26 @@ constructor( } } + private fun notifyTaskbarDesktopModeListenersForEntry(duration: Int) { + if (DEBUG) { + Log.d(TAG, "notifyTaskbarDesktopModeListenersForEntry: duration=" + duration) + } + for (listener in taskbarDesktopModeListeners) { + listener.onEnterDesktopMode(duration) + } + DisplayController.INSTANCE.get(context).notifyConfigChange() + } + + private fun notifyTaskbarDesktopModeListenersForExit(duration: Int) { + if (DEBUG) { + Log.d(TAG, "notifyTaskbarDesktopModeListenersForExit: duration=" + duration) + } + for (listener in taskbarDesktopModeListeners) { + listener.onExitDesktopMode(duration) + } + DisplayController.INSTANCE.get(context).notifyConfigChange() + } + /** TODO: b/333533253 - Remove after flag rollout */ private fun setBackgroundStateEnabled(backgroundStateEnabled: Boolean) { if (DEBUG) { @@ -391,7 +467,10 @@ constructor( } } - private fun onListenerConnected(displayDeskStates: Array) { + private fun onListenerConnected( + displayDeskStates: Array, + canCreateDesks: Boolean, + ) { if (!DesktopModeStatus.enableMultipleDesktops(context)) { return } @@ -402,25 +481,24 @@ constructor( displaysDesksConfigsMap[displayDeskState.displayId] = DisplayDeskConfig( displayId = displayDeskState.displayId, - canCreateDesks = displayDeskState.canCreateDesk, activeDeskId = displayDeskState.activeDeskId, deskIds = displayDeskState.deskIds.toMutableSet(), ) } + + this.canCreateDesks = canCreateDesks } - private fun getDisplayDeskConfig(displayId: Int): DisplayDeskConfig { - return checkNotNull(displaysDesksConfigsMap[displayId]) { - "Expected non-null desk config for display: $displayId" - } - } + private fun getDisplayDeskConfig(displayId: Int) = + displaysDesksConfigsMap[displayId] + ?: null.also { Slog.e(TAG, "Expected non-null desk config for display: $displayId") } - private fun onCanCreateDesksChanged(displayId: Int, canCreateDesks: Boolean) { + private fun onCanCreateDesksChanged(canCreateDesks: Boolean) { if (!DesktopModeStatus.enableMultipleDesktops(context)) { return } - getDisplayDeskConfig(displayId).canCreateDesks = canCreateDesks + this.canCreateDesks = canCreateDesks } private fun onDeskAdded(displayId: Int, deskId: Int) { @@ -428,7 +506,7 @@ constructor( return } - getDisplayDeskConfig(displayId).also { + getDisplayDeskConfig(displayId)?.also { check(it.deskIds.add(deskId)) { "Found a duplicate desk Id: $deskId on display: $displayId" } @@ -440,7 +518,7 @@ constructor( return } - getDisplayDeskConfig(displayId).also { + getDisplayDeskConfig(displayId)?.also { check(it.deskIds.remove(deskId)) { "Removing non-existing desk Id: $deskId on display: $displayId" } @@ -457,7 +535,7 @@ constructor( val wasInDesktopMode = isInDesktopModeAndNotInOverview(displayId) - getDisplayDeskConfig(displayId).also { + getDisplayDeskConfig(displayId)?.also { check(oldActiveDesk == it.activeDeskId) { "Mismatch between the Shell's oldActiveDesk: $oldActiveDesk, and Launcher's: ${it.activeDeskId}" } @@ -525,15 +603,18 @@ constructor( ) : Stub() { private val controller = WeakReference(controller) - override fun onListenerConnected(displayDeskStates: Array) { - Executors.MAIN_EXECUTOR.execute { - controller.get()?.onListenerConnected(displayDeskStates) + override fun onListenerConnected( + displayDeskStates: Array, + canCreateDesks: Boolean, + ) { + MAIN_EXECUTOR.execute { + controller.get()?.onListenerConnected(displayDeskStates, canCreateDesks) } } override fun onTasksVisibilityChanged(displayId: Int, visibleTasksCount: Int) { if (displayId != this.displayId) return - Executors.MAIN_EXECUTOR.execute { + MAIN_EXECUTOR.execute { controller.get()?.apply { if (DEBUG) { Log.d(TAG, "desktop visible tasks count changed=$visibleTasksCount") @@ -549,7 +630,7 @@ constructor( override fun onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding: Boolean) { if (!DesktopModeStatus.useRoundedCorners()) return - Executors.MAIN_EXECUTOR.execute { + MAIN_EXECUTOR.execute { controller.get()?.apply { Log.d( TAG, @@ -561,26 +642,46 @@ constructor( } } - override fun onEnterDesktopModeTransitionStarted(transitionDuration: Int) {} - - override fun onExitDesktopModeTransitionStarted(transitionDuration: Int) {} - - override fun onCanCreateDesksChanged(displayId: Int, canCreateDesks: Boolean) { - Executors.MAIN_EXECUTOR.execute { - controller.get()?.onCanCreateDesksChanged(displayId, canCreateDesks) + override fun onEnterDesktopModeTransitionStarted(transitionDuration: Int) { + MAIN_EXECUTOR.execute { + Log.d( + TAG, + ("DesktopTaskListenerImpl: onEnterDesktopModeTransitionStarted with " + + "duration= " + + transitionDuration), + ) + controller.get()?.isInDesktopMode = true + controller.get()?.notifyTaskbarDesktopModeListenersForEntry(transitionDuration) } } + override fun onExitDesktopModeTransitionStarted(transitionDuration: Int) { + MAIN_EXECUTOR.execute { + Log.d( + TAG, + ("DesktopTaskListenerImpl: onExitDesktopModeTransitionStarted with " + + "duration= " + + transitionDuration), + ) + controller.get()?.isInDesktopMode = false + controller.get()?.notifyTaskbarDesktopModeListenersForExit(transitionDuration) + } + } + + override fun onCanCreateDesksChanged(canCreateDesks: Boolean) { + MAIN_EXECUTOR.execute { controller.get()?.onCanCreateDesksChanged(canCreateDesks) } + } + override fun onDeskAdded(displayId: Int, deskId: Int) { - Executors.MAIN_EXECUTOR.execute { controller.get()?.onDeskAdded(displayId, deskId) } + MAIN_EXECUTOR.execute { controller.get()?.onDeskAdded(displayId, deskId) } } override fun onDeskRemoved(displayId: Int, deskId: Int) { - Executors.MAIN_EXECUTOR.execute { controller.get()?.onDeskRemoved(displayId, deskId) } + MAIN_EXECUTOR.execute { controller.get()?.onDeskRemoved(displayId, deskId) } } override fun onActiveDeskChanged(displayId: Int, newActiveDesk: Int, oldActiveDesk: Int) { - Executors.MAIN_EXECUTOR.execute { + MAIN_EXECUTOR.execute { controller.get()?.onActiveDeskChanged(displayId, newActiveDesk, oldActiveDesk) } } @@ -593,7 +694,21 @@ constructor( * * @param doesAnyTaskRequireTaskbarRounding whether task requires taskbar corner roundness. */ - fun onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding: Boolean) + fun onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding: Boolean) {} + + /** + * Callback for when user is exiting desktop mode. + * + * @param duration for exit transition + */ + fun onExitDesktopMode(duration: Int) {} + + /** + * Callback for when user is entering desktop mode. + * + * @param duration for enter transition + */ + fun onEnterDesktopMode(duration: Int) {} } companion object { @@ -603,6 +718,6 @@ constructor( private const val TAG = "DesktopVisController" private const val DEBUG = false - private const val INACTIVE_DESK_ID = -1 + public const val INACTIVE_DESK_ID = -1 } } diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java index 5afc5eda6d..8555376fd6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java @@ -17,6 +17,7 @@ package com.android.launcher3.taskbar; import static com.android.launcher3.Flags.enableAltTabKqsOnConnectedDisplays; +import android.app.ActivityManager; import android.content.ComponentName; import android.content.pm.ActivityInfo; import android.view.MotionEvent; @@ -354,6 +355,27 @@ public final class KeyboardQuickSwitchController implements } } + @VisibleForTesting + boolean isShownFromTaskbar() { + return isShown() && mQuickSwitchViewController.wasOpenedFromTaskbar(); + } + + @VisibleForTesting + boolean isShown() { + return mQuickSwitchViewController != null + && !mQuickSwitchViewController.isCloseAnimationRunning(); + } + + @VisibleForTesting + List shownTaskIds() { + if (!isShown()) { + return Collections.emptyList(); + } + + return mTasks.stream().flatMap( + groupTask -> groupTask.getTasks().stream().map(task -> task.key.id)).toList(); + } + @Override public void dumpLogs(String prefix, PrintWriter pw) { pw.println(prefix + "KeyboardQuickSwitchController:"); @@ -423,7 +445,13 @@ public final class KeyboardQuickSwitchController implements if (task == null) { return false; } - int runningTaskId = ActivityManagerWrapper.getInstance().getRunningTask().taskId; + ActivityManager.RunningTaskInfo runningTaskInfo = + ActivityManagerWrapper.getInstance().getRunningTask(); + if (runningTaskInfo == null) { + return false; + } + + int runningTaskId = runningTaskInfo.taskId; return task.containsTask(runningTaskId); } diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java index ce9655646a..f80dc909f8 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java @@ -104,9 +104,18 @@ public class KeyboardQuickSwitchTaskView extends ConstraintLayout { mIcon2 = findViewById(R.id.icon_2); mContent = findViewById(R.id.content); - Resources resources = mContext.getResources(); - Preconditions.assertNotNull(mContent); + + TypefaceUtils.setTypeface( + mContent.findViewById(R.id.large_text), + TypefaceUtils.FONT_FAMILY_HEADLINE_LARGE_EMPHASIZED + ); + TypefaceUtils.setTypeface( + mContent.findViewById(R.id.small_text), + TypefaceUtils.FONT_FAMILY_LABEL_LARGE_BASELINE + ); + + Resources resources = mContext.getResources(); mBorderAnimator = BorderAnimator.createScalingBorderAnimator( /* borderRadiusPx= */ mBorderRadius != INVALID_BORDER_RADIUS ? mBorderRadius @@ -188,8 +197,7 @@ public class KeyboardQuickSwitchTaskView extends ConstraintLayout { final boolean isLeftRightSplit = !splitBounds.appsStackedVertically; - final float leftOrTopTaskPercent = isLeftRightSplit - ? splitBounds.leftTaskPercent : splitBounds.topTaskPercent; + final float leftOrTopTaskPercent = splitBounds.getLeftTopTaskPercent(); ConstraintLayout.LayoutParams leftTopParams = (ConstraintLayout.LayoutParams) mThumbnailView1.getLayoutParams(); diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java index 4581119c72..4b4d68dd23 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java @@ -163,6 +163,10 @@ public class KeyboardQuickSwitchView extends ConstraintLayout { R.dimen.keyboard_quick_switch_view_small_spacing); mOutlineRadius = resources.getDimensionPixelSize(R.dimen.keyboard_quick_switch_view_radius); mIsRtl = Utilities.isRtl(resources); + + TypefaceUtils.setTypeface( + mNoRecentItemsPane.findViewById(R.id.no_recent_items_text), + TypefaceUtils.FONT_FAMILY_LABEL_LARGE_BASELINE); } private void registerOnBackInvokedCallback() { @@ -310,7 +314,7 @@ public class KeyboardQuickSwitchView extends ConstraintLayout { layoutInflater, previousTaskView); - desktopButton.findViewById(R.id.text).setText( + desktopButton.findViewById(R.id.small_text).setText( resources.getString(R.string.quick_switch_desktop)); } mDisplayingRecentTasks = !groupTasks.isEmpty() || useDesktopTaskView; diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java index 5af7ff8933..5f7a026469 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java @@ -290,9 +290,9 @@ public class KeyboardQuickSwitchViewController { remoteTransition = new RemoteTransition( new DesktopAppLaunchTransition( context, - MAIN_EXECUTOR, UNMINIMIZE, - Cuj.CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH + Cuj.CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH, + MAIN_EXECUTOR ), "DesktopKeyboardQuickSwitchUnminimize"); } diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 3f3700bb04..2272d11c38 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java @@ -467,10 +467,15 @@ public class LauncherTaskbarUIController extends TaskbarUIController { } @Override - protected boolean canToggleHomeAllApps() { - return mLauncher.isResumed() + protected void toggleAllApps(boolean focusSearch) { + boolean canToggleHomeAllApps = mLauncher.isResumed() && !mTaskbarLauncherStateController.isInOverviewUi() && !mLauncher.areDesktopTasksVisible(); + if (canToggleHomeAllApps) { + mLauncher.toggleAllApps(focusSearch); + return; + } + super.toggleAllApps(focusSearch); } @Override diff --git a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java index b6b090c39b..2e5bebcb1b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java @@ -119,7 +119,8 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT mControllers = controllers; DeviceProfile deviceProfile = mActivity.getDeviceProfile(); Resources resources = mActivity.getResources(); - if (mActivity.isPhoneGestureNavMode() || mActivity.isTinyTaskbar()) { + if (mActivity.isPhoneGestureNavMode() || mActivity.isTinyTaskbar() + || mActivity.isBubbleBarOnPhone()) { mTaskbarSize = resources.getDimensionPixelSize(R.dimen.taskbar_phone_size); mStashedHandleWidth = resources.getDimensionPixelSize(R.dimen.taskbar_stashed_small_screen); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index b9d1275f56..a1620a1cbe 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -18,6 +18,7 @@ package com.android.launcher3.taskbar; import static android.os.Trace.TRACE_TAG_APP; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; +import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; @@ -26,6 +27,7 @@ import static android.window.SplashScreen.SPLASH_SCREEN_STYLE_UNDEFINED; import static androidx.annotation.VisibleForTesting.PACKAGE_PRIVATE; +import static com.android.app.animation.Interpolators.LINEAR; import static com.android.launcher3.AbstractFloatingView.TYPE_ALL; import static com.android.launcher3.AbstractFloatingView.TYPE_ON_BOARD_POPUP; import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE; @@ -46,8 +48,8 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; -import static com.android.window.flags.Flags.enableStartLaunchTransitionFromTaskbarBugfix; -import static com.android.window.flags.Flags.enableTaskbarConnectedDisplays; +import static com.android.wm.shell.Flags.enableBubbleBar; +import static com.android.wm.shell.Flags.enableBubbleBarOnPhones; import static com.android.wm.shell.Flags.enableTinyTaskbar; import static java.lang.invoke.MethodHandles.Lookup.PROTECTED; @@ -77,6 +79,7 @@ import android.view.WindowInsets; import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.Toast; +import android.window.DesktopExperienceFlags; import android.window.DesktopModeFlags; import android.window.RemoteTransition; @@ -94,12 +97,12 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.R; +import com.android.launcher3.allapps.ActivityAllAppsContainerView; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.apppairs.AppPairIcon; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.desktop.DesktopAppLaunchTransition; import com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType; -import com.android.launcher3.dot.DotInfo; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.logger.LauncherAtom; @@ -146,6 +149,7 @@ import com.android.launcher3.util.ApplicationInfoWrapper; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.Executors; +import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.NavigationMode; import com.android.launcher3.util.RunnableList; @@ -226,7 +230,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { private boolean mIsDestroyed = false; // The flag to know if the window is excluded from magnification region computation. private boolean mIsExcludeFromMagnificationRegion = false; - private boolean mBindingItems = false; private boolean mAddedWindow = false; // The bounds of the taskbar items relative to TaskbarDragLayer @@ -298,9 +301,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { // If Bubble bar is present, TaskbarControllers depends on it so build it first. Optional bubbleControllersOptional = Optional.empty(); BubbleBarController.onTaskbarRecreated(); + final boolean deviceBubbleBarEnabled = enableBubbleBarOnPhones() + || (!mDeviceProfile.isPhone && !mDeviceProfile.isVerticalBarLayout()); if (BubbleBarController.isBubbleBarEnabled() - && !mDeviceProfile.isPhone - && !mDeviceProfile.isVerticalBarLayout() + && deviceBubbleBarEnabled && bubbleBarView != null ) { Optional bubbleHandleController = Optional.empty(); @@ -434,8 +438,9 @@ public class TaskbarActivityContext extends BaseTaskbarContext { .setIsTransientTaskbar(true) .build(); } - mNavMode = (enableTaskbarConnectedDisplays() && !mIsPrimaryDisplay) - ? NavigationMode.THREE_BUTTONS : DisplayController.getNavigationMode(this); + mNavMode = (DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue() + && !mIsPrimaryDisplay) ? NavigationMode.THREE_BUTTONS + : DisplayController.getNavigationMode(this); } @@ -445,14 +450,25 @@ public class TaskbarActivityContext extends BaseTaskbarContext { mControllers.taskbarViewController.adjustTaskbarForBubbleBar(); } - public void init(@NonNull TaskbarSharedState sharedState) { + /** + * Init of taskbar activity context. + * @param duration If duration is greater than 0, it will be used to create an animation + * for the taskbar create/recreate process. + */ + public void init(@NonNull TaskbarSharedState sharedState, int duration) { mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, getResources(), false); mLastRequestedNonFullscreenSize = getDefaultTaskbarWindowSize(); mWindowLayoutParams = createAllWindowParams(); mLastUpdatedLayoutParams = new WindowManager.LayoutParams(); + + AnimatorSet recreateAnim = null; + if (duration > 0) { + recreateAnim = onRecreateAnimation(duration); + } + // Initialize controllers after all are constructed. - mControllers.init(sharedState); + mControllers.init(sharedState, recreateAnim); // This may not be necessary and can be reverted once we move towards recreating all // controllers without re-creating the window mControllers.rotationButtonController.onNavigationModeChanged(mNavMode.resValue); @@ -480,6 +496,33 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } else { notifyUpdateLayoutParams(); } + + + if (recreateAnim != null) { + recreateAnim.start(); + } + } + + /** + * Create AnimatorSet for taskbar create/recreate animation. Further used in init + */ + public AnimatorSet onRecreateAnimation(int duration) { + AnimatorSet animatorSet = new AnimatorSet(); + animatorSet.setDuration(duration); + return animatorSet; + } + + /** + * Called when we want destroy current taskbar with animation as part of recreate process. + */ + public AnimatorSet onDestroyAnimation(int duration) { + mIsDestroyed = true; + AnimatorSet animatorSet = new AnimatorSet(); + mControllers.taskbarViewController.onDestroyAnimation(animatorSet); + mControllers.taskbarDragLayerController.onDestroyAnimation(animatorSet); + animatorSet.setInterpolator(LINEAR); + animatorSet.setDuration(duration); + return animatorSet; } /** @@ -511,6 +554,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { return enableTinyTaskbar() && mDeviceProfile.isPhone && mDeviceProfile.isTaskbarPresent; } + public boolean isBubbleBarOnPhone() { + return enableBubbleBarOnPhones() && enableBubbleBar() && mDeviceProfile.isPhone; + } + /** * Returns {@code true} iff bubble bar is enabled (but not necessarily visible / * containing bubbles). @@ -561,16 +608,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(false); } - /** Toggles Taskbar All Apps overlay. */ - public void toggleAllApps() { - mControllers.taskbarAllAppsController.toggle(); - } - - /** Toggles Taskbar All Apps overlay with keyboard ready for search. */ - public void toggleAllAppsSearch() { - mControllers.taskbarAllAppsController.toggleSearch(); - } - @Override public DeviceProfile getDeviceProfile() { return mDeviceProfile; @@ -831,31 +868,28 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } } - @Override - public DotInfo getDotInfoForItem(ItemInfo info) { - return getPopupDataProvider().getDotInfoForItem(info); - } - @NonNull @Override public PopupDataProvider getPopupDataProvider() { return mControllers.taskbarPopupController.getPopupDataProvider(); } + @NonNull + @Override + public LauncherBindableItemsContainer getContent() { + return mControllers.taskbarViewController.getContent(); + } + + @Override + public ActivityAllAppsContainerView getAppsView() { + return mControllers.taskbarAllAppsController.getAppsView(); + } + @Override public View.AccessibilityDelegate getAccessibilityDelegate() { return mAccessibilityDelegate; } - @Override - public boolean isBindingItems() { - return mBindingItems; - } - - public void setBindingItems(boolean bindingItems) { - mBindingItems = bindingItems; - } - @Override public void onDragStart() { setTaskbarWindowFullscreen(true); @@ -868,7 +902,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { @Override public void onPopupVisibilityChanged(boolean isVisible) { - setTaskbarWindowFocusable(isVisible); + setTaskbarWindowFocusable(isVisible /* focusable */, false /* imeFocusable */); } @Override @@ -1227,17 +1261,29 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } /** - * Either adds or removes {@link WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE} on the taskbar - * window. + * Sets whether the taskbar window should be focusable and IME focusable. This won't be IME + * focusable unless it is also focusable. + * + * @param focusable whether it should be focusable. + * @param imeFocusable whether it should be IME focusable. + * + * @see WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE + * @see WindowManager.LayoutParams#FLAG_ALT_FOCUSABLE_IM */ - public void setTaskbarWindowFocusable(boolean focusable) { + public void setTaskbarWindowFocusable(boolean focusable, boolean imeFocusable) { if (isPhoneMode()) { return; } if (focusable) { mWindowLayoutParams.flags &= ~FLAG_NOT_FOCUSABLE; + if (imeFocusable) { + mWindowLayoutParams.flags &= ~FLAG_ALT_FOCUSABLE_IM; + } else { + mWindowLayoutParams.flags |= FLAG_ALT_FOCUSABLE_IM; + } } else { mWindowLayoutParams.flags |= FLAG_NOT_FOCUSABLE; + mWindowLayoutParams.flags &= ~FLAG_ALT_FOCUSABLE_IM; } notifyUpdateLayoutParams(); } @@ -1258,8 +1304,12 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } /** - * Either adds or removes {@link WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE} on the taskbar - * window. If we're now focusable, also move nav buttons to a separate window above IME. + * Sets whether the taskbar window should be focusable, as well as IME focusable. If we're now + * focusable, also move nav buttons to a separate window above IME. + * + * @param focusable whether it should be focusable. + * + * @see WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE */ public void setTaskbarWindowFocusableForIme(boolean focusable) { if (focusable) { @@ -1267,7 +1317,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } else { mControllers.navbarButtonsViewController.moveNavButtonsBackToTaskbarWindow(); } - setTaskbarWindowFocusable(focusable); + setTaskbarWindowFocusable(focusable, true /* imeFocusable */); } /** Adds the given view to WindowManager with the provided LayoutParams (creates new window). */ @@ -1533,9 +1583,9 @@ public class TaskbarActivityContext extends BaseTaskbarContext { return new RemoteTransition( new DesktopAppLaunchTransition( this, - getMainExecutor(), appLaunchType, - cujType + cujType, + getMainExecutor() ), "TaskbarDesktopAppLaunch"); } @@ -1558,7 +1608,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { */ private void launchFromInAppTaskbar(@Nullable RecentsView recents, @Nullable View launchingIconView, List itemInfos) { - if (recents == null) { + boolean launchedFromExternalDisplay = + DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue() + && !mIsPrimaryDisplay; + if (recents == null && !launchedFromExternalDisplay) { return; } @@ -1699,7 +1752,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } // There is no task associated with this launch - launch a new task through an intent ActivityOptionsWrapper opts = getActivityLaunchDesktopOptions(); - if (enableStartLaunchTransitionFromTaskbarBugfix()) { + if (DesktopModeFlags.ENABLE_START_LAUNCH_TRANSITION_FROM_TASKBAR_BUGFIX.isTrue()) { mSysUiProxy.startLaunchIntentTransition(intent, opts.options.toBundle(), displayId); } else { startActivity(intent, opts.options.toBundle()); @@ -1956,6 +2009,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { return mControllers.taskbarStashController.isInApp(); } + public boolean isInOverview() { + return mControllers.taskbarStashController.isInOverview(); + } + public boolean isInStashedLauncherState() { return mControllers.taskbarStashController.isInStashedLauncherState(); } @@ -1979,8 +2036,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { "%s\tmIsUserSetupComplete=%b", prefix, mIsUserSetupComplete)); pw.println(String.format( "%s\tmWindowLayoutParams.height=%dpx", prefix, mWindowLayoutParams.height)); - pw.println(String.format( - "%s\tmBindInProgress=%b", prefix, mBindingItems)); mControllers.dumpLogs(prefix + "\t", pw); mDeviceProfile.dump(this, prefix, pw); } @@ -2005,10 +2060,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { mControllers.keyboardQuickSwitchController.closeQuickSwitchView(false); } - boolean canToggleHomeAllApps() { - return mControllers.uiController.canToggleHomeAllApps(); - } - boolean isIconAlignedWithHotseat() { return mControllers.uiController.isIconAlignedWithHotseat(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt index e44bce1a07..89cc991387 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt @@ -50,6 +50,8 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { } var isAnimatingPinning = false + var isAnimatingPersistentTaskbar = false + var isAnimatingTransientTaskbar = false val paint = Paint() private val strokePaint = Paint() @@ -108,7 +110,7 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { fun updateStashedHandleWidth(context: TaskbarActivityContext, res: Resources) { stashedHandleWidth = res.getDimensionPixelSize( - if (context.isPhoneMode || context.isTinyTaskbar) { + if (context.isPhoneMode || context.isTinyTaskbar || context.isBubbleBarOnPhone) { R.dimen.taskbar_stashed_small_screen } else { R.dimen.taskbar_stashed_handle_width @@ -144,7 +146,7 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { /** Draws the background with the given paint and height, on the provided canvas. */ fun draw(canvas: Canvas) { if (isInSetup) return - val isTransientTaskbar = backgroundProgress == 0f + val isTransientTaskbar = DisplayController.isTransientTaskbar(context) canvas.save() if (!isTransientTaskbar || transientBackgroundBounds.isEmpty || isAnimatingPinning) { drawPersistentBackground(canvas) @@ -158,7 +160,7 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { } private fun drawPersistentBackground(canvas: Canvas) { - if (isAnimatingPinning) { + if (isAnimatingPinning || isAnimatingPersistentTaskbar) { val persistentTaskbarHeight = maxPersistentTaskbarHeight * backgroundProgress canvas.translate(0f, canvas.height - persistentTaskbarHeight) // Draw the background behind taskbar content. @@ -181,12 +183,13 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { private fun drawTransientBackground(canvas: Canvas) { val res = context.resources val transientTaskbarHeight = maxTransientTaskbarHeight * (1f - backgroundProgress) + val isAnimating = isAnimatingPinning || isAnimatingTransientTaskbar val heightProgressWhileAnimating = - if (isAnimatingPinning) transientTaskbarHeight else backgroundHeight + if (isAnimating) transientTaskbarHeight else backgroundHeight var progress = heightProgressWhileAnimating / maxTransientTaskbarHeight progress = Math.round(progress * 100f) / 100f - if (isAnimatingPinning) { + if (isAnimating) { var scale = transientTaskbarHeight / maxTransientTaskbarHeight scale = Math.round(scale * 100f) / 100f bottomMargin = diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java index b244be9205..6ca9385294 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java @@ -15,6 +15,7 @@ */ package com.android.launcher3.taskbar; +import android.animation.AnimatorSet; import android.content.pm.ActivityInfo.Config; import androidx.annotation.NonNull; @@ -149,15 +150,15 @@ public class TaskbarControllers { * TaskbarControllers instance, but should be careful to only access things that were created * in constructors for now, as some controllers may still be waiting for init(). */ - public void init(@NonNull TaskbarSharedState sharedState) { + public void init(@NonNull TaskbarSharedState sharedState, AnimatorSet startAnimation) { mAreAllControllersInitialized = false; mSharedState = sharedState; taskbarDragController.init(this); navbarButtonsViewController.init(this); rotationButtonController.init(); - taskbarDragLayerController.init(this); - taskbarViewController.init(this); + taskbarDragLayerController.init(this, startAnimation); + taskbarViewController.init(this, startAnimation); taskbarScrimViewController.init(this); taskbarUnfoldAnimationController.init(this); taskbarKeyguardController.init(navbarButtonsViewController); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeController.kt index f71dea9df8..ca8e4cad9f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeController.kt @@ -30,6 +30,9 @@ class TaskbarDesktopModeController( private lateinit var taskbarControllers: TaskbarControllers private lateinit var taskbarSharedState: TaskbarSharedState + val isInDesktopMode: Boolean + get() = desktopVisibilityController.isInDesktopMode + fun init(controllers: TaskbarControllers, sharedState: TaskbarSharedState) { taskbarControllers = controllers taskbarSharedState = sharedState @@ -42,6 +45,7 @@ class TaskbarDesktopModeController( desktopVisibilityController.isInDesktopModeAndNotInOverview(displayId) override fun onTaskbarCornerRoundingUpdate(doesAnyTaskRequireTaskbarRounding: Boolean) { + if (taskbarControllers.taskbarActivityContext.isDestroyed) return taskbarSharedState.showCornerRadiusInDesktopMode = doesAnyTaskRequireTaskbarRounding val cornerRadius = getTaskbarCornerRoundness(doesAnyTaskRequireTaskbarRounding) taskbarControllers.taskbarCornerRoundness.animateToValue(cornerRadius).start() diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java index b91f51270c..1b516bef4d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java @@ -52,6 +52,7 @@ import android.view.ViewRootImpl; import android.window.SurfaceSyncGroup; import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import com.android.app.animation.Interpolators; import com.android.internal.logging.InstanceId; @@ -67,6 +68,7 @@ import com.android.launcher3.dragndrop.DragDriver; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.dragndrop.DraggableView; +import com.android.launcher3.folder.Folder; import com.android.launcher3.graphics.DragPreviewProvider; import com.android.launcher3.logger.LauncherAtom.ContainerInfo; import com.android.launcher3.logging.StatsLogManager; @@ -75,6 +77,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.popup.PopupContainerWithArrow; import com.android.launcher3.shortcuts.DeepShortcutView; import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider; +import com.android.launcher3.taskbar.bubbles.BubbleBarViewController; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; import com.android.launcher3.util.DisplayController; @@ -114,6 +117,7 @@ public class TaskbarDragController extends DragController im private int mRegistrationY; private boolean mIsSystemDragInProgress; + private boolean mIsDropHandledByDropTarget; // Animation for the drag shadow back into position after an unsuccessful drag private ValueAnimator mReturnAnimator; @@ -250,7 +254,8 @@ public class TaskbarDragController extends DragController im /* originalView = */ btv, dragLayerX + dragOffset.x, dragLayerY + dragOffset.y, - (View target, DropTarget.DragObject d, boolean success) -> {} /* DragSource */, + (View target, DropTarget.DragObject d, boolean success) -> + mIsDropHandledByDropTarget = success /* DragSource */, btv.getTag() instanceof ItemInfo itemInfo ? itemInfo : null, dragRect, scale * iconScale, @@ -517,6 +522,7 @@ public class TaskbarDragController extends DragController im return mIsSystemDragInProgress; } + @VisibleForTesting private void maybeOnDragEnd() { if (!isDragging()) { ((BubbleTextView) mDragObject.originalView).setIconDisabled(false); @@ -524,20 +530,41 @@ public class TaskbarDragController extends DragController im TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, false); mActivity.onDragEnd(); if (mReturnAnimator == null) { + // If an item is dropped on the bubble bar, the bubble bar handles the drop, + // so it should not collapse along with the taskbar. + boolean droppedOnBubbleBar = notifyBubbleBarItemDropped(); // Upon successful drag, immediately stash taskbar. // Note, this must be done last to ensure no AutohideSuspendFlags are active, as // that will prevent us from stashing until the timeout. - mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true); - + mControllers.taskbarStashController.updateAndAnimateTransientTaskbar( + /* stash = */ true, + /* shouldBubblesFollow = */ !droppedOnBubbleBar + ); mActivity.getStatsLogManager().logger().withItemInfo(mDragObject.dragInfo) .log(LAUNCHER_APP_LAUNCH_DRAGDROP); } } } + /** + * Exits the Bubble Bar drop target mode if applicable. + * + * @return {@code true} if drop target mode was active. + */ + private boolean notifyBubbleBarItemDropped() { + return mControllers.bubbleControllers.map(bc -> { + BubbleBarViewController bubbleBarViewController = bc.bubbleBarViewController; + boolean showingDropTarget = bubbleBarViewController.isShowingDropTarget(); + if (showingDropTarget) { + bubbleBarViewController.onItemDroppedInBubbleBarDragZone(); + } + return showingDropTarget; + }).orElse(false); + } + @Override protected void endDrag() { - if (mDisallowGlobalDrag) { + if (mDisallowGlobalDrag && !mIsDropHandledByDropTarget) { // We need to explicitly set deferDragViewCleanupPostAnimation to true here so the // super call doesn't remove it from the drag layer before the animation completes. // This variable gets set in to false in super.dispatchDropComplete() because it @@ -741,8 +768,11 @@ public class TaskbarDragController extends DragController im @Override public void addDropTarget(DropTarget target) { - // No-op as Taskbar currently doesn't support any drop targets internally. - // Note: if we do add internal DropTargets, we'll still need to ignore Folder. + if (target instanceof Folder) { + // we need to ignore Folder. + return; + } + super.addDropTarget(target); } @Override diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java index 59ef57773c..4dbad8c56f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java @@ -186,6 +186,7 @@ public class TaskbarDragLayer extends BaseDragLayer { @Override protected void dispatchDraw(Canvas canvas) { + if (mContainer.isDestroyed()) return; float backgroundHeight = mControllerCallbacks.getTaskbarBackgroundHeight() * (1f - mTaskbarBackgroundOffset); mBackgroundRenderer.setBackgroundHeight(backgroundHeight); @@ -285,6 +286,21 @@ public class TaskbarDragLayer extends BaseDragLayer { return super.dispatchKeyEvent(event); } + /** + * Sets animation boolean when only animating persistent taskbar. + */ + public void setIsAnimatingPersistentTaskbarBackground(boolean animatingPersistentTaskbarBg) { + mBackgroundRenderer.setAnimatingPersistentTaskbar(animatingPersistentTaskbarBg); + } + + /** + * Sets animation boolean when only animating transient taskbar. + */ + public void setIsAnimatingTransientTaskbarBackground(boolean animatingTransientTaskbarBg) { + mBackgroundRenderer.setAnimatingTransientTaskbar(animatingTransientTaskbarBg); + } + + /** * Sets the width percentage to inset the transient taskbar's background from the left and from * the right. diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java index 68c252a592..55ecc37fb0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java @@ -15,9 +15,12 @@ */ package com.android.launcher3.taskbar; +import static com.android.app.animation.Interpolators.EMPHASIZED; import static com.android.launcher3.taskbar.TaskbarPinningController.PINNING_PERSISTENT; import static com.android.launcher3.taskbar.TaskbarPinningController.PINNING_TRANSIENT; +import android.animation.AnimatorSet; +import android.animation.ObjectAnimator; import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Point; @@ -29,6 +32,7 @@ import android.view.ViewTreeObserver; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.anim.AnimatedFloat; +import com.android.launcher3.anim.AnimatorListeners; import com.android.launcher3.util.DimensionUtils; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.MultiPropertyFactory.MultiProperty; @@ -58,6 +62,8 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa private final AnimatedFloat mImeBgTaskbar = new AnimatedFloat(this::updateBackgroundAlpha); private final AnimatedFloat mAssistantBgTaskbar = new AnimatedFloat( this::updateBackgroundAlpha); + private final AnimatedFloat mBgTaskbarRecreate = new AnimatedFloat( + this::updateBackgroundAlpha); // Used to hide our background color when someone else (e.g. ScrimView) is handling it. private final AnimatedFloat mBgOverride = new AnimatedFloat(this::updateBackgroundAlpha); @@ -88,7 +94,10 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa mFolderMargin = resources.getDimensionPixelSize(R.dimen.taskbar_folder_margin); } - public void init(TaskbarControllers controllers) { + /** + * Init of taskbar drag layer controller + */ + public void init(TaskbarControllers controllers, AnimatorSet startAnimation) { mControllers = controllers; mTaskbarStashViaTouchController = new TaskbarStashViaTouchController(mControllers); mTaskbarDragLayer.init(new TaskbarDragLayerCallbacks()); @@ -96,15 +105,45 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa mOnBackgroundNavButtonColorIntensity = mControllers.navbarButtonsViewController .getOnTaskbarBackgroundNavButtonColorOverride(); - mTaskbarBackgroundProgress.updateValue(DisplayController.isTransientTaskbar(mActivity) - ? PINNING_TRANSIENT - : PINNING_PERSISTENT); + + if (startAnimation != null) { + // set taskbar background render animation boolean + if (DisplayController.isTransientTaskbar(mActivity)) { + mTaskbarDragLayer.setIsAnimatingTransientTaskbarBackground(true); + } else { + mTaskbarDragLayer.setIsAnimatingPersistentTaskbarBackground(true); + } + + float desiredValue = DisplayController.isTransientTaskbar(mActivity) + ? PINNING_TRANSIENT + : PINNING_PERSISTENT; + + float nonDesiredvalue = !DisplayController.isTransientTaskbar(mActivity) + ? PINNING_TRANSIENT + : PINNING_PERSISTENT; + + ObjectAnimator objectAnimator = mTaskbarBackgroundProgress.animateToValue( + nonDesiredvalue, desiredValue); + objectAnimator.setInterpolator(EMPHASIZED); + startAnimation.play(objectAnimator); + startAnimation.addListener(AnimatorListeners.forEndCallback(()-> { + // reset taskbar background render animation boolean + mTaskbarDragLayer.setIsAnimatingPersistentTaskbarBackground(false); + mTaskbarDragLayer.setIsAnimatingTransientTaskbarBackground(false); + })); + + } else { + mTaskbarBackgroundProgress.updateValue(DisplayController.isTransientTaskbar(mActivity) + ? PINNING_TRANSIENT + : PINNING_PERSISTENT); + } mBgTaskbar.value = 1; mKeyguardBgTaskbar.value = 1; mNotificationShadeBgTaskbar.value = 1; mImeBgTaskbar.value = 1; mAssistantBgTaskbar.value = 1; + mBgTaskbarRecreate.value = 1; mBgOverride.value = 1; updateBackgroundAlpha(); @@ -112,6 +151,13 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa updateTaskbarAlpha(); } + /** + * Called when destroying Taskbar with animation. + */ + public void onDestroyAnimation(AnimatorSet animatorSet) { + animatorSet.play(mBgTaskbarRecreate.animateToValue(0f)); + } + public void onDestroy() { mTaskbarDragLayer.onDestroy(); } @@ -172,14 +218,14 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa } private void updateBackgroundAlpha() { - if (mActivity.isPhoneMode()) { + if (mActivity.isPhoneMode() || mActivity.isDestroyed()) { return; } final float bgNavbar = mBgNavbar.value; final float bgTaskbar = mBgTaskbar.value * mKeyguardBgTaskbar.value * mNotificationShadeBgTaskbar.value * mImeBgTaskbar.value - * mAssistantBgTaskbar.value; + * mAssistantBgTaskbar.value * mBgTaskbarRecreate.value; mLastSetBackgroundAlpha = mBgOverride.value * Math.max(bgNavbar, bgTaskbar); mBackgroundRendererAlpha.setValue(mLastSetBackgroundAlpha); @@ -266,6 +312,7 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa pw.println(prefix + "\t\tmNotificationShadeBgTaskbar=" + mNotificationShadeBgTaskbar.value); pw.println(prefix + "\t\tmImeBgTaskbar=" + mImeBgTaskbar.value); pw.println(prefix + "\t\tmAssistantBgTaskbar=" + mAssistantBgTaskbar.value); + pw.println(prefix + "\t\tmBgTaskbarRecreate=" + mBgTaskbarRecreate.value); } /** diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt index 26a552e80f..5d1288c106 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt @@ -39,6 +39,7 @@ import androidx.core.view.updateLayoutParams import com.airbnb.lottie.LottieAnimationView import com.android.launcher3.LauncherPrefs import com.android.launcher3.R +import com.android.launcher3.RemoveAnimationSettingsTracker import com.android.launcher3.Utilities import com.android.launcher3.config.FeatureFlags.enableTaskbarPinning import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_EDU_OPEN @@ -128,6 +129,26 @@ open class TaskbarEduTooltipController(context: Context) : activityContext.dragLayer.post { maybeShowSearchEdu() } } + /** + * Turns off auto play of lottie animations if user has opted to remove animation else attaches + * click listener to allow user to play or pause animations. + */ + fun handleEduAnimations(animationViews: List) { + for (animationView in animationViews) { + if ( + RemoveAnimationSettingsTracker.INSTANCE.get(animationView.context) + .isRemoveAnimationEnabled() + ) { + animationView.pauseAnimation() + } else { + animationView.setOnClickListener { + if (animationView.isAnimating) animationView.pauseAnimation() + else animationView.playAnimation() + } + } + } + } + /** Shows swipe EDU tooltip if it is the current [tooltipStep]. */ fun maybeShowSwipeEdu() { if ( @@ -141,7 +162,13 @@ open class TaskbarEduTooltipController(context: Context) : tooltipStep = TOOLTIP_STEP_FEATURES inflateTooltip(R.layout.taskbar_edu_swipe) tooltip?.run { - requireViewById(R.id.swipe_animation).supportLightTheme() + TypefaceUtils.setTypeface( + requireViewById(R.id.taskbar_edu_title), + TypefaceUtils.FONT_FAMILY_HEADLINE_SMALL_EMPHASIZED, + ) + val swipeAnimation = requireViewById(R.id.swipe_animation) + swipeAnimation.supportLightTheme() + handleEduAnimations(listOf(swipeAnimation)) show() } } @@ -170,6 +197,7 @@ open class TaskbarEduTooltipController(context: Context) : splitscreenAnim.supportLightTheme() suggestionsAnim.supportLightTheme() pinningAnim.supportLightTheme() + handleEduAnimations(listOf(splitscreenAnim, suggestionsAnim, pinningAnim)) if (DisplayController.isTransientTaskbar(activityContext)) { splitscreenAnim.setAnimation(R.raw.taskbar_edu_splitscreen_transient) suggestionsAnim.setAnimation(R.raw.taskbar_edu_suggestions_transient) @@ -180,6 +208,23 @@ open class TaskbarEduTooltipController(context: Context) : pinningEdu.visibility = GONE } + TypefaceUtils.setTypeface( + requireViewById(R.id.taskbar_edu_title), + TypefaceUtils.FONT_FAMILY_HEADLINE_SMALL_EMPHASIZED, + ) + TypefaceUtils.setTypeface( + requireViewById(R.id.splitscreen_text), + TypefaceUtils.FONT_FAMILY_BODY_MEDIUM_BASELINE, + ) + TypefaceUtils.setTypeface( + requireViewById(R.id.suggestions_text), + TypefaceUtils.FONT_FAMILY_BODY_MEDIUM_BASELINE, + ) + TypefaceUtils.setTypeface( + requireViewById(R.id.pinning_text), + TypefaceUtils.FONT_FAMILY_BODY_MEDIUM_BASELINE, + ) + // Set up layout parameters. content.updateLayoutParams { width = MATCH_PARENT } updateLayoutParams { @@ -228,9 +273,19 @@ open class TaskbarEduTooltipController(context: Context) : tooltip?.run { allowTouchDismissal = true - requireViewById(R.id.standalone_pinning_animation) - .supportLightTheme() + TypefaceUtils.setTypeface( + requireViewById(R.id.taskbar_edu_title), + TypefaceUtils.FONT_FAMILY_HEADLINE_SMALL_EMPHASIZED, + ) + TypefaceUtils.setTypeface( + requireViewById(R.id.pinning_text), + TypefaceUtils.FONT_FAMILY_BODY_MEDIUM_BASELINE, + ) + val pinningAnim = + requireViewById(R.id.standalone_pinning_animation) + pinningAnim.supportLightTheme() + handleEduAnimations(listOf(pinningAnim)) updateLayoutParams { if (DisplayController.isTransientTaskbar(activityContext)) { bottomMargin += activityContext.deviceProfile.taskbarHeight @@ -274,8 +329,17 @@ open class TaskbarEduTooltipController(context: Context) : inflateTooltip(R.layout.taskbar_edu_search) tooltip?.run { allowTouchDismissal = true - requireViewById(R.id.search_edu_animation).supportLightTheme() + val searchEdu = requireViewById(R.id.search_edu_animation) + searchEdu.supportLightTheme() + handleEduAnimations(listOf(searchEdu)) val eduSubtitle: TextView = requireViewById(R.id.search_edu_text) + + TypefaceUtils.setTypeface( + requireViewById(R.id.taskbar_edu_title), + TypefaceUtils.FONT_FAMILY_HEADLINE_SMALL_EMPHASIZED, + ) + TypefaceUtils.setTypeface(eduSubtitle, TypefaceUtils.FONT_FAMILY_BODY_SMALL_BASELINE) + showDisclosureText(eduSubtitle) updateLayoutParams { if (DisplayController.isTransientTaskbar(activityContext)) { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index dd9f61e5ef..10eb64a44a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -223,9 +223,13 @@ public class TaskbarLauncherStateController { updateStateForFlag(FLAG_LAUNCHER_IN_STATE_TRANSITION, true); if (!mShouldDelayLauncherStateAnim) { if (toState == LauncherState.NORMAL) { - applyState(QuickstepTransitionManager.getTaskbarToHomeDuration( + boolean isPinnedTaskbarAndNotInDesktopMode = DisplayController.isPinnedTaskbar( - mControllers.taskbarActivityContext))); + mControllers.taskbarActivityContext) + && !DisplayController.isInDesktopMode( + mControllers.taskbarActivityContext); + applyState(QuickstepTransitionManager.getTaskbarToHomeDuration( + isPinnedTaskbarAndNotInDesktopMode)); } else { applyState(); } @@ -680,8 +684,11 @@ public class TaskbarLauncherStateController { } else if (mIconAlignment.isAnimatingToValue(toAlignment) || mIconAlignment.isSettledOnValue(toAlignment)) { // Already at desired value, but make sure we run the callback at the end. - animatorSet.addListener(AnimatorListeners.forEndCallback( - this::onIconAlignmentRatioChanged)); + animatorSet.addListener(AnimatorListeners.forEndCallback(() -> { + if (!mIconAlignment.isAnimating()) { + onIconAlignmentRatioChanged(); + } + })); } else { mIconAlignment.cancelAnimation(); ObjectAnimator iconAlignAnim = mIconAlignment diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index 96bcffd487..19e528af21 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -16,24 +16,27 @@ package com.android.launcher3.taskbar; import static android.content.Context.RECEIVER_NOT_EXPORTED; +import static android.content.Context.RECEIVER_EXPORTED; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static com.android.launcher3.BaseActivity.EVENT_DESTROYED; +import static com.android.launcher3.Flags.enableGrowthNudge; import static com.android.launcher3.Flags.enableUnfoldStateAnimation; import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION; import static com.android.launcher3.config.FeatureFlags.enableTaskbarNoRecreate; import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY; import static com.android.launcher3.util.DisplayController.CHANGE_DESKTOP_MODE; import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE; +import static com.android.launcher3.util.DisplayController.CHANGE_SHOW_LOCKED_TASKBAR; import static com.android.launcher3.util.DisplayController.CHANGE_TASKBAR_PINNING; -import static com.android.launcher3.util.DisplayController.TASKBAR_NOT_DESTROYED_TAG; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange; +import static com.android.launcher3.taskbar.growth.GrowthConstants.BROADCAST_SHOW_NUDGE; import static com.android.quickstep.util.SystemActionConstants.ACTION_SHOW_TASKBAR; import static com.android.quickstep.util.SystemActionConstants.SYSTEM_ACTION_ID_TASKBAR; -import static com.android.window.flags.Flags.enableTaskbarConnectedDisplays; +import android.animation.AnimatorSet; import android.annotation.SuppressLint; import android.app.PendingIntent; import android.content.ComponentCallbacks; @@ -46,6 +49,7 @@ import android.net.Uri; import android.os.Handler; import android.os.Trace; import android.provider.Settings; +import android.util.ArraySet; import android.util.Log; import android.util.SparseArray; import android.util.SparseBooleanArray; @@ -53,15 +57,19 @@ import android.view.Display; import android.view.MotionEvent; import android.view.WindowManager; import android.widget.FrameLayout; +import android.window.DesktopExperienceFlags; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; +import com.android.launcher3.anim.AnimatorListeners; import com.android.launcher3.anim.AnimatorPlaybackController; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.StatefulActivity; import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarNavButtonCallbacks; import com.android.launcher3.taskbar.unfold.NonDestroyableScopedUnfoldTransitionProgressProvider; @@ -75,14 +83,20 @@ import com.android.quickstep.SystemUiProxy; import com.android.quickstep.fallback.window.RecentsDisplayModel; import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.util.ContextualSearchInvoker; +import com.android.quickstep.util.GroupTask; import com.android.quickstep.views.RecentsViewContainer; +import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.statusbar.phone.BarTransitions; +import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags; +import com.android.systemui.shared.system.TaskStackChangeListener; +import com.android.systemui.shared.system.TaskStackChangeListeners; import com.android.systemui.unfold.UnfoldTransitionProgressProvider; import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider; import java.io.PrintWriter; +import java.util.Set; import java.util.StringJoiner; /** @@ -91,9 +105,10 @@ import java.util.StringJoiner; public class TaskbarManager { private static final String TAG = "TaskbarManager"; private static final boolean DEBUG = false; - // TODO(b/382378283) remove all logs with this tag - public static final String NULL_TASKBAR_ROOT_LAYOUT_TAG = "b/382378283"; - public static final String ILLEGAL_ARGUMENT_WM_ADD_VIEW = "b/391653300"; + private static final int TASKBAR_DESTROY_DURATION = 100; + + // TODO: b/397738606 - Remove all logs with this tag after the growth framework is integrated. + public static final String GROWTH_FRAMEWORK_TAG = "Growth Framework"; /** * All the configurations which do not initiate taskbar recreation. @@ -118,11 +133,12 @@ public class TaskbarManager { Settings.Secure.NAV_BAR_KIDS_MODE); private final Context mBaseContext; + private final TaskbarNavButtonCallbacks mNavCallbacks; // TODO: Remove this during the connected displays lifecycle refactor. private final Context mPrimaryWindowContext; - private WindowManager mPrimaryWindowManager; - private final TaskbarNavButtonController mDefaultNavButtonController; - private final ComponentCallbacks mDefaultComponentCallbacks; + private final WindowManager mPrimaryWindowManager; + private TaskbarNavButtonController mPrimaryNavButtonController; + private ComponentCallbacks mPrimaryComponentCallbacks; private final SimpleBroadcastReceiver mShutdownReceiver; @@ -140,6 +156,13 @@ public class TaskbarManager { private final SparseArray mRootLayouts = new SparseArray<>(); /** DisplayId - {@link Boolean} map indicating if RootLayout was added to window. */ private final SparseBooleanArray mAddedRootLayouts = new SparseBooleanArray(); + /** DisplayId - {@link TaskbarNavButtonController} map for Connected Display. */ + private final SparseArray mNavButtonControllers = + new SparseArray<>(); + /** DisplayId - {@link ComponentCallbacks} map for Connected Display. */ + private final SparseArray mComponentCallbacks = new SparseArray<>(); + /** DisplayId - {@link DeviceProfile} map for Connected Display. */ + private final SparseArray mExternalDeviceProfiles = new SparseArray<>(); private StatefulActivity mActivity; private RecentsViewContainer mRecentsViewContainer; @@ -158,32 +181,158 @@ public class TaskbarManager { private class RecreationListener implements DisplayController.DisplayInfoChangeListener { @Override public void onDisplayInfoChanged(Context context, DisplayController.Info info, int flags) { - if ((flags & CHANGE_DENSITY) != 0) { - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, "Display density changed"); + debugTaskbarManager("onDisplayInfoChanged: Display density changed", + context.getDisplayId()); } if ((flags & CHANGE_NAVIGATION_MODE) != 0) { - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, "Navigation mode changed"); + debugTaskbarManager("onDisplayInfoChanged: Navigation mode changed", + context.getDisplayId()); } if ((flags & CHANGE_DESKTOP_MODE) != 0) { - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, "Desktop mode changed"); + debugTaskbarManager("onDisplayInfoChanged: Desktop mode changed", + context.getDisplayId()); } if ((flags & CHANGE_TASKBAR_PINNING) != 0) { - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, "Taskbar pinning changed"); + debugTaskbarManager("onDisplayInfoChanged: Taskbar pinning changed", + context.getDisplayId()); } if ((flags & (CHANGE_DENSITY | CHANGE_NAVIGATION_MODE | CHANGE_DESKTOP_MODE - | CHANGE_TASKBAR_PINNING)) != 0) { - recreateTaskbar(); + | CHANGE_TASKBAR_PINNING | CHANGE_SHOW_LOCKED_TASKBAR)) != 0) { + debugTaskbarManager("onDisplayInfoChanged: Recreating Taskbar!", + context.getDisplayId()); + TaskbarActivityContext taskbarActivityContext = getCurrentActivityContext(); + if ((flags & CHANGE_SHOW_LOCKED_TASKBAR) != 0) { + recreateTaskbars(); + } else if ((flags & CHANGE_DESKTOP_MODE) != 0) { + // Only Handles Special Exit Cases for Desktop Mode Taskbar Recreation. + if (taskbarActivityContext != null + && !DesktopVisibilityController.INSTANCE.get(taskbarActivityContext) + .isInDesktopMode() + && !DisplayController.showLockedTaskbarOnHome(context)) { + recreateTaskbars(); + } + } else { + recreateTaskbars(); + } } } } - private final SettingsCache.OnChangeListener mOnSettingsChangeListener = c -> recreateTaskbar(); + + private final SettingsCache.OnChangeListener mOnSettingsChangeListener = c -> { + debugPrimaryTaskbar("Settings changed! Recreating Taskbar!"); + recreateTaskbars(); + }; + + private final PerceptibleTaskListener mTaskStackListener; + + private class PerceptibleTaskListener implements TaskStackChangeListener { + private ArraySet mPerceptibleTasks = new ArraySet(); + + @Override + public void onTaskMovedToFront(int taskId) { + if (mPerceptibleTasks.contains(taskId)) { + return; + } + + // This listens to any Task, so we filter them by the ones shown in the launcher. + // For Tasks restored after startup, they will by default not be Perceptible, and no + // need to until user interacts with it by bringing it to the foreground. + for (int i = 0; i < mTaskbars.size(); i++) { + // get pinned tasks + Set taskbarPinnedTasks = + mTaskbars.valueAt(i).getControllers().taskbarViewController + .getTaskIdsForPinnedApps(); + + // mark as perceptible if the foregrounded task is in the list of apps shown in + // the launcher. + if (taskbarPinnedTasks.contains(taskId) + && ActivityManagerWrapper.getInstance() + .setTaskIsPerceptible(taskId, true) + ) { + mPerceptibleTasks.add(taskId); + } + } + } + + /** + * Launcher also can display recently launched tasks that are not pinned. Also add + * these as perceptible + */ + @Override + public void onRecentTaskListUpdated() { + for (int i = 0; i < mTaskbars.size(); i++) { + for (GroupTask gTask : mTaskbars.valueAt(i).getControllers() + .taskbarRecentAppsController.getShownTasks()) { + for (Task task : gTask.getTasks()) { + int taskId = task.key.id; + + if (!mPerceptibleTasks.contains(taskId)) { + ActivityManagerWrapper.getInstance() + .setTaskIsPerceptible(taskId, true); + mPerceptibleTasks.add(taskId); + } + } + } + } + } + + @Override + public void onTaskRemoved(int taskId) { + mPerceptibleTasks.remove(taskId); + } + } + + private final DesktopVisibilityController.TaskbarDesktopModeListener + mTaskbarDesktopModeListener = + new DesktopVisibilityController.TaskbarDesktopModeListener() { + @Override + public void onExitDesktopMode(int duration) { + for (int taskbarIndex = 0; taskbarIndex < mTaskbars.size(); taskbarIndex++) { + int displayId = mTaskbars.keyAt(taskbarIndex); + TaskbarActivityContext taskbarActivityContext = getTaskbarForDisplay( + displayId); + if (taskbarActivityContext != null + && !taskbarActivityContext.isInOverview()) { + AnimatorSet animatorSet = taskbarActivityContext.onDestroyAnimation( + TASKBAR_DESTROY_DURATION); + animatorSet.addListener(AnimatorListeners.forEndCallback( + () -> recreateTaskbarForDisplay(getDefaultDisplayId(), + duration))); + animatorSet.start(); + } + } + } + + @Override + public void onEnterDesktopMode(int duration) { + for (int taskbarIndex = 0; taskbarIndex < mTaskbars.size(); taskbarIndex++) { + int displayId = mTaskbars.keyAt(taskbarIndex); + TaskbarActivityContext taskbarActivityContext = getTaskbarForDisplay( + displayId); + AnimatorSet animatorSet = taskbarActivityContext.onDestroyAnimation( + TASKBAR_DESTROY_DURATION); + animatorSet.addListener(AnimatorListeners.forEndCallback( + () -> recreateTaskbarForDisplay(getDefaultDisplayId(), duration))); + animatorSet.start(); + } + } + + @Override + public void onTaskbarCornerRoundingUpdate( + boolean doesAnyTaskRequireTaskbarRounding) { + //NO-OP + } + }; + private boolean mUserUnlocked = false; private final SimpleBroadcastReceiver mTaskbarBroadcastReceiver; + private final SimpleBroadcastReceiver mGrowthBroadcastReceiver; + private final AllAppsActionManager mAllAppsActionManager; private final RecentsDisplayModel mRecentsDisplayModel; @@ -191,23 +340,24 @@ public class TaskbarManager { @Override public void run() { int displayId = getDefaultDisplayId(); + debugTaskbarManager("onActivityDestroyed:", displayId); if (mActivity != null) { displayId = mActivity.getDisplayId(); mActivity.removeOnDeviceProfileChangeListener( mDebugActivityDeviceProfileChanged); - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "unregistering activity lifecycle callbacks from " - + "onActivityDestroyed."); + debugTaskbarManager("onActivityDestroyed: unregistering callbacks", displayId); mActivity.removeEventCallback(EVENT_DESTROYED, this); } if (mActivity == mRecentsViewContainer) { mRecentsViewContainer = null; } mActivity = null; - debugWhyTaskbarNotDestroyed("clearActivity"); TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); if (taskbar != null) { + debugTaskbarManager("onActivityDestroyed: setting taskbarUIController", displayId); taskbar.setUIController(TaskbarUIController.DEFAULT); + } else { + debugTaskbarManager("onActivityDestroyed: taskbar is null!", displayId); } mUnfoldProgressProvider.setSourceProvider(null); } @@ -217,28 +367,27 @@ public class TaskbarManager { new UnfoldTransitionProgressProvider.TransitionProgressListener() { @Override public void onTransitionStarted() { - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "fold/unfold transition started getting called."); + debugPrimaryTaskbar("fold/unfold transition started getting called."); } @Override public void onTransitionProgress(float progress) { - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "fold/unfold transition progress : " + progress); + debugPrimaryTaskbar( + "fold/unfold transition progress getting called. | progress=" + + progress); } @Override public void onTransitionFinishing() { - Log.d(TASKBAR_NOT_DESTROYED_TAG, + debugPrimaryTaskbar( "fold/unfold transition finishing getting called."); } @Override public void onTransitionFinished() { - Log.d(TASKBAR_NOT_DESTROYED_TAG, + debugPrimaryTaskbar( "fold/unfold transition finished getting called."); - } }; @@ -250,27 +399,43 @@ public class TaskbarManager { RecentsDisplayModel recentsDisplayModel) { mBaseContext = context; mAllAppsActionManager = allAppsActionManager; + mNavCallbacks = navCallbacks; mRecentsDisplayModel = recentsDisplayModel; - mPrimaryWindowContext = createWindowContext(getDefaultDisplayId()); - if (enableTaskbarNoRecreate()) { - mPrimaryWindowManager = mPrimaryWindowContext.getSystemService(WindowManager.class); - createTaskbarRootLayout(getDefaultDisplayId()); - } - mDefaultNavButtonController = createDefaultNavButtonController(context, navCallbacks); - mDefaultComponentCallbacks = createDefaultComponentCallbacks(); + + // Set up primary display. + int primaryDisplayId = getDefaultDisplayId(); + debugPrimaryTaskbar("TaskbarManager constructor"); + mPrimaryWindowContext = createWindowContext(primaryDisplayId); + mPrimaryWindowManager = mPrimaryWindowContext.getSystemService(WindowManager.class); + DesktopVisibilityController.INSTANCE.get( + mPrimaryWindowContext).registerTaskbarDesktopModeListener( + mTaskbarDesktopModeListener); + createTaskbarRootLayout(primaryDisplayId); + createNavButtonController(primaryDisplayId); + createAndRegisterComponentCallbacks(primaryDisplayId); + SettingsCache.INSTANCE.get(mPrimaryWindowContext) .register(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener); SettingsCache.INSTANCE.get(mPrimaryWindowContext) .register(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener); - Log.d(TASKBAR_NOT_DESTROYED_TAG, "registering component callbacks from constructor."); - mPrimaryWindowContext.registerComponentCallbacks(mDefaultComponentCallbacks); mShutdownReceiver = new SimpleBroadcastReceiver( mPrimaryWindowContext, UI_HELPER_EXECUTOR, i -> destroyAllTaskbars()); mTaskbarBroadcastReceiver = new SimpleBroadcastReceiver(mPrimaryWindowContext, UI_HELPER_EXECUTOR, this::showTaskbarFromBroadcast); + mShutdownReceiver.register(Intent.ACTION_SHUTDOWN); + if (enableGrowthNudge()) { + // TODO: b/397739323 - Add permission to limit access to Growth Framework. + mGrowthBroadcastReceiver = + new SimpleBroadcastReceiver( + mPrimaryWindowContext, UI_HELPER_EXECUTOR, this::showGrowthNudge); + mGrowthBroadcastReceiver.register(RECEIVER_EXPORTED, + BROADCAST_SHOW_NUDGE); + } else { + mGrowthBroadcastReceiver = null; + } UI_HELPER_EXECUTOR.execute(() -> { mSharedState.taskbarSystemActionPendingIntent = PendingIntent.getBroadcast( mPrimaryWindowContext, @@ -281,107 +446,41 @@ public class TaskbarManager { mTaskbarBroadcastReceiver.register(RECEIVER_NOT_EXPORTED, ACTION_SHOW_TASKBAR); }); - debugWhyTaskbarNotDestroyed("TaskbarManager created"); - recreateTaskbar(); - } - - @NonNull - private TaskbarNavButtonController createDefaultNavButtonController(Context context, - TaskbarNavButtonCallbacks navCallbacks) { - return new TaskbarNavButtonController( - context, - navCallbacks, - SystemUiProxy.INSTANCE.get(mPrimaryWindowContext), - new Handler(), - new ContextualSearchInvoker(mPrimaryWindowContext)); - } - - private ComponentCallbacks createDefaultComponentCallbacks() { - return new ComponentCallbacks() { - private Configuration mOldConfig = - mPrimaryWindowContext.getResources().getConfiguration(); - - @Override - public void onConfigurationChanged(Configuration newConfig) { - Trace.instantForTrack(Trace.TRACE_TAG_APP, "TaskbarManager", - "onConfigurationChanged: " + newConfig); - debugWhyTaskbarNotDestroyed( - "TaskbarManager#mComponentCallbacks.onConfigurationChanged: " + newConfig); - // TODO: adapt this logic to be specific to different displays. - DeviceProfile dp = mUserUnlocked - ? LauncherAppState.getIDP(mPrimaryWindowContext).getDeviceProfile( - mPrimaryWindowContext) - : null; - int configDiff = mOldConfig.diff(newConfig) & ~SKIP_RECREATE_CONFIG_CHANGES; - - if ((configDiff & ActivityInfo.CONFIG_UI_MODE) != 0) { - Log.d(ILLEGAL_ARGUMENT_WM_ADD_VIEW, "onConfigurationChanged: theme changed"); - // Only recreate for theme changes, not other UI mode changes such as docking. - int oldUiNightMode = (mOldConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK); - int newUiNightMode = (newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK); - if (oldUiNightMode == newUiNightMode) { - configDiff &= ~ActivityInfo.CONFIG_UI_MODE; - } - } - - debugWhyTaskbarNotDestroyed("ComponentCallbacks#onConfigurationChanged() " - + "configDiff=" + Configuration.configurationDiffToString(configDiff)); - if (configDiff != 0 || getCurrentActivityContext() == null) { - recreateTaskbar(); - } else { - // Config change might be handled without re-creating the taskbar - if (dp != null && !isTaskbarEnabled(dp)) { - destroyDefaultTaskbar(); - } else { - if (dp != null && isTaskbarEnabled(dp)) { - if (ENABLE_TASKBAR_NAVBAR_UNIFICATION) { - // Re-initialize for screen size change? Should this be done - // by looking at screen-size change flag in configDiff in the - // block above? - recreateTaskbar(); - } else { - getCurrentActivityContext().updateDeviceProfile(dp); - } - } - getCurrentActivityContext().onConfigurationChanged(configDiff); - } - } - mOldConfig = new Configuration(newConfig); - // reset taskbar was pinned value, so we don't automatically unstash taskbar upon - // user unfolding the device. - mSharedState.setTaskbarWasPinned(false); - } - - @Override - public void onLowMemory() { } - }; + if (ActivityManagerWrapper.usePerceptibleTasks(getPrimaryWindowContext())) { + mTaskStackListener = new PerceptibleTaskListener(); + TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackListener); + } else { + mTaskStackListener = null; + } + recreateTaskbars(); + debugPrimaryTaskbar("TaskbarManager created"); } private void destroyAllTaskbars() { + debugPrimaryTaskbar("destroyAllTaskbars"); for (int i = 0; i < mTaskbars.size(); i++) { int displayId = mTaskbars.keyAt(i); + debugTaskbarManager("destroyAllTaskbars: call destroyTaskbarForDisplay", displayId); destroyTaskbarForDisplay(displayId); + + debugTaskbarManager("destroyAllTaskbars: call removeTaskbarRootViewFromWindow", + displayId); removeTaskbarRootViewFromWindow(displayId); } } - private void destroyDefaultTaskbar() { - destroyTaskbarForDisplay(getDefaultDisplayId()); - } - private void destroyTaskbarForDisplay(int displayId) { - Log.d(ILLEGAL_ARGUMENT_WM_ADD_VIEW, "destroyTaskbarForDisplay: " + displayId); + debugTaskbarManager("destroyTaskbarForDisplay", displayId); TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); - debugWhyTaskbarNotDestroyed("destroyTaskbarForDisplay: " + taskbar, displayId); if (taskbar != null) { taskbar.onDestroy(); // remove all defaults that we store removeTaskbarFromMap(displayId); + } else { + debugTaskbarManager("destroyTaskbarForDisplay: taskbar is NULL!", displayId); } - // make this display-specific - DeviceProfile dp = mUserUnlocked ? - LauncherAppState.getIDP(getWindowContext(displayId)).getDeviceProfile( - getWindowContext(displayId)) : null; + + DeviceProfile dp = getDeviceProfile(displayId); if (dp == null || !isTaskbarEnabled(dp)) { removeTaskbarRootViewFromWindow(displayId); } @@ -391,24 +490,35 @@ public class TaskbarManager { * Show Taskbar upon receiving broadcast */ private void showTaskbarFromBroadcast(Intent intent) { + debugPrimaryTaskbar("destroyTaskbarForDisplay"); // TODO: make this code displayId specific TaskbarActivityContext taskbar = getTaskbarForDisplay(getDefaultDisplayId()); - if (ACTION_SHOW_TASKBAR.equals(intent.getAction()) && taskbar != null) { + if (ACTION_SHOW_TASKBAR.equals(intent.getAction())) { taskbar.showTaskbarFromBroadcast(); } } + private void showGrowthNudge(Intent intent) { + if (!enableGrowthNudge()) { + return; + } + if (BROADCAST_SHOW_NUDGE.equals(intent.getAction())) { + // TODO: b/397738606 - extract the details and create a nudge payload. + Log.d(GROWTH_FRAMEWORK_TAG, "Intent received"); + } + } + /** * Toggles All Apps for Taskbar or Launcher depending on the current state. */ - public void toggleAllApps() { + public void toggleAllAppsSearch() { TaskbarActivityContext taskbar = getTaskbarForDisplay(getDefaultDisplayId()); - if (taskbar == null || taskbar.canToggleHomeAllApps()) { + if (taskbar == null) { // Home All Apps should be toggled from this class, because the controllers are not // initialized when Taskbar is disabled (i.e. TaskbarActivityContext is null). - if (mActivity instanceof Launcher l) l.toggleAllAppsSearch(); + if (mActivity instanceof Launcher l) l.toggleAllApps(true); } else { - taskbar.toggleAllAppsSearch(); + taskbar.getControllers().uiController.toggleAllApps(true); } } @@ -427,26 +537,32 @@ public class TaskbarManager { * Called when the user is unlocked */ public void onUserUnlocked() { + debugPrimaryTaskbar("onUserUnlocked"); mUserUnlocked = true; DisplayController.INSTANCE.get(mPrimaryWindowContext).addChangeListener( mRecreationListener); - recreateTaskbar(); - addTaskbarRootViewToWindow(getDefaultDisplayId()); + debugPrimaryTaskbar("onUserUnlocked: recreating all taskbars!"); + recreateTaskbars(); + for (int i = 0; i < mTaskbars.size(); i++) { + int displayId = mTaskbars.keyAt(i); + debugTaskbarManager("onUserUnlocked: addTaskbarRootViewToWindow()", displayId); + addTaskbarRootViewToWindow(displayId); + } } /** * Sets a {@link StatefulActivity} to act as taskbar callback */ public void setActivity(@NonNull StatefulActivity activity) { + debugPrimaryTaskbar("setActivity: mActivity=" + mActivity); if (mActivity == activity) { + debugPrimaryTaskbar("setActivity: No need to set activity!"); return; } removeActivityCallbacksAndListeners(); mActivity = activity; - debugWhyTaskbarNotDestroyed("Set mActivity=" + mActivity); mActivity.addOnDeviceProfileChangeListener(mDebugActivityDeviceProfileChanged); - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "registering activity lifecycle callbacks from setActivity()."); + debugPrimaryTaskbar("setActivity: registering activity lifecycle callbacks."); mActivity.addEventCallback(EVENT_DESTROYED, mActivityOnDestroyCallback); UnfoldTransitionProgressProvider unfoldTransitionProgressProvider = getUnfoldTransitionProgressProviderForActivity(activity); @@ -464,6 +580,7 @@ public class TaskbarManager { * Sets the current RecentsViewContainer, from which we create a TaskbarUIController. */ public void setRecentsViewContainer(@NonNull RecentsViewContainer recentsViewContainer) { + debugPrimaryTaskbar("setRecentsViewContainer"); if (mRecentsViewContainer == recentsViewContainer) { return; } @@ -487,18 +604,20 @@ public class TaskbarManager { */ private UnfoldTransitionProgressProvider getUnfoldTransitionProgressProviderForActivity( StatefulActivity activity) { + debugPrimaryTaskbar("getUnfoldTransitionProgressProviderForActivity"); if (!enableUnfoldStateAnimation()) { if (activity instanceof QuickstepLauncher ql) { return ql.getUnfoldTransitionProgressProvider(); } } else { - return SystemUiProxy.INSTANCE.get(mPrimaryWindowContext).getUnfoldTransitionProvider(); + return SystemUiProxy.INSTANCE.get(mBaseContext).getUnfoldTransitionProvider(); } return null; } /** Creates a {@link TaskbarUIController} to use with non default displays. */ private TaskbarUIController createTaskbarUIControllerForNonDefaultDisplay(int displayId) { + debugPrimaryTaskbar("createTaskbarUIControllerForNonDefaultDisplay"); if (RecentsDisplayModel.enableOverviewInWindow()) { RecentsViewContainer rvc = mRecentsDisplayModel.getRecentsWindowManager(displayId); if (rvc != null) { @@ -514,6 +633,7 @@ public class TaskbarManager { */ private TaskbarUIController createTaskbarUIControllerForRecentsViewContainer( RecentsViewContainer container) { + debugPrimaryTaskbar("createTaskbarUIControllerForRecentsViewContainer"); if (container instanceof QuickstepLauncher quickstepLauncher) { return new LauncherTaskbarUIController(quickstepLauncher); } @@ -530,13 +650,24 @@ public class TaskbarManager { /** * This method is called multiple times (ex. initial init, then when user unlocks) in which case - * we fully want to destroy the existing default display's taskbar and create a new one. + * we fully want to destroy existing taskbars and create all desired new ones. * In other case (folding/unfolding) we don't need to remove and add window. */ @VisibleForTesting - public synchronized void recreateTaskbar() { - // TODO: make this recreate all taskbars in map. - recreateTaskbarForDisplay(getDefaultDisplayId()); + public synchronized void recreateTaskbars() { + debugPrimaryTaskbar("recreateTaskbars"); + // Handles initial creation case. + if (mTaskbars.size() == 0) { + debugTaskbarManager("recreateTaskbars: create primary taskbar", getDefaultDisplayId()); + recreateTaskbarForDisplay(getDefaultDisplayId(), 0); + return; + } + + for (int i = 0; i < mTaskbars.size(); i++) { + int displayId = mTaskbars.keyAt(i); + debugTaskbarManager("recreateTaskbars: create external taskbar", displayId); + recreateTaskbarForDisplay(displayId, 0); + } } /** @@ -544,48 +675,62 @@ public class TaskbarManager { * we fully want to destroy an existing taskbar for a specified display and create a new one. * In other case (folding/unfolding) we don't need to remove and add window. */ - private void recreateTaskbarForDisplay(int displayId) { - Trace.beginSection("recreateTaskbar"); + private void recreateTaskbarForDisplay(int displayId, int duration) { + debugTaskbarManager("recreateTaskbarForDisplay: ", displayId); + Trace.beginSection("recreateTaskbarForDisplay"); try { - Log.d(ILLEGAL_ARGUMENT_WM_ADD_VIEW, "recreateTaskbarForDisplay: " + displayId); - // TODO: make this code display specific - DeviceProfile dp = mUserUnlocked ? - LauncherAppState.getIDP(getWindowContext(displayId)).getDeviceProfile( - getWindowContext(displayId)) : null; + debugTaskbarManager("recreateTaskbarForDisplay: getting device profile", displayId); + // TODO (b/381113004): make this display-specific via getWindowContext() + DeviceProfile dp = getDeviceProfile(displayId); // All Apps action is unrelated to navbar unification, so we only need to check DP. final boolean isLargeScreenTaskbar = dp != null && dp.isTaskbarPresent; mAllAppsActionManager.setTaskbarPresent(isLargeScreenTaskbar); - + debugTaskbarManager("recreateTaskbarForDisplay: destroying taskbar", displayId); destroyTaskbarForDisplay(displayId); + boolean displayExists = getDisplay(displayId) != null; boolean isTaskbarEnabled = dp != null && isTaskbarEnabled(dp); - debugWhyTaskbarNotDestroyed("recreateTaskbar: isTaskbarEnabled=" + isTaskbarEnabled - + " [dp != null (i.e. mUserUnlocked)]=" + (dp != null) - + " FLAG_HIDE_NAVBAR_WINDOW=" + ENABLE_TASKBAR_NAVBAR_UNIFICATION - + " dp.isTaskbarPresent=" + (dp == null ? "null" : dp.isTaskbarPresent)); - if (!isTaskbarEnabled || !isLargeScreenTaskbar) { - SystemUiProxy.INSTANCE.get(mPrimaryWindowContext) - .notifyTaskbarStatus(/* visible */ false, /* stashed */ false); - if (!isTaskbarEnabled) { + debugTaskbarManager("recreateTaskbarForDisplay: isTaskbarEnabled=" + isTaskbarEnabled + + " [dp != null (i.e. mUserUnlocked)]=" + (dp != null) + + " FLAG_HIDE_NAVBAR_WINDOW=" + ENABLE_TASKBAR_NAVBAR_UNIFICATION + + " dp.isTaskbarPresent=" + (dp == null ? "null" : dp.isTaskbarPresent) + + " displayExists=" + displayExists, displayId); + if (!isTaskbarEnabled || !isLargeScreenTaskbar || !displayExists) { + SystemUiProxy.INSTANCE.get(mBaseContext) + .notifyTaskbarStatus(/* visible */ false, /* stashed */ false); + if (!isTaskbarEnabled || !displayExists) { + debugTaskbarManager( + "recreateTaskbarForDisplay: exiting bc (!isTaskbarEnabled || " + + "!displayExists)", + displayId); return; } } TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); if (enableTaskbarNoRecreate() || taskbar == null) { + debugTaskbarManager("recreateTaskbarForDisplay: creating taskbar", displayId); taskbar = createTaskbarActivityContext(dp, displayId); + if (taskbar == null) { + debugTaskbarManager( + "recreateTaskbarForDisplay: new taskbar instance is null!", displayId); + return; + } } else { + debugTaskbarManager("recreateTaskbarForDisplay: updating taskbar device profile", + displayId); taskbar.updateDeviceProfile(dp); } mSharedState.startTaskbarVariantIsTransient = DisplayController.isTransientTaskbar(taskbar); mSharedState.allAppsVisible = mSharedState.allAppsVisible && isLargeScreenTaskbar; - taskbar.init(mSharedState); + taskbar.init(mSharedState, duration); // Non default displays should not use LauncherTaskbarUIController as they shouldn't // have access to the Launcher activity. - if (enableTaskbarConnectedDisplays() && !isDefaultDisplay(displayId)) { + if (!isDefaultDisplay(displayId) + && DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue()) { taskbar.setUIController(createTaskbarUIControllerForNonDefaultDisplay(displayId)); } else if (mRecentsViewContainer != null) { taskbar.setUIController( @@ -593,15 +738,17 @@ public class TaskbarManager { } if (enableTaskbarNoRecreate()) { + debugTaskbarManager("recreateTaskbarForDisplay: adding rootView", displayId); addTaskbarRootViewToWindow(displayId); FrameLayout taskbarRootLayout = getTaskbarRootLayoutForDisplay(displayId); if (taskbarRootLayout != null) { + debugTaskbarManager("recreateTaskbarForDisplay: adding root layout", displayId); taskbarRootLayout.removeAllViews(); taskbarRootLayout.addView(taskbar.getDragLayer()); taskbar.notifyUpdateLayoutParams(); } else { - Log.e(NULL_TASKBAR_ROOT_LAYOUT_TAG, - "taskbarRootLayout is null for displayId=" + displayId); + debugTaskbarManager("recreateTaskbarForDisplay: taskbarRootLayout is null!", + displayId); } } } finally { @@ -609,21 +756,22 @@ public class TaskbarManager { } } - public void onSystemUiFlagsChanged(@SystemUiStateFlags long systemUiStateFlags) { + /** Called when the SysUI flags for a given display change. */ + public void onSystemUiFlagsChanged(@SystemUiStateFlags long systemUiStateFlags, int displayId) { if (DEBUG) { Log.d(TAG, "SysUI flags changed: " + formatFlagChange(systemUiStateFlags, mSharedState.sysuiStateFlags, QuickStepContract::getSystemUiStateString)); } mSharedState.sysuiStateFlags = systemUiStateFlags; - TaskbarActivityContext taskbar = getTaskbarForDisplay(getDefaultDisplayId()); + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); if (taskbar != null) { taskbar.updateSysuiStateFlags(systemUiStateFlags, false /* fromInit */); } } public void onLongPressHomeEnabled(boolean assistantLongPressEnabled) { - if (mDefaultNavButtonController != null) { - mDefaultNavButtonController.setAssistantLongPressEnabled(assistantLongPressEnabled); + if (mPrimaryNavButtonController != null) { + mPrimaryNavButtonController.setAssistantLongPressEnabled(assistantLongPressEnabled); } } @@ -672,7 +820,7 @@ public class TaskbarManager { } public void transitionTo(int displayId, @BarTransitions.TransitionMode int barMode, - boolean animate) { + boolean animate) { TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); if (taskbar != null) { taskbar.transitionTo(barMode, animate); @@ -746,14 +894,62 @@ public class TaskbarManager { * primary device or a previously mirroring display is switched to extended mode. */ public void onDisplayAddSystemDecorations(int displayId) { - if (isDefaultDisplay(displayId) || !enableTaskbarConnectedDisplays()) { + debugTaskbarManager("onDisplayAddSystemDecorations: ", displayId); + Display display = getDisplay(displayId); + if (display == null) { + debugTaskbarManager("onDisplayAddSystemDecorations: can't find display!", displayId); return; } + if (!DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue() || isDefaultDisplay( + displayId)) { + debugTaskbarManager( + "onDisplayAddSystemDecorations: not an external display! | " + + "ENABLE_TASKBAR_CONNECTED_DISPLAYS=" + + DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue() + + " isDefaultDisplay=" + isDefaultDisplay(displayId), displayId); + return; + } + debugTaskbarManager("onDisplayAddSystemDecorations: creating new windowContext!", + displayId); Context newWindowContext = createWindowContext(displayId); if (newWindowContext != null) { + debugTaskbarManager("onDisplayAddSystemDecorations: add new windowContext to map!", + displayId); addWindowContextToMap(displayId, newWindowContext); + WindowManager wm = getWindowManager(displayId); + if (wm == null || !wm.shouldShowSystemDecors(displayId)) { + String wmStatus = wm == null ? "WindowManager is null!" : "WindowManager exists"; + boolean showDecor = wm != null && wm.shouldShowSystemDecors(displayId); + debugTaskbarManager( + "onDisplayAddSystemDecorations:\n\t" + wmStatus + "\n\tshowSystemDecors=" + + showDecor, displayId); + return; + } + debugTaskbarManager("onDisplayAddSystemDecorations: creating RootLayout!", displayId); + + createExternalDeviceProfile(displayId); + + debugTaskbarManager("onDisplayAddSystemDecorations: creating RootLayout!", displayId); + createTaskbarRootLayout(displayId); + + debugTaskbarManager("onDisplayAddSystemDecorations: creating NavButtonController!", + displayId); + createNavButtonController(displayId); + + debugTaskbarManager( + "onDisplayAddSystemDecorations: createAndRegisterComponentCallbacks!", + displayId); + createAndRegisterComponentCallbacks(displayId); + debugTaskbarManager("onDisplayAddSystemDecorations: recreateTaskbarForDisplay!", + displayId); + recreateTaskbarForDisplay(displayId, 0); + } else { + debugTaskbarManager("onDisplayAddSystemDecorations: newWindowContext is NULL!", + displayId); } + + debugTaskbarManager("onDisplayAddSystemDecorations: finished!", displayId); } /** @@ -761,27 +957,54 @@ public class TaskbarManager { * removed from the primary device. */ public void onDisplayRemoved(int displayId) { - if (isDefaultDisplay(displayId) || !enableTaskbarConnectedDisplays()) { + debugTaskbarManager("onDisplayRemoved: ", displayId); + if (!DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue() || isDefaultDisplay( + displayId)) { + debugTaskbarManager( + "onDisplayRemoved: not an external display! | " + + "ENABLE_TASKBAR_CONNECTED_DISPLAYS=" + + DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue() + + " isDefaultDisplay=" + isDefaultDisplay(displayId), displayId); return; } Context windowContext = getWindowContext(displayId); if (windowContext != null) { + debugTaskbarManager("onDisplayRemoved: removing NavButtonController!", displayId); + removeNavButtonController(displayId); + + debugTaskbarManager("onDisplayRemoved: removeAndUnregisterComponentCallbacks!", + displayId); + removeAndUnregisterComponentCallbacks(displayId); + + debugTaskbarManager("onDisplayRemoved: destroying Taskbar!", displayId); + destroyTaskbarForDisplay(displayId); + + debugTaskbarManager("onDisplayRemoved: removing DeviceProfile from map!", displayId); + removeDeviceProfileFromMap(displayId); + + debugTaskbarManager("onDisplayRemoved: removing WindowContext from map!", displayId); removeWindowContextFromMap(displayId); + + debugTaskbarManager("onDisplayRemoved: finished!", displayId); + } else { + debugTaskbarManager("onDisplayRemoved: removing NavButtonController!", displayId); } } /** * Signal from SysUI indicating that system decorations should be removed from the display. */ - public void onDisplayRemoveSystemDecorations(int displayId) {} + public void onDisplayRemoveSystemDecorations(int displayId) { + // The display mirroring starts. The handling logic is the same as when removing a + // display. + onDisplayRemoved(displayId); + } private void removeActivityCallbacksAndListeners() { if (mActivity != null) { mActivity.removeOnDeviceProfileChangeListener(mDebugActivityDeviceProfileChanged); - Log.d(TASKBAR_NOT_DESTROYED_TAG, - "unregistering activity lifecycle callbacks from " - + "removeActivityCallbackAndListeners()."); + debugPrimaryTaskbar("unregistering activity lifecycle callbacks"); mActivity.removeEventCallback(EVENT_DESTROYED, mActivityOnDestroyCallback); UnfoldTransitionProgressProvider unfoldTransitionProgressProvider = getUnfoldTransitionProgressProviderForActivity(mActivity); @@ -795,10 +1018,17 @@ public class TaskbarManager { * Called when the manager is no longer needed */ public void destroy() { + debugPrimaryTaskbar("TaskbarManager#destroy()"); mRecentsViewContainer = null; - debugWhyTaskbarNotDestroyed("TaskbarManager#destroy()"); + debugPrimaryTaskbar("destroy: removing activity callbacks"); + DesktopVisibilityController.INSTANCE.get( + mPrimaryWindowContext).unregisterTaskbarDesktopModeListener( + mTaskbarDesktopModeListener); removeActivityCallbacksAndListeners(); mTaskbarBroadcastReceiver.unregisterReceiverSafely(); + if (mGrowthBroadcastReceiver != null) { + mGrowthBroadcastReceiver.unregisterReceiverSafely(); + } if (mUserUnlocked) { DisplayController.INSTANCE.get(mPrimaryWindowContext).removeChangeListener( @@ -808,10 +1038,18 @@ public class TaskbarManager { .unregister(USER_SETUP_COMPLETE_URI, mOnSettingsChangeListener); SettingsCache.INSTANCE.get(mPrimaryWindowContext) .unregister(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener); - Log.d(TASKBAR_NOT_DESTROYED_TAG, "unregistering component callbacks from destroy()."); - mPrimaryWindowContext.unregisterComponentCallbacks(mDefaultComponentCallbacks); + debugPrimaryTaskbar("destroy: unregistering component callbacks"); + removeAndUnregisterComponentCallbacks(getDefaultDisplayId()); mShutdownReceiver.unregisterReceiverSafely(); + if (ActivityManagerWrapper.usePerceptibleTasks(getPrimaryWindowContext())) { + for (Integer taskId : mTaskStackListener.mPerceptibleTasks) { + ActivityManagerWrapper.getInstance().setTaskIsPerceptible(taskId, false); + } + } + TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener); + debugPrimaryTaskbar("destroy: destroying all taskbars!"); destroyAllTaskbars(); + debugPrimaryTaskbar("destroy: finished!"); } public @Nullable TaskbarActivityContext getCurrentActivityContext() { @@ -834,40 +1072,53 @@ public class TaskbarManager { } private void addTaskbarRootViewToWindow(int displayId) { + debugTaskbarManager("addTaskbarRootViewToWindow:", displayId); TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); if (!enableTaskbarNoRecreate() || taskbar == null) { - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, - "addTaskbarRootViewToWindow - taskbar null | displayId=" + displayId); + debugTaskbarManager("addTaskbarRootViewToWindow: taskbar null", displayId); + return; + } + + if (getDisplay(displayId) == null) { + debugTaskbarManager("addTaskbarRootViewToWindow: display null", displayId); return; } if (!isTaskbarRootLayoutAddedForDisplay(displayId)) { FrameLayout rootLayout = getTaskbarRootLayoutForDisplay(displayId); - if (rootLayout != null) { - getWindowManager(displayId).addView(rootLayout, taskbar.getWindowLayoutParams()); + WindowManager windowManager = getWindowManager(displayId); + if (rootLayout != null && windowManager != null) { + windowManager.addView(rootLayout, taskbar.getWindowLayoutParams()); mAddedRootLayouts.put(displayId, true); } else { - Log.d(ILLEGAL_ARGUMENT_WM_ADD_VIEW, - "addTaskbarRootViewToWindow - root layout null | displayId=" + displayId); + String rootLayoutStatus = + (rootLayout == null) ? "rootLayout is NULL!" : "rootLayout exists!"; + String wmStatus = (windowManager == null) ? "windowManager is NULL!" + : "windowManager exists!"; + debugTaskbarManager( + "addTaskbarRootViewToWindow: \n\t" + rootLayoutStatus + "\n\t" + wmStatus, + displayId); } } else { - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, - "addTaskbarRootViewToWindow - root layout already added | displayId=" - + displayId); + debugTaskbarManager("addTaskbarRootViewToWindow: rootLayout already added!", displayId); } } private void removeTaskbarRootViewFromWindow(int displayId) { - Log.d(ILLEGAL_ARGUMENT_WM_ADD_VIEW, "removeTaskbarRootViewFromWindow: " + displayId); + debugTaskbarManager("removeTaskbarRootViewFromWindow", displayId); FrameLayout rootLayout = getTaskbarRootLayoutForDisplay(displayId); if (!enableTaskbarNoRecreate() || rootLayout == null) { return; } - if (isTaskbarRootLayoutAddedForDisplay(displayId)) { - getWindowManager(displayId).removeViewImmediate(rootLayout); + WindowManager windowManager = getWindowManager(displayId); + if (isTaskbarRootLayoutAddedForDisplay(displayId) && windowManager != null) { + windowManager.removeViewImmediate(rootLayout); mAddedRootLayouts.put(displayId, false); removeTaskbarRootLayoutFromMap(displayId); + } else { + debugTaskbarManager("removeTaskbarRootViewFromWindow: WindowManager is null", + displayId); } } @@ -877,7 +1128,7 @@ public class TaskbarManager { * * @param displayId The ID of the display to retrieve the taskbar for. * @return The {@link TaskbarUIController} for the specified display, or - * {@code null} if no taskbar is associated with that display. + * {@code null} if no taskbar is associated with that display. */ @Nullable public TaskbarUIController getUIControllerForDisplay(int displayId) { @@ -904,7 +1155,7 @@ public class TaskbarManager { * * @param displayId The ID of the display to retrieve the taskbar for. * @return The {@link TaskbarActivityContext} for the specified display, or - * {@code null} if no taskbar is associated with that display. + * {@code null} if no taskbar is associated with that display. */ private TaskbarActivityContext getTaskbarForDisplay(int displayId) { return mTaskbars.get(displayId); @@ -913,28 +1164,236 @@ public class TaskbarManager { /** * Creates a {@link TaskbarActivityContext} for the given display and adds it to the map. + * + * @param dp The {@link DeviceProfile} for the display. + * @param displayId The ID of the display. */ - private TaskbarActivityContext createTaskbarActivityContext(DeviceProfile dp, int displayId) { - Display display = mBaseContext.getSystemService(DisplayManager.class).getDisplay( - displayId); - Context navigationBarPanelContext = ENABLE_TASKBAR_NAVBAR_UNIFICATION - ? mBaseContext.createWindowContext(display, TYPE_NAVIGATION_BAR_PANEL, null) - : null; + private @Nullable TaskbarActivityContext createTaskbarActivityContext(DeviceProfile dp, + int displayId) { + Display display = getDisplay(displayId); + if (display == null) { + debugTaskbarManager("createTaskbarActivityContext: display null", displayId); + return null; + } + + Context navigationBarPanelContext = null; + if (ENABLE_TASKBAR_NAVBAR_UNIFICATION) { + navigationBarPanelContext = mBaseContext.createWindowContext(display, + TYPE_NAVIGATION_BAR_PANEL, null); + } + + boolean isPrimaryDisplay = isDefaultDisplay(displayId) + || !DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue(); TaskbarActivityContext newTaskbar = new TaskbarActivityContext(getWindowContext(displayId), - navigationBarPanelContext, dp, mDefaultNavButtonController, - mUnfoldProgressProvider, isDefaultDisplay(displayId), - SystemUiProxy.INSTANCE.get(mPrimaryWindowContext)); + navigationBarPanelContext, dp, getNavButtonController(displayId), + mUnfoldProgressProvider, isPrimaryDisplay, + SystemUiProxy.INSTANCE.get(mBaseContext)); addTaskbarToMap(displayId, newTaskbar); return newTaskbar; } + /** + * Creates a {@link DeviceProfile} for the given display and adds it to the map. + * @param displayId The ID of the display. + */ + private void createExternalDeviceProfile(int displayId) { + if (!mUserUnlocked) { + return; + } + + InvariantDeviceProfile idp = LauncherAppState.getIDP(mPrimaryWindowContext); + if (idp == null) { + return; + } + + Context displayContext = getWindowContext(displayId); + if (displayContext == null) { + return; + } + + DeviceProfile externalDeviceProfile = idp.createDeviceProfileForSecondaryDisplay( + displayContext); + mExternalDeviceProfiles.put(displayId, externalDeviceProfile); + } + + /** + * Gets a {@link DeviceProfile} for the given displayId. + * @param displayId The ID of the display. + */ + private @Nullable DeviceProfile getDeviceProfile(int displayId) { + if (!mUserUnlocked) { + return null; + } + + InvariantDeviceProfile idp = LauncherAppState.getIDP(mPrimaryWindowContext); + if (idp == null) { + return null; + } + + boolean isPrimary = isDefaultDisplay(displayId) + || !DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue(); + if (isPrimary) { + return idp.getDeviceProfile(mPrimaryWindowContext); + } + + return mExternalDeviceProfiles.get(displayId); + } + + /** + * Removes the {@link DeviceProfile} associated with the given display ID from the map. + * @param displayId The ID of the display for which to remove the taskbar. + */ + private void removeDeviceProfileFromMap(int displayId) { + mExternalDeviceProfiles.delete(displayId); + } + + /** + * Create {@link ComponentCallbacks} for the given display and register it to the relevant + * WindowContext. For external displays, populate maps. + * + * @param displayId The ID of the display. + */ + private void createAndRegisterComponentCallbacks(int displayId) { + debugTaskbarManager("createAndRegisterComponentCallbacks", displayId); + ComponentCallbacks callbacks = new ComponentCallbacks() { + private Configuration mOldConfig = + getWindowContext(displayId).getResources().getConfiguration(); + + @Override + public void onConfigurationChanged(Configuration newConfig) { + Trace.instantForTrack(Trace.TRACE_TAG_APP, "TaskbarManager", + "onConfigurationChanged: " + newConfig); + debugTaskbarManager("onConfigurationChanged: " + newConfig, displayId); + + DeviceProfile dp = getDeviceProfile(displayId); + int configDiff = mOldConfig.diff(newConfig) & ~SKIP_RECREATE_CONFIG_CHANGES; + + if ((configDiff & ActivityInfo.CONFIG_UI_MODE) != 0) { + debugTaskbarManager("onConfigurationChanged: theme changed", displayId); + // Only recreate for theme changes, not other UI mode changes such as docking. + int oldUiNightMode = (mOldConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK); + int newUiNightMode = (newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK); + if (oldUiNightMode == newUiNightMode) { + configDiff &= ~ActivityInfo.CONFIG_UI_MODE; + } + } + + debugTaskbarManager("onConfigurationChanged: | configDiff=" + + Configuration.configurationDiffToString(configDiff), displayId); + if (configDiff != 0 || getCurrentActivityContext() == null) { + debugTaskbarManager("onConfigurationChanged: call recreateTaskbars", displayId); + recreateTaskbars(); + } else if (dp != null) { + // Config change might be handled without re-creating the taskbar + if (!isTaskbarEnabled(dp)) { + debugPrimaryTaskbar( + "onConfigurationChanged: isTaskbarEnabled(dp)=False | " + + "destroyTaskbarForDisplay"); + destroyTaskbarForDisplay(getDefaultDisplayId()); + } else { + debugPrimaryTaskbar("onConfigurationChanged: isTaskbarEnabled(dp)=True"); + if (ENABLE_TASKBAR_NAVBAR_UNIFICATION) { + // Re-initialize for screen size change? Should this be done + // by looking at screen-size change flag in configDiff in the + // block above? + debugPrimaryTaskbar("onConfigurationChanged: call recreateTaskbars"); + recreateTaskbars(); + } else { + debugPrimaryTaskbar( + "onConfigurationChanged: updateDeviceProfile for current " + + "taskbar."); + getCurrentActivityContext().updateDeviceProfile(dp); + } + } + } else { + + getCurrentActivityContext().onConfigurationChanged(configDiff); + } + mOldConfig = new Configuration(newConfig); + // reset taskbar was pinned value, so we don't automatically unstash taskbar upon + // user unfolding the device. + mSharedState.setTaskbarWasPinned(false); + } + + @Override + public void onLowMemory() { + } + }; + if (isDefaultDisplay(displayId) + || !DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue()) { + mPrimaryComponentCallbacks = callbacks; + mPrimaryWindowContext.registerComponentCallbacks(callbacks); + } else { + mComponentCallbacks.put(displayId, callbacks); + getWindowContext(displayId).registerComponentCallbacks(callbacks); + } + } + + /** + * Unregister {@link ComponentCallbacks} for the given display from its WindowContext. For + * external displays, remove from the map. + * + * @param displayId The ID of the display. + */ + private void removeAndUnregisterComponentCallbacks(int displayId) { + if (isDefaultDisplay(displayId) + || !DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue()) { + mPrimaryWindowContext.unregisterComponentCallbacks(mPrimaryComponentCallbacks); + } else { + ComponentCallbacks callbacks = mComponentCallbacks.get(displayId); + getWindowContext(displayId).unregisterComponentCallbacks(callbacks); + mComponentCallbacks.delete(displayId); + } + } + + /** + * Creates a {@link TaskbarNavButtonController} for the given display and adds it to the map + * if it doesn't already exist. + * + * @param displayId The ID of the display + */ + private void createNavButtonController(int displayId) { + if (isDefaultDisplay(displayId) + || !DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue()) { + mPrimaryNavButtonController = new TaskbarNavButtonController( + mPrimaryWindowContext, + mNavCallbacks, + SystemUiProxy.INSTANCE.get(mBaseContext), + new Handler(), + new ContextualSearchInvoker(mBaseContext)); + } else { + TaskbarNavButtonController navButtonController = new TaskbarNavButtonController( + getWindowContext(displayId), + mNavCallbacks, + SystemUiProxy.INSTANCE.get(mBaseContext), + new Handler(), + new ContextualSearchInvoker(mBaseContext)); + mNavButtonControllers.put(displayId, navButtonController); + } + } + + private TaskbarNavButtonController getNavButtonController(int displayId) { + return (isDefaultDisplay(displayId) + || !DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue()) + ? mPrimaryNavButtonController : mNavButtonControllers.get(displayId); + } + + private void removeNavButtonController(int displayId) { + if (isDefaultDisplay(displayId) + || !DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue()) { + mPrimaryNavButtonController = null; + } else { + mNavButtonControllers.delete(displayId); + } + } + /** * Adds the {@link TaskbarActivityContext} associated with the given display ID to taskbar * map if there is not already a taskbar mapped to that displayId. * - * @param displayId The ID of the display to retrieve the taskbar for. + * @param displayId The ID of the display to retrieve the taskbar for. * @param newTaskbar The new {@link TaskbarActivityContext} to add to the map. */ private void addTaskbarToMap(int displayId, TaskbarActivityContext newTaskbar) { @@ -954,24 +1413,31 @@ public class TaskbarManager { /** * Creates {@link FrameLayout} for the taskbar on the specified display and adds it to map. + * * @param displayId The ID of the display for which to create the taskbar root layout. */ private void createTaskbarRootLayout(int displayId) { - Log.d(ILLEGAL_ARGUMENT_WM_ADD_VIEW, "createTaskbarRootLayout: " + displayId); + debugTaskbarManager("createTaskbarRootLayout: ", displayId); + if (!enableTaskbarNoRecreate()) { + return; + } + FrameLayout newTaskbarRootLayout = new FrameLayout(getWindowContext(displayId)) { @Override public boolean dispatchTouchEvent(MotionEvent ev) { + debugTaskbarManager("dispatchTouchEvent: ", displayId); // The motion events can be outside the view bounds of task bar, and hence // manually dispatching them to the drag layer here. - TaskbarActivityContext taskbar = getTaskbarForDisplay(getDefaultDisplayId()); + TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); if (taskbar != null && taskbar.getDragLayer().isAttachedToWindow()) { return taskbar.getDragLayer().dispatchTouchEvent(ev); } return super.dispatchTouchEvent(ev); } }; + + debugTaskbarManager("createTaskbarRootLayout: adding to map", displayId); addTaskbarRootLayoutToMap(displayId, newTaskbarRootLayout); - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, "created new root layout - displayId=" + displayId); } private boolean isDefaultDisplay(int displayId) { @@ -985,13 +1451,12 @@ public class TaskbarManager { * @return The taskbar root layout {@link FrameLayout} for a given display or {@code null}. */ private FrameLayout getTaskbarRootLayoutForDisplay(int displayId) { - Log.d(ILLEGAL_ARGUMENT_WM_ADD_VIEW, "getTaskbarRootLayoutForDisplay: " + displayId); + debugTaskbarManager("getTaskbarRootLayoutForDisplay:", displayId); FrameLayout frameLayout = mRootLayouts.get(displayId); if (frameLayout != null) { return frameLayout; } else { - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, - "getTaskbarRootLayoutForDisplay == null | displayId=" + displayId); + debugTaskbarManager("getTaskbarRootLayoutForDisplay: rootLayout is null!", displayId); return null; } } @@ -999,15 +1464,18 @@ public class TaskbarManager { /** * Adds the taskbar root layout {@link FrameLayout} to taskbar map, mapped to display ID. * - * @param displayId The ID of the display to associate with the taskbar root layout. + * @param displayId The ID of the display to associate with the taskbar root layout. * @param rootLayout The taskbar root layout {@link FrameLayout} to add to the map. */ private void addTaskbarRootLayoutToMap(int displayId, FrameLayout rootLayout) { + debugTaskbarManager("addTaskbarRootLayoutToMap: ", displayId); if (!mRootLayouts.contains(displayId) && rootLayout != null) { mRootLayouts.put(displayId, rootLayout); } - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, "mRootLayouts.size()=" + mRootLayouts.size()); + debugTaskbarManager( + "addTaskbarRootLayoutToMap: finished! mRootLayouts.size()=" + mRootLayouts.size(), + displayId); } /** @@ -1016,26 +1484,26 @@ public class TaskbarManager { * @param displayId The ID of the display for which to remove the taskbar root layout. */ private void removeTaskbarRootLayoutFromMap(int displayId) { + debugTaskbarManager("removeTaskbarRootLayoutFromMap:", displayId); if (mRootLayouts.contains(displayId)) { mAddedRootLayouts.delete(displayId); mRootLayouts.delete(displayId); } - Log.d(NULL_TASKBAR_ROOT_LAYOUT_TAG, "mRootLayouts.size()=" + mRootLayouts.size()); + debugTaskbarManager("removeTaskbarRootLayoutFromMap: finished! mRootLayouts.size=" + + mRootLayouts.size(), displayId); } /** * Creates {@link Context} for the taskbar on the specified display. + * * @param displayId The ID of the display for which to create the window context. */ private @Nullable Context createWindowContext(int displayId) { - DisplayManager displayManager = mBaseContext.getSystemService(DisplayManager.class); - if (displayManager == null) { - return null; - } - - Display display = displayManager.getDisplay(displayId); + debugTaskbarManager("createWindowContext: ", displayId); + Display display = getDisplay(displayId); if (display == null) { + debugTaskbarManager("createWindowContext: display null!", displayId); return null; } @@ -1043,10 +1511,29 @@ public class TaskbarManager { if (ENABLE_TASKBAR_NAVBAR_UNIFICATION && isDefaultDisplay(displayId)) { windowType = TYPE_NAVIGATION_BAR; } + debugTaskbarManager( + "createWindowContext: windowType=" + ((windowType == TYPE_NAVIGATION_BAR) + ? "TYPE_NAVIGATION_BAR" : "TYPE_NAVIGATION_BAR_PANEL"), displayId); return mBaseContext.createWindowContext(display, windowType, null); } + private @Nullable Display getDisplay(int displayId) { + DisplayManager displayManager = mBaseContext.getSystemService(DisplayManager.class); + if (displayManager == null) { + debugTaskbarManager("cannot get DisplayManager", displayId); + return null; + } + + Display display = displayManager.getDisplay(displayId); + if (display == null) { + debugTaskbarManager("Cannot get display!", displayId); + return null; + } + + return displayManager.getDisplay(displayId); + } + /** * Retrieves the window context of the taskbar for the specified display. * @@ -1054,7 +1541,8 @@ public class TaskbarManager { * @return The Window Context {@link Context} for a given display or {@code null}. */ private Context getWindowContext(int displayId) { - return (isDefaultDisplay(displayId) || !enableTaskbarConnectedDisplays()) + return (isDefaultDisplay(displayId) + || !DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue()) ? mPrimaryWindowContext : mWindowContexts.get(displayId); } @@ -1070,12 +1558,15 @@ public class TaskbarManager { * @return The window manager {@link WindowManager} for a given display or {@code null}. */ private @Nullable WindowManager getWindowManager(int displayId) { - if (isDefaultDisplay(displayId) || !enableTaskbarConnectedDisplays()) { + if (isDefaultDisplay(displayId) + || !DesktopExperienceFlags.ENABLE_TASKBAR_CONNECTED_DISPLAYS.isTrue()) { + debugTaskbarManager("cannot get mPrimaryWindowManager", displayId); return mPrimaryWindowManager; } Context externalDisplayContext = getWindowContext(displayId); if (externalDisplayContext == null) { + debugTaskbarManager("cannot get externalDisplayContext", displayId); return null; } @@ -1085,7 +1576,7 @@ public class TaskbarManager { /** * Adds the window context {@link Context} to taskbar map, mapped to display ID. * - * @param displayId The ID of the display to associate with the taskbar root layout. + * @param displayId The ID of the display to associate with the taskbar root layout. * @param windowContext The window context {@link Context} to add to the map. */ private void addWindowContextToMap(int displayId, @NonNull Context windowContext) { @@ -1109,29 +1600,73 @@ public class TaskbarManager { return mBaseContext.getDisplayId(); } - /** Temp logs for b/254119092. */ - public void debugWhyTaskbarNotDestroyed(String debugReason) { - debugWhyTaskbarNotDestroyed(debugReason, getDefaultDisplayId()); + /** + * Logs debug information about the TaskbarManager for primary display. + * @param debugReason A string describing the reason for the debug log. + * @param displayId The ID of the display for which to log debug information. + */ + public void debugTaskbarManager(String debugReason, int displayId) { + StringJoiner log = new StringJoiner("\n"); + log.add(debugReason + " displayId=" + displayId + " isDefaultDisplay=" + isDefaultDisplay( + displayId)); + Log.d(TAG, log.toString()); } - /** Temp logs for b/254119092. */ - public void debugWhyTaskbarNotDestroyed(String debugReason, int displayId) { + /** + * Logs verbose debug information about the TaskbarManager for primary display. + * @param debugReason A string describing the reason for the debug log. + * @param displayId The ID of the display for which to log debug information. + * @param verbose Indicates whether or not to debug with detail. + */ + public void debugTaskbarManager(String debugReason, int displayId, boolean verbose) { StringJoiner log = new StringJoiner("\n"); - log.add(debugReason + " displayId=" + displayId); + log.add(debugReason + " displayId=" + displayId + " isDefaultDisplay=" + isDefaultDisplay( + displayId)); + if (verbose) { + generateVerboseLogs(log, displayId); + } + Log.d(TAG, log.toString()); + } + /** + * Logs debug information about the TaskbarManager for primary display. + * @param debugReason A string describing the reason for the debug log. + * + */ + public void debugPrimaryTaskbar(String debugReason) { + debugTaskbarManager(debugReason, getDefaultDisplayId(), false); + } + + /** + * Logs debug information about the TaskbarManager for primary display. + * @param debugReason A string describing the reason for the debug log. + * + */ + public void debugPrimaryTaskbar(String debugReason, boolean verbose) { + debugTaskbarManager(debugReason, getDefaultDisplayId(), verbose); + } + + /** + * Logs verbose debug information about the TaskbarManager for a specific display. + */ + private void generateVerboseLogs(StringJoiner log, int displayId) { boolean activityTaskbarPresent = mActivity != null && mActivity.getDeviceProfile().isTaskbarPresent; - Context windowContext = getWindowContext(displayId); + // TODO (b/381113004): make this display-specific via getWindowContext() + Context windowContext = mPrimaryWindowContext; if (windowContext == null) { - log.add("window context for displayId" + displayId); + log.add("windowContext is null!"); return; } - boolean contextTaskbarPresent = mUserUnlocked && LauncherAppState.getIDP(windowContext) - .getDeviceProfile(windowContext).isTaskbarPresent; + boolean contextTaskbarPresent = false; + if (mUserUnlocked) { + DeviceProfile dp = getDeviceProfile(displayId); + contextTaskbarPresent = dp != null && dp.isTaskbarPresent; + } if (activityTaskbarPresent == contextTaskbarPresent) { log.add("mActivity and mWindowContext agree taskbarIsPresent=" + contextTaskbarPresent); - Log.d(TASKBAR_NOT_DESTROYED_TAG, log.toString()); + Log.d(TAG, log.toString()); return; } @@ -1150,16 +1685,14 @@ public class TaskbarManager { log.add("\t\tWindowContext.getResources().getConfiguration()=" + windowContext.getResources().getConfiguration()); if (mUserUnlocked) { - log.add("\t\tLauncherAppState.getIDP().getDeviceProfile(mPrimaryWindowContext)" - + ".isTaskbarPresent=" + contextTaskbarPresent); + log.add("\t\tgetDeviceProfile(mPrimaryWindowContext).isTaskbarPresent=" + + contextTaskbarPresent); } else { log.add("\t\tCouldn't get DeviceProfile because !mUserUnlocked"); } - - Log.d(TASKBAR_NOT_DESTROYED_TAG, log.toString()); } private final DeviceProfile.OnDeviceProfileChangeListener mDebugActivityDeviceProfileChanged = - dp -> debugWhyTaskbarNotDestroyed("mActivity onDeviceProfileChanged"); + dp -> debugPrimaryTaskbar("mActivity onDeviceProfileChanged", true); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java index 6815f97e16..0fa82aef97 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java @@ -61,6 +61,7 @@ public class TaskbarModelCallbacks implements // Used to defer any UI updates during the SUW unstash animation. private boolean mDeferUpdatesForSUW; private Runnable mDeferredUpdates; + private boolean mBindingItems = false; public TaskbarModelCallbacks( TaskbarActivityContext context, TaskbarView container) { @@ -74,14 +75,14 @@ public class TaskbarModelCallbacks implements @Override public void startBinding() { - mContext.setBindingItems(true); + mBindingItems = true; mHotseatItems.clear(); mPredictedItems = Collections.emptyList(); } @Override public void finishBindingItems(IntSet pagesBoundFirst) { - mContext.setBindingItems(false); + mBindingItems = false; commitItemsToUI(); } @@ -167,7 +168,7 @@ public class TaskbarModelCallbacks implements } private void commitItemsToUI() { - if (mContext.isBindingItems()) { + if (mBindingItems) { return; } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java index 5d8b8212a8..a9ee584e95 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java @@ -35,11 +35,7 @@ import com.android.launcher3.BubbleTextView; import com.android.launcher3.Flags; import com.android.launcher3.LauncherSettings; import com.android.launcher3.R; -import com.android.launcher3.dot.FolderDotInfo; -import com.android.launcher3.folder.Folder; -import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.model.data.AppInfo; -import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.notification.NotificationListener; @@ -49,8 +45,6 @@ import com.android.launcher3.popup.SystemShortcut; import com.android.launcher3.shortcuts.DeepShortcutView; import com.android.launcher3.splitscreen.SplitShortcut; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.LauncherBindableItemsContainer; -import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.ShortcutUtil; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.views.ActivityContext; @@ -65,7 +59,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Objects; -import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -93,7 +86,7 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba public TaskbarPopupController(TaskbarActivityContext context) { mContext = context; - mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots); + mPopupDataProvider = new PopupDataProvider(mContext); } public void init(TaskbarControllers controllers) { @@ -132,39 +125,6 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba mAllowInitialSplitSelection = allowInitialSplitSelection; } - private void updateNotificationDots(Predicate updatedDots) { - final PackageUserKey packageUserKey = new PackageUserKey(null, null); - Predicate matcher = info -> !packageUserKey.updateFromItemInfo(info) - || updatedDots.test(packageUserKey); - - LauncherBindableItemsContainer.ItemOperator op = (info, v) -> { - if (info instanceof WorkspaceItemInfo && v instanceof BubbleTextView) { - if (matcher.test(info)) { - ((BubbleTextView) v).applyDotState(info, true /* animate */); - } - } else if (info instanceof FolderInfo && v instanceof FolderIcon) { - FolderInfo fi = (FolderInfo) info; - if (fi.anyMatch(matcher)) { - FolderDotInfo folderDotInfo = new FolderDotInfo(); - for (ItemInfo si : fi.getContents()) { - folderDotInfo.addDotInfo(mPopupDataProvider.getDotInfoForItem(si)); - } - ((FolderIcon) v).setDotInfo(folderDotInfo); - } - } - - // process all the shortcuts - return false; - }; - - mControllers.taskbarViewController.mapOverItems(op); - Folder folder = Folder.getOpen(mContext); - if (folder != null) { - folder.iterateOverItems(op); - } - mControllers.taskbarAllAppsController.updateNotificationDots(updatedDots); - } - /** * Shows the notifications and deep shortcuts associated with a Taskbar {@param icon}. * @return the container if shown or null. diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 6016394c60..95724ad6d2 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -104,6 +104,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba private static final int FLAG_DELAY_TASKBAR_BG_TAG = 1 << 12; public static final int FLAG_STASHED_FOR_BUBBLES = 1 << 13; // show handle for stashed hotseat public static final int FLAG_TASKBAR_HIDDEN = 1 << 14; // taskbar hidden during dream, etc... + // taskbar should always be stashed for bubble bar on phone + public static final int FLAG_STASHED_BUBBLE_BAR_ON_PHONE = 1 << 15; // If any of these flags are enabled, isInApp should return true. private static final int FLAGS_IN_APP = FLAG_IN_APP | FLAG_IN_SETUP; @@ -126,7 +128,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba // If any of these flags are enabled, the taskbar must be stashed. private static final int FLAGS_FORCE_STASHED = FLAG_STASHED_SYSUI | FLAG_STASHED_DEVICE_LOCKED | FLAG_STASHED_IN_TASKBAR_ALL_APPS | FLAG_STASHED_SMALL_SCREEN - | FLAG_STASHED_FOR_BUBBLES; + | FLAG_STASHED_FOR_BUBBLES | FLAG_STASHED_BUBBLE_BAR_ON_PHONE; /** * How long to stash/unstash when manually invoked via long press. @@ -359,6 +361,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba // For now, assume we're in an app, since LauncherTaskbarUIController won't be able to tell // us that we're paused until a bit later. This avoids flickering upon recreating taskbar. updateStateForFlag(FLAG_IN_APP, true); + updateStateForFlag(FLAG_STASHED_BUBBLE_BAR_ON_PHONE, mActivity.isBubbleBarOnPhone()); applyState(/* duration = */ 0); @@ -574,7 +577,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba */ public void updateAndAnimateTransientTaskbar(boolean stash, boolean shouldBubblesFollow, boolean delayTaskbarBackground) { - if (!DisplayController.isTransientTaskbar(mActivity)) { + if (!DisplayController.isTransientTaskbar(mActivity) + || mActivity.isBubbleBarOnPhone()) { return; } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java index 89bcb41fc9..ea0b81eeea 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java @@ -207,9 +207,18 @@ public class TaskbarUIController implements BubbleBarController.BubbleBarLocatio return false; } - /** Returns {@code true} if Home All Apps available instead of Taskbar All Apps. */ - protected boolean canToggleHomeAllApps() { - return false; + + /** + * Toggles all apps UI. Default implementation opens Taskbar All Apps, but may be overridden to + * open different Alls Apps variant depending on the context. + * @param focusSearch indicates whether All Apps should be opened with search input focused. + */ + protected void toggleAllApps(boolean focusSearch) { + if (focusSearch) { + mControllers.taskbarAllAppsController.toggleSearch(); + } else { + mControllers.taskbarAllAppsController.toggle(); + } } @CallSuper diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index a59c9e3fa3..de8e28639b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -62,7 +62,6 @@ import com.android.launcher3.taskbar.customization.TaskbarAllAppsButtonContainer import com.android.launcher3.taskbar.customization.TaskbarDividerContainer; import com.android.launcher3.uioverrides.PredictedAppIcon; import com.android.launcher3.util.DisplayController; -import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.util.Themes; import com.android.launcher3.views.ActivityContext; import com.android.quickstep.util.GroupTask; @@ -392,6 +391,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar /** Inflates/binds the hotseat items and recent tasks to the view. */ protected void updateItems(ItemInfo[] hotseatItemInfos, List recentTasks) { + if (mActivityContext.isDestroyed()) return; // Filter out unsupported items. hotseatItemInfos = Arrays.stream(hotseatItemInfos) .filter(Objects::nonNull) @@ -1096,20 +1096,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar return mAllAppsButtonTranslationOffset; } - /** - * Maps {@code op} over all the child views. - */ - public void mapOverItems(LauncherBindableItemsContainer.ItemOperator op) { - // map over all the shortcuts on the taskbar - for (int i = 0; i < getChildCount(); i++) { - View item = getChildAt(i); - // TODO(b/344657629): Support GroupTask as well for notification dots/popup - if (item.getTag() instanceof ItemInfo itemInfo && op.evaluate(itemInfo, item)) { - return; - } - } - } - /** * Finds the first icon to match one of the given matchers, from highest to lowest priority. * diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java index c7ef960a52..066d4df2f3 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacks.java @@ -66,7 +66,16 @@ public class TaskbarViewCallbacks { InteractionJankMonitorWrapper.begin(v, Cuj.CUJ_LAUNCHER_OPEN_ALL_APPS, /* tag= */ "TASKBAR_BUTTON"); mActivity.getStatsLogManager().logger().log(LAUNCHER_TASKBAR_ALLAPPS_BUTTON_TAP); - mControllers.taskbarAllAppsController.toggle(); + if (DisplayController.showLockedTaskbarOnHome(mActivity) + || DisplayController.showDesktopTaskbarForFreeformDisplay(mActivity)) { + // If the taskbar can be shown on the home screen, use mAllAppsToggler to toggle all + // apps, which will toggle the launcher activity all apps when on home screen. + // TODO(b/395913143): Reconsider this if a gap in taskbar all apps functionality that + // prevents users to drag items to workspace is addressed. + mControllers.uiController.toggleAllApps(false); + } else { + mControllers.taskbarAllAppsController.toggle(); + } } /** Trigger All Apps button long click action. */ diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index cbc5d3d63b..6ae13d4b18 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -83,14 +83,16 @@ import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.TaskItemInfo; import com.android.launcher3.taskbar.bubbles.BubbleBarController; import com.android.launcher3.taskbar.bubbles.BubbleControllers; +import com.android.launcher3.taskbar.customization.TaskbarAllAppsButtonContainer; +import com.android.launcher3.taskbar.customization.TaskbarDividerContainer; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.LauncherBindableItemsContainer; -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext; import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.MultiPropertyFactory.MultiProperty; import com.android.launcher3.util.MultiTranslateDelegate; import com.android.launcher3.util.MultiValueAlpha; +import com.android.launcher3.util.SandboxContext; import com.android.quickstep.util.GroupTask; import com.android.quickstep.util.SingleTask; import com.android.systemui.shared.recents.model.Task; @@ -121,9 +123,10 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar public static final int ALPHA_INDEX_NOTIFICATION_EXPANDED = 4; public static final int ALPHA_INDEX_ASSISTANT_INVOKED = 5; public static final int ALPHA_INDEX_SMALL_SCREEN = 6; - public static final int ALPHA_INDEX_BUBBLE_BAR = 7; - private static final int NUM_ALPHA_CHANNELS = 8; + public static final int ALPHA_INDEX_RECREATE = 8; + + private static final int NUM_ALPHA_CHANNELS = 9; /** Only used for animation purposes, to position the divider between two item indices. */ public static final float DIVIDER_VIEW_POSITION_OFFSET = 0.5f; @@ -238,9 +241,22 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar R.dimen.transient_taskbar_padding); } - public void init(TaskbarControllers controllers) { + /** + * Init of taskbar view controller. + */ + public void init(TaskbarControllers controllers, AnimatorSet startAnimation) { mControllers = controllers; controllers.bubbleControllers.ifPresent(bc -> mBubbleControllers = bc); + + if (startAnimation != null) { + MultiPropertyFactory.MultiProperty multiProperty = + mTaskbarIconAlpha.get(ALPHA_INDEX_RECREATE); + multiProperty.setValue(0f); + Animator animator = multiProperty.animateToValue(1f); + animator.setInterpolator(EMPHASIZED); + startAnimation.play(animator); + } + mTaskbarView.init(TaskbarViewCallbacksFactory.newInstance(mActivity).create( mActivity, mControllers, mTaskbarView)); mTaskbarView.getLayoutParams().height = mActivity.isPhoneMode() @@ -362,6 +378,15 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar mTaskbarView.announceAccessibilityChanges(); } + /** + * Called with destroying Taskbar with animation. + */ + public void onDestroyAnimation(AnimatorSet animatorSet) { + animatorSet.play( + mTaskbarIconAlpha.get(TaskbarViewController.ALPHA_INDEX_RECREATE).animateToValue( + 0f)); + } + public void onDestroy() { if (enableTaskbarPinning()) { mTaskbarView.removeOnLayoutChangeListener(mTaskbarViewLayoutChangeListener); @@ -712,10 +737,21 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar for (View iconView : getIconViews()) { if (iconView instanceof BubbleTextView btv) { btv.updateRunningState(getRunningAppState(btv)); + if (shouldUpdateIconContentDescription(btv)) { + btv.setContentDescription( + btv.getContentDescription() + " " + btv.getIconStateDescription()); + } } } } + private boolean shouldUpdateIconContentDescription(BubbleTextView btv) { + boolean isInDesktopMode = mControllers.taskbarDesktopModeController.isInDesktopMode(); + boolean isAllAppsButton = btv instanceof TaskbarAllAppsButtonContainer; + boolean isDividerButton = btv instanceof TaskbarDividerContainer; + return isInDesktopMode && !isAllAppsButton && !isDividerButton; + } + /** * @return A set of Task ids of running apps that are pinned in the taskbar. */ @@ -1144,11 +1180,8 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar mTaskbarNavButtonTranslationY.updateValue(-deviceProfile.getTaskbarOffsetY()); } - /** - * Maps the given operator to all the top-level children of TaskbarView. - */ - public void mapOverItems(LauncherBindableItemsContainer.ItemOperator op) { - mTaskbarView.mapOverItems(op); + public LauncherBindableItemsContainer getContent() { + return mModelCallbacks; } /** @@ -1299,7 +1332,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar ObjectAnimator animator = mIconsTranslationXForNavbar.animateToValue(translationX); animator.setStartDelay(FADE_OUT_ANIM_POSITION_DURATION_MS); animator.setDuration(FADE_IN_ANIM_ALPHA_DURATION_MS); - animator.setInterpolator(Interpolators.EMPHASIZED); + animator.setInterpolator(EMPHASIZED); return animator; } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TypefaceUtils.kt b/quickstep/src/com/android/launcher3/taskbar/TypefaceUtils.kt new file mode 100644 index 0000000000..e9c62d19c9 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TypefaceUtils.kt @@ -0,0 +1,53 @@ +/* + * 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.taskbar + +import android.graphics.Typeface +import android.widget.TextView +import com.android.launcher3.Flags + +/** + * Helper util class to set pre-defined typefaces to textviews + * + * If the typeface font family is already defined here, you can just reuse it directly. Otherwise, + * please define it here for future use. You do not need to define the font style. If you need + * anything other than [Typeface.NORMAL], pass it inline when calling [setTypeface] + */ +class TypefaceUtils { + + companion object { + const val FONT_FAMILY_BODY_SMALL_BASELINE = "variable-body-small" + const val FONT_FAMILY_BODY_MEDIUM_BASELINE = "variable-body-medium" + const val FONT_FAMILY_BODY_LARGE_BASELINE = "variable-body-large" + const val FONT_FAMILY_LABEL_LARGE_BASELINE = "variable-label-large" + const val FONT_FAMILY_DISPLAY_SMALL_EMPHASIZED = "variable-display-small-emphasized" + const val FONT_FAMILY_DISPLAY_MEDIUM_EMPHASIZED = "variable-display-medium-emphasized" + const val FONT_FAMILY_HEADLINE_SMALL_EMPHASIZED = "variable-headline-small-emphasized" + const val FONT_FAMILY_HEADLINE_LARGE_EMPHASIZED = "variable-headline-large-emphasized" + + @JvmStatic + @JvmOverloads + fun setTypeface( + textView: TextView?, + fontFamilyName: String, + fontStyle: Int = Typeface.NORMAL, + ) { + if (!Flags.expressiveThemeInTaskbarAndNavigation()) return + textView?.typeface = Typeface.create(fontFamilyName, fontStyle) + } + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java index ddbf3b7fc6..6c55b28845 100644 --- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java +++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java @@ -35,7 +35,6 @@ import com.android.launcher3.util.PackageUserKey; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.function.Predicate; /** * Handles the all apps overlay window initialization, updates, and its data. *

@@ -120,13 +119,6 @@ public final class TaskbarAllAppsController { mZeroStateSearchSuggestions = zeroStateSearchSuggestions; } - /** Updates the current notification dots. */ - public void updateNotificationDots(Predicate updatedDots) { - if (mAppsView != null) { - mAppsView.getAppsStore().updateNotificationDots(updatedDots); - } - } - /** Toggles visibility of {@link TaskbarAllAppsContainerView} in the overlay window. */ public void toggle() { toggle(false); @@ -218,6 +210,11 @@ public final class TaskbarAllAppsController { mAppsView = null; } + @Nullable + public TaskbarAllAppsContainerView getAppsView() { + return mAppsView; + } + @VisibleForTesting public int getTaskbarAllAppsTopPadding() { // Allow null-pointer since this should only be null if the apps view is not showing. diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt index 249773d3df..97be2e87b1 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarBackground.kt @@ -44,10 +44,13 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) private val arrowVisibleHeight: Float private val strokeAlpha: Int + private val strokeColor: Int + private val strokeColorDropTarget: Int private val shadowAlpha: Int private val shadowBlur: Float private val keyShadowDistance: Float private var arrowHeightFraction = 1f + private var isShowingDropTarget: Boolean = false var arrowPositionX: Float = 0f private set @@ -100,7 +103,9 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) fillPaint.flags = Paint.ANTI_ALIAS_FLAG fillPaint.style = Paint.Style.FILL // configure stroke paint - strokePaint.color = context.getColor(R.color.taskbar_stroke) + strokeColor = context.getColor(R.color.taskbar_stroke) + strokeColorDropTarget = context.getColor(com.android.internal.R.color.system_primary_fixed) + strokePaint.color = strokeColor strokePaint.flags = Paint.ANTI_ALIAS_FLAG strokePaint.style = Paint.Style.STROKE strokePaint.strokeWidth = res.getDimension(R.dimen.transient_taskbar_stroke_width) @@ -235,9 +240,25 @@ class BubbleBarBackground(context: Context, private var backgroundHeight: Float) return max(0f, getScaledArrowHeight() - (arrowHeight - arrowVisibleHeight)) } + /** Set whether the background should show the drop target */ + fun showDropTarget(isDropTarget: Boolean) { + if (isShowingDropTarget == isDropTarget) { + return + } + isShowingDropTarget = isDropTarget + val strokeColor = if (isDropTarget) strokeColorDropTarget else strokeColor + val alpha = if (isDropTarget) DRAG_STROKE_ALPHA else strokeAlpha + strokePaint.color = strokeColor + strokePaint.alpha = alpha + invalidateSelf() + } + + fun isShowingDropTarget() = isShowingDropTarget + companion object { private const val DARK_THEME_STROKE_ALPHA = 51 private const val LIGHT_THEME_STROKE_ALPHA = 41 + private const val DRAG_STROKE_ALPHA = 255 private const val DARK_THEME_SHADOW_ALPHA = 51 private const val LIGHT_THEME_SHADOW_ALPHA = 25 } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java index 4e029e32be..5ddbe032f9 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java @@ -33,7 +33,8 @@ import android.os.Bundle; import android.os.SystemProperties; import android.util.ArrayMap; import android.util.Log; -import android.widget.Toast; + +import androidx.annotation.NonNull; import com.android.launcher3.taskbar.TaskbarSharedState; import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController; @@ -589,15 +590,24 @@ public class BubbleBarController extends IBubblesListener.Stub { } @Override - public void onDragItemOverBubbleBarDragZone(BubbleBarLocation location) { - //TODO(b/388894910): add meaningful implementation - MAIN_EXECUTOR.execute(() -> - Toast.makeText(mContext, "onDragItemOver " + location, Toast.LENGTH_SHORT).show()); + public void onDragItemOverBubbleBarDragZone(@NonNull BubbleBarLocation bubbleBarLocation) { + MAIN_EXECUTOR.execute(() -> { + mBubbleBarViewController.onDragItemOverBubbleBarDragZone(bubbleBarLocation); + if (mBubbleBarViewController.isLocationUpdatedForDropTarget()) { + mBubbleBarLocationListener.onBubbleBarLocationAnimated(bubbleBarLocation); + } + }); } @Override public void onItemDraggedOutsideBubbleBarDropZone() { - + MAIN_EXECUTOR.execute(() -> { + if (mBubbleBarViewController.isLocationUpdatedForDropTarget()) { + BubbleBarLocation original = mBubbleBarViewController.getBubbleBarLocation(); + mBubbleBarLocationListener.onBubbleBarLocationAnimated(original); + } + mBubbleBarViewController.onItemDraggedOutsideBubbleBarDropZone(); + }); } /** Notifies WMShell to show the expanded view. */ diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarLocationDropTarget.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarLocationDropTarget.kt new file mode 100644 index 0000000000..383f4d2020 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarLocationDropTarget.kt @@ -0,0 +1,96 @@ +/* + * 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.taskbar.bubbles + +import android.graphics.Rect +import android.view.View +import com.android.launcher3.DropTarget +import com.android.launcher3.dragndrop.DragOptions +import com.android.launcher3.model.data.ItemInfo +import com.android.wm.shell.shared.bubbles.BubbleBarLocation + +/** + * Implementation of the {@link DropTarget} that handles drag and drop events over the bubble bar + * locations. + */ +class BubbleBarLocationDropTarget( + private val bubbleBarLocation: BubbleBarLocation, + private val bubbleBarDragListener: BubbleBarDragListener, +) : DropTarget { + + /** Controller that takes care of the bubble bar drag events inside launcher process. */ + interface BubbleBarDragListener { + + /** Called when the drag event is over the bubble bar drop zone. */ + fun onLauncherItemDraggedOverBubbleBarDragZone(location: BubbleBarLocation) + + /** Called when the drag event leaves the bubble bar drop zone. */ + fun onLauncherItemDraggedOutsideBubbleBarDropZone() + + /** Called when the drop event happens over the bubble bar drop zone. */ + fun onLauncherItemDroppedOverBubbleBarDragZone( + location: BubbleBarLocation, + itemInfo: ItemInfo, + ) + + /** Gets the hit [rect][android.graphics.Rect] of the bubble bar location. */ + fun getBubbleBarLocationHitRect(bubbleBarLocation: BubbleBarLocation, outRect: Rect) + + /** Provides the view that will accept the drop. */ + fun getDropView(): View + } + + private var isShowingDropTarget = false + + override fun isDropEnabled(): Boolean = true + + override fun onDrop(dragObject: DropTarget.DragObject, options: DragOptions) { + val itemInfo = dragObject.dragInfo ?: return + // TODO(b/397459664) : fix task bar icon animation after drop + // TODO(b/397459664) : update bubble bar location + bubbleBarDragListener.onLauncherItemDroppedOverBubbleBarDragZone( + bubbleBarLocation, + itemInfo, + ) + } + + override fun onDragEnter(dragObject: DropTarget.DragObject) {} + + override fun onDragOver(dragObject: DropTarget.DragObject) { + if (isShowingDropTarget) return + isShowingDropTarget = true + bubbleBarDragListener.onLauncherItemDraggedOverBubbleBarDragZone(bubbleBarLocation) + } + + override fun onDragExit(dragObject: DropTarget.DragObject) { + // TODO(b/397459664) : fix the issue for no bubbles, when moving task bar icon out of + // the bubble bar drag zone drag ends and swipes gesture swipes the overview + if (!isShowingDropTarget) return + isShowingDropTarget = false + bubbleBarDragListener.onLauncherItemDraggedOutsideBubbleBarDropZone() + } + + override fun acceptDrop(dragObject: DropTarget.DragObject): Boolean = true + + override fun prepareAccessibilityDrop() {} + + override fun getHitRectRelativeToDragLayer(outRect: Rect) { + bubbleBarDragListener.getBubbleBarLocationHitRect(bubbleBarLocation, outRect) + } + + override fun getDropView(): View = bubbleBarDragListener.getDropView() +} diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java index c00112383b..d43ebe2977 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java @@ -536,6 +536,16 @@ public class BubbleBarView extends FrameLayout { return (float) (displayWidth - getWidth() - margin); } + /** Set whether the background should show the drop target */ + public void showDropTarget(boolean isDropTarget) { + mBubbleBarBackground.showDropTarget(isDropTarget); + } + + /** Returns whether the Bubble Bar is currently displaying a drop target. */ + public boolean isShowingDropTarget() { + return mBubbleBarBackground.isShowingDropTarget(); + } + /** * Animate bubble bar to the given location transiently. Does not modify the layout or the value * returned by {@link #getBubbleBarLocation()}. diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java index 026f239152..1f5c5419f4 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java @@ -24,6 +24,8 @@ import static com.android.launcher3.taskbar.TaskbarPinningController.PINNING_TRA import android.animation.Animator; import android.animation.AnimatorSet; +import android.content.Intent; +import android.content.pm.ShortcutInfo; import android.content.res.Resources; import android.graphics.Point; import android.graphics.PointF; @@ -43,11 +45,15 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.RoundedRectRevealOutlineProvider; +import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.taskbar.TaskbarActivityContext; import com.android.launcher3.taskbar.TaskbarControllers; +import com.android.launcher3.taskbar.TaskbarDragController; import com.android.launcher3.taskbar.TaskbarInsetsController; import com.android.launcher3.taskbar.TaskbarSharedState; import com.android.launcher3.taskbar.TaskbarStashController; +import com.android.launcher3.taskbar.bubbles.BubbleBarLocationDropTarget.BubbleBarDragListener; import com.android.launcher3.taskbar.bubbles.animation.BubbleBarViewAnimator; import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutController; import com.android.launcher3.taskbar.bubbles.flyout.BubbleBarFlyoutPositioner; @@ -59,6 +65,7 @@ import com.android.launcher3.util.MultiValueAlpha; import com.android.quickstep.SystemUiProxy; import com.android.wm.shell.Flags; import com.android.wm.shell.shared.bubbles.BubbleBarLocation; +import com.android.wm.shell.shared.bubbles.DeviceConfig; import java.io.PrintWriter; import java.util.List; @@ -117,6 +124,61 @@ public class BubbleBarViewController { updateTranslationY(); setBubbleBarScaleAndPadding(pinningProgress); }); + private final BubbleBarDragListener mDragListener = new BubbleBarDragListener() { + + @NonNull + @Override + public void getBubbleBarLocationHitRect(@NonNull BubbleBarLocation bubbleBarLocation, + Rect outRect) { + Point screenSize = DisplayController.INSTANCE.get(mActivity).getInfo().currentSize; + outRect.top = screenSize.y - mBubbleBarDropTargetSize; + outRect.bottom = screenSize.y; + if (bubbleBarLocation.isOnLeft(mBarView.isLayoutRtl())) { + outRect.left = 0; + outRect.right = mBubbleBarDropTargetSize; + } else { + outRect.left = screenSize.x - mBubbleBarDropTargetSize; + outRect.right = screenSize.x; + } + } + + @Override + public void onLauncherItemDroppedOverBubbleBarDragZone(@NonNull BubbleBarLocation location, + @NonNull ItemInfo itemInfo) { + //TODO(b/397459664) : fix drag interruption when there are no bubbles + //TODO(b/397459664) : update bubble bar location + ShortcutInfo shortcutInfo = null; + if (itemInfo instanceof WorkspaceItemInfo) { + shortcutInfo = ((WorkspaceItemInfo) itemInfo).getDeepShortcutInfo(); + } + Intent itemIntent = itemInfo.getIntent(); + SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(mActivity); + if (shortcutInfo != null) { + systemUiProxy.showShortcutBubble(shortcutInfo); + } else if (itemIntent != null && itemIntent.getComponent() != null) { + systemUiProxy.showAppBubble(itemIntent, itemInfo.user); + } + } + + @Override + public void onLauncherItemDraggedOutsideBubbleBarDropZone() { + //TODO(b/397459664) : hide expanded view drop target + onItemDraggedOutsideBubbleBarDropZone(); + } + + @Override + public void onLauncherItemDraggedOverBubbleBarDragZone( + @NonNull BubbleBarLocation location) { + //TODO(b/397459664) : show expanded view drop target + onDragItemOverBubbleBarDragZone(location); + } + + @NonNull + @Override + public View getDropView() { + return mBarView; + } + }; // Modified when swipe up is happening on the bubble bar or task bar. private float mBubbleBarSwipeUpTranslationY; @@ -131,15 +193,20 @@ public class BubbleBarViewController { // Whether the bar is hidden when stashed private boolean mHiddenForStashed; private boolean mShouldShowEducation; - public boolean mOverflowAdded; + private boolean mIsLocationUpdatedForDropTarget = false; private BubbleBarViewAnimator mBubbleBarViewAnimator; private final FrameLayout mBubbleBarContainer; private BubbleBarFlyoutController mBubbleBarFlyoutController; + private BubbleBarPinController mBubbleBarPinController; private TaskbarSharedState mTaskbarSharedState; + private TaskbarDragController mTaskbarDragController; + private final BubbleBarLocationDropTarget mBubbleBarLeftDropTarget; + private final BubbleBarLocationDropTarget mBubbleBarRightDropTarget; private final TimeSource mTimeSource = System::currentTimeMillis; private final int mTaskbarTranslationDelta; + private final int mBubbleBarDropTargetSize; @Nullable private BubbleBarBoundsChangeListener mBoundsChangeListener; @@ -157,15 +224,26 @@ public class BubbleBarViewController { R.dimen.bubblebar_transient_taskbar_min_distance); mDragElevation = res.getDimensionPixelSize(R.dimen.bubblebar_drag_elevation); mTaskbarTranslationDelta = getBubbleBarTranslationDeltaForTaskbar(activity); + if (DeviceConfig.isSmallTablet(mActivity)) { + mBubbleBarDropTargetSize = res.getDimensionPixelSize(R.dimen.drag_zone_bubble_fold); + } else { + mBubbleBarDropTargetSize = res.getDimensionPixelSize(R.dimen.drag_zone_bubble_tablet); + } + mBubbleBarLeftDropTarget = new BubbleBarLocationDropTarget(BubbleBarLocation.LEFT, + mDragListener); + mBubbleBarRightDropTarget = new BubbleBarLocationDropTarget(BubbleBarLocation.RIGHT, + mDragListener); } /** Initializes controller. */ public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers, TaskbarViewPropertiesProvider taskbarViewPropertiesProvider) { + mTaskbarDragController = controllers.taskbarDragController; mTaskbarSharedState = controllers.getSharedState(); mBubbleStashController = bubbleControllers.bubbleStashController; mBubbleBarController = bubbleControllers.bubbleBarController; mBubbleDragController = bubbleControllers.bubbleDragController; + mBubbleBarPinController = bubbleControllers.bubbleBarPinController; mTaskbarStashController = controllers.taskbarStashController; mTaskbarInsetsController = controllers.taskbarInsetsController; mBubbleBarFlyoutController = new BubbleBarFlyoutController( @@ -262,6 +340,8 @@ public class BubbleBarViewController { mBubbleBarController.updateBubbleBarLocation(location, source); } }; + mTaskbarDragController.addDropTarget(mBubbleBarLeftDropTarget); + mTaskbarDragController.addDropTarget(mBubbleBarRightDropTarget); } /** Returns animated float property responsible for pinning transition animation. */ @@ -274,7 +354,10 @@ public class BubbleBarViewController { @Override public boolean isOnLeft() { - return mBarView.getBubbleBarLocation().isOnLeft(mBarView.isLayoutRtl()); + boolean shouldRevertLocation = + mBarView.isShowingDropTarget() && mIsLocationUpdatedForDropTarget; + boolean isOnLeft = mBarView.getBubbleBarLocation().isOnLeft(mBarView.isLayoutRtl()); + return shouldRevertLocation != isOnLeft; } @Override @@ -524,6 +607,63 @@ public class BubbleBarViewController { mBarView.animateToBubbleBarLocation(bubbleBarLocation); } + /** Returns whether the Bubble Bar is currently displaying a drop target. */ + public boolean isShowingDropTarget() { + return mBarView.isShowingDropTarget(); + } + + /** + * Notifies the controller that a drag event is over the Bubble Bar drop zone. The controller + * will display the appropriate drop target and enter drop target mode. The controller will also + * update the return value of {@link #isLocationUpdatedForDropTarget()} to true if location was + * updated. + */ + public void onDragItemOverBubbleBarDragZone(@NonNull BubbleBarLocation bubbleBarLocation) { + mBarView.showDropTarget(/* isDropTarget = */ true); + boolean isRtl = mBarView.isLayoutRtl(); + mIsLocationUpdatedForDropTarget = getBubbleBarLocation().isOnLeft(isRtl) + != bubbleBarLocation.isOnLeft(isRtl); + if (mIsLocationUpdatedForDropTarget) { + animateBubbleBarLocation(bubbleBarLocation); + } + if (!hasBubbles()) { + mBubbleBarPinController.showDropTarget(bubbleBarLocation); + } + } + + /** + * Returns {@code true} if location was updated after most recent + * {@link #onDragItemOverBubbleBarDragZone}}. + */ + public boolean isLocationUpdatedForDropTarget() { + return mIsLocationUpdatedForDropTarget; + } + + /** + * Notifies the controller that the drag event is outside the Bubble Bar drop zone. + * This will hide the drop target zone if there are no bubbles or return the + * Bubble Bar to its original location. The controller will also exit drop target + * mode and reset the value returned from {@link #isLocationUpdatedForDropTarget()} to false. + */ + public void onItemDraggedOutsideBubbleBarDropZone() { + mBarView.showDropTarget(/* isDropTarget = */ false); + if (mIsLocationUpdatedForDropTarget) { + animateBubbleBarLocation(getBubbleBarLocation()); + } + mBubbleBarPinController.hideDropTarget(); + mIsLocationUpdatedForDropTarget = false; + } + + /** + * Notifies the controller that the drag has completed over the Bubble Bar drop zone. + * The controller will hide the drop target if there are no bubbles and exit drop target mode. + */ + public void onItemDroppedInBubbleBarDragZone() { + mBarView.showDropTarget(/* isDropTarget = */ false); + mBubbleBarPinController.hideDropTarget(); + mIsLocationUpdatedForDropTarget = false; + } + /** * The bounds of the bubble bar. */ @@ -996,7 +1136,12 @@ public class BubbleBarViewController { boolean isInApp = mTaskbarStashController.isInApp(); // if this is the first bubble, animate to the initial state. if (mBarView.getBubbleChildCount() == 1 && !isUpdate) { - mBubbleBarViewAnimator.animateToInitialState(bubble, isInApp, isExpanding); + // If a drop target is visible and the first bubble is added, hide the empty drop target + if (mBarView.isShowingDropTarget()) { + mBubbleBarPinController.hideDropTarget(); + } + mBubbleBarViewAnimator.animateToInitialState(bubble, isInApp, isExpanding, + mBarView.isShowingDropTarget()); return; } // if we're not stashed or we're in persistent taskbar, animate for collapsed state. @@ -1213,6 +1358,8 @@ public class BubbleBarViewController { /** Called when the controller is destroyed. */ public void onDestroy() { adjustTaskbarAndHotseatToBubbleBarState(/*isBubbleBarExpanded = */false); + mTaskbarDragController.removeDropTarget(mBubbleBarLeftDropTarget); + mTaskbarDragController.removeDropTarget(mBubbleBarRightDropTarget); } /** diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt index 745c689541..30cfafe694 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt @@ -365,7 +365,12 @@ constructor( } /** Animates to the initial state of the bubble bar, when there are no previous bubbles. */ - fun animateToInitialState(b: BubbleBarBubble, isInApp: Boolean, isExpanding: Boolean) { + fun animateToInitialState( + b: BubbleBarBubble, + isInApp: Boolean, + isExpanding: Boolean, + isDragging: Boolean = false, + ) { val bubbleView = b.view val animator = PhysicsAnimator.getInstance(bubbleView) if (animator.isRunning()) animator.cancel() @@ -374,15 +379,12 @@ constructor( // bubble bar to the handle if we're in an app. val showAnimation = buildBubbleBarSpringInAnimation() val hideAnimation = - if (isInApp && !isExpanding) { + if (isInApp && !isExpanding && !isDragging) { buildBubbleBarToHandleAnimation() } else { Runnable { - moveToState(AnimatingBubble.State.ANIMATING_OUT) - bubbleBarFlyoutController.collapseFlyout { - onFlyoutRemoved() - clearAnimatingBubble() - } + collapseFlyoutAndUpdateState() + if (isDragging) return@Runnable bubbleStashController.showBubbleBarImmediate() bubbleStashController.updateTaskbarTouchRegion() } @@ -440,11 +442,7 @@ constructor( // first bounce the bubble bar and show the flyout. Then hide the flyout. val showAnimation = buildBubbleBarBounceAnimation() val hideAnimation = Runnable { - moveToState(AnimatingBubble.State.ANIMATING_OUT) - bubbleBarFlyoutController.collapseFlyout { - onFlyoutRemoved() - clearAnimatingBubble() - } + collapseFlyoutAndUpdateState() bubbleStashController.showBubbleBarImmediate() bubbleStashController.updateTaskbarTouchRegion() } @@ -454,6 +452,14 @@ constructor( scheduler.postDelayed(FLYOUT_DELAY_MS, hideAnimation) } + private fun collapseFlyoutAndUpdateState() { + moveToState(AnimatingBubble.State.ANIMATING_OUT) + bubbleBarFlyoutController.collapseFlyout { + onFlyoutRemoved() + clearAnimatingBubble() + } + } + /** * The bubble bar animation when it is collapsed is divided into 2 chained animations. The first * animation is a regular accelerate animation that moves the bubble bar upwards. When it ends diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/GrowthConstants.java b/quickstep/src/com/android/launcher3/taskbar/growth/GrowthConstants.java new file mode 100644 index 0000000000..78ef152601 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/GrowthConstants.java @@ -0,0 +1,28 @@ +/* + * 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.taskbar.growth; + +/** + * Constants for registering Growth framework. + */ +public final class GrowthConstants { + /** + * For Taskbar broadcast intent filter. + */ + public static final String BROADCAST_SHOW_NUDGE = + "com.android.launcher3.growth.BROADCAST_SHOW_NUDGE"; + private GrowthConstants() {} +} diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java index 64cc47c739..636d89bd55 100644 --- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java @@ -18,12 +18,11 @@ package com.android.launcher3.taskbar.overlay; import android.content.Context; import android.view.View; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; -import com.android.launcher3.dot.DotInfo; -import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.taskbar.BaseTaskbarContext; import com.android.launcher3.taskbar.TaskbarActivityContext; @@ -115,11 +114,6 @@ public class TaskbarOverlayContext extends BaseTaskbarContext { return mDragLayer.findViewById(R.id.apps_view); } - @Override - public boolean isBindingItems() { - return mTaskbarContext.isBindingItems(); - } - @Override public View.OnClickListener getItemOnClickListener() { return mTaskbarContext.getItemOnClickListener(); @@ -130,6 +124,7 @@ public class TaskbarOverlayContext extends BaseTaskbarContext { return mDragController::startDragOnLongClick; } + @NonNull @Override public PopupDataProvider getPopupDataProvider() { return mTaskbarContext.getPopupDataProvider(); @@ -140,11 +135,6 @@ public class TaskbarOverlayContext extends BaseTaskbarContext { mUiController.startSplitSelection(splitSelectSource); } - @Override - public DotInfo getDotInfoForItem(ItemInfo info) { - return mTaskbarContext.getDotInfoForItem(info); - } - @Override public void onDragStart() {} diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java index b25f99905d..15a27d15c0 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java +++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java @@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides; import static com.android.app.animation.Interpolators.ACCELERATE_DECELERATE; import static com.android.launcher3.icons.FastBitmapDrawable.getDisabledColorFilter; +import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -51,9 +52,8 @@ import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.AnimatorListeners; import com.android.launcher3.celllayout.CellLayoutLayoutParams; import com.android.launcher3.celllayout.DelegatedCellDrawing; -import com.android.launcher3.graphics.IconShape; +import com.android.launcher3.graphics.ThemeManager; import com.android.launcher3.icons.FastBitmapDrawable; -import com.android.launcher3.icons.IconNormalizer; import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.model.data.WorkspaceItemInfo; @@ -138,11 +138,11 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { public PredictedAppIcon(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); mDeviceProfile = ActivityContext.lookupContext(context).getDeviceProfile(); - mNormalizedIconSize = IconNormalizer.getNormalizedCircleSize(getIconSize()); + mNormalizedIconSize = Math.round(getIconSize() * ICON_VISIBLE_AREA_FACTOR); int shadowSize = context.getResources().getDimensionPixelSize( R.dimen.blur_size_thin_outline); mShadowFilter = new BlurMaskFilter(shadowSize, BlurMaskFilter.Blur.OUTER); - mShapePath = IconShape.INSTANCE.get(context).getShape().getPath(mNormalizedIconSize); + mShapePath = ThemeManager.INSTANCE.get(context).getIconShape().getPath(mNormalizedIconSize); } @Override diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index bb57d6eb74..aab8ad12d1 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -1380,7 +1380,8 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer, SystemUiProxy.INSTANCE.get(this).setLauncherAppIconSize(mDeviceProfile.iconSizePx); TaskbarManager taskbarManager = mTISBindHelper.getTaskbarManager(); if (taskbarManager != null) { - taskbarManager.debugWhyTaskbarNotDestroyed("QuickstepLauncher#onDeviceProfileChanged"); + taskbarManager.debugPrimaryTaskbar("QuickstepLauncher#onDeviceProfileChanged", + true); } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt index c8f46a9dd7..79328df325 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt @@ -20,24 +20,24 @@ 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.enableDesktopExplodedView 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.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.AddDesktopButton import com.android.quickstep.views.ClearAllButton import com.android.quickstep.views.RecentsView import com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET @@ -51,6 +51,7 @@ 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.RecentsViewUtils.Companion.DESK_EXPLODE_PROGRESS import com.android.quickstep.views.TaskView.Companion.FLAG_UPDATE_ALL /** @@ -74,6 +75,13 @@ class RecentsViewStateController(private val launcher: QuickstepLauncher) : recentsView, if (state.displayOverviewTasksAsGrid(launcher.deviceProfile)) 1f else 0f, ) + if (enableDesktopExplodedView()) { + DESK_EXPLODE_PROGRESS.set( + recentsView, + if (state.displayOverviewTasksAsGrid(launcher.deviceProfile)) 1f else 0f, + ) + } + TASK_THUMBNAIL_SPLASH_ALPHA.set( recentsView, if (state.showTaskThumbnailSplash()) 1f else 0f, @@ -156,6 +164,15 @@ class RecentsViewStateController(private val launcher: QuickstepLauncher) : getOverviewInterpolator(fromState, toState), ) + if (enableDesktopExplodedView()) { + builder.setFloat( + recentsView, + DESK_EXPLODE_PROGRESS, + if (toState.isRecentsViewVisible) 1f else 0f, + getOverviewInterpolator(fromState, toState), + ) + } + if (enableLargeDesktopWindowingTile()) { builder.setFloat( recentsView, @@ -208,8 +225,8 @@ class RecentsViewStateController(private val launcher: QuickstepLauncher) : builder: PendingAnimation, animate: Boolean, ) { - val goingToOverviewFromWorkspaceContextual = toState == LauncherState.OVERVIEW && - launcher.isSplitSelectionActive + val goingToOverviewFromWorkspaceContextual = + toState == LauncherState.OVERVIEW && launcher.isSplitSelectionActive if ( toState != LauncherState.OVERVIEW_SPLIT_SELECT && !goingToOverviewFromWorkspaceContextual @@ -284,6 +301,14 @@ class RecentsViewStateController(private val launcher: QuickstepLauncher) : overviewButtonAlpha, config.getInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, LINEAR), ) + recentsView.addDeskButton?.let { + propertySetter.setFloat( + it, + AddDesktopButton.VISIBILITY_ALPHA, + if (state.areElementsVisible(launcher, LauncherState.ADD_DESK_BUTTON)) 1f else 0f, + LINEAR, + ) + } } private fun getOverviewInterpolator(fromState: LauncherState, toState: LauncherState) = diff --git a/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt b/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt index 6e901ee6d1..1f34969a49 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/SystemApiWrapper.kt @@ -144,7 +144,7 @@ open class SystemApiWrapper @Inject constructor(@ApplicationContext context: Con override fun isNonResizeableActivity(lai: LauncherActivityInfo) = lai.activityInfo.resizeMode == ActivityInfo.RESIZE_MODE_UNRESIZEABLE - override fun supportsMultiInstance(lai: LauncherActivityInfo) : Boolean { + override fun supportsMultiInstance(lai: LauncherActivityInfo): Boolean { return try { super.supportsMultiInstance(lai) || lai.supportsMultiInstance() } catch (e: Exception) { @@ -202,4 +202,7 @@ open class SystemApiWrapper @Inject constructor(@ApplicationContext context: Con (appInfo.sourceDir?.hashCode() ?: 0).toString() + " " + appInfo.longVersionCode override fun getRoundIconRes(appInfo: ApplicationInfo) = appInfo.roundIconRes + + override fun isFileDrawable(shortcutInfo: ShortcutInfo) = + shortcutInfo.hasIconFile() || shortcutInfo.hasIconUri() } diff --git a/quickstep/src/com/android/launcher3/uioverrides/flags/DevOptionsUiHelper.kt b/quickstep/src/com/android/launcher3/uioverrides/flags/DevOptionsUiHelper.kt index 7c09e9a8ec..0d2cfbf028 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/flags/DevOptionsUiHelper.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/flags/DevOptionsUiHelper.kt @@ -315,6 +315,12 @@ class DevOptionsUiHelper(c: Context, attr: AttributeSet?) : PreferenceGroup(c, a intent = Intent(launchSandboxIntent).putExtra("use_tutorial_menu", true) } ) + addPreference( + Preference(context).apply { + title = "Launch Full Gesture Tutorial" + intent = Intent(launchSandboxIntent).putExtra("use_tutorial_menu", false) + } + ) addPreference( Preference(context).apply { title = "Launch Back Tutorial" diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java index 10513c08c6..b27c6e8381 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java @@ -153,7 +153,7 @@ public class AllAppsState extends LauncherState { return new PageAlphaProvider(DECELERATE_2) { @Override public float getPageAlpha(int pageIndex) { - return launcher.getDeviceProfile().shouldShowAllAppsOnSheet() + return launcher.getDeviceProfile().isTablet ? superPageAlphaProvider.getPageAlpha(pageIndex) : 0; } @@ -164,7 +164,7 @@ public class AllAppsState extends LauncherState { public int getVisibleElements(Launcher launcher) { int elements = ALL_APPS_CONTENT | FLOATING_SEARCH_BAR; // When All Apps is presented on a bottom sheet, HOTSEAT_ICONS are visible. - if (launcher.getDeviceProfile().shouldShowAllAppsOnSheet()) { + if (launcher.getDeviceProfile().isTablet) { elements |= HOTSEAT_ICONS; } return elements; diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index ca388c66e5..b1196af0ed 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -77,7 +77,8 @@ public class BackgroundAppState extends OverviewState { return super.getVisibleElements(launcher) & ~OVERVIEW_ACTIONS & ~CLEAR_ALL_BUTTON - & ~VERTICAL_SWIPE_INDICATOR; + & ~VERTICAL_SWIPE_INDICATOR + & ~ADD_DESK_BUTTON; } @Override diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java index 80fc5fa391..0c0b4fd203 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewModalTaskState.java @@ -45,7 +45,7 @@ public class OverviewModalTaskState extends OverviewState { @Override public int getVisibleElements(Launcher launcher) { - return OVERVIEW_ACTIONS | CLEAR_ALL_BUTTON; + return OVERVIEW_ACTIONS; } @Override diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java index 15216febd5..5fdedccf99 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -110,7 +110,7 @@ public class OverviewState extends LauncherState { @Override public int getVisibleElements(Launcher launcher) { - int elements = CLEAR_ALL_BUTTON | OVERVIEW_ACTIONS; + int elements = CLEAR_ALL_BUTTON | OVERVIEW_ACTIONS | ADD_DESK_BUTTON; DeviceProfile dp = launcher.getDeviceProfile(); boolean showFloatingSearch; if (dp.isPhone) { @@ -124,7 +124,7 @@ public class OverviewState extends LauncherState { elements |= FLOATING_SEARCH_BAR; } if (launcher.isSplitSelectionActive()) { - elements &= ~CLEAR_ALL_BUTTON; + elements &= ~CLEAR_ALL_BUTTON & ~ADD_DESK_BUTTON; } return elements; } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java index 1907b4efd7..44f8bf1e07 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java @@ -109,8 +109,11 @@ public class QuickstepAtomicAnimationFactory extends // We sync the scrim fade with the taskbar animation duration to avoid any flickers for // taskbar icons disappearing before hotseat icons show up. + boolean isPinnedTaskbarAndNotInDesktopMode = + isPinnedTaskbar && !DisplayController.isInDesktopMode(mContainer); float scrimUpperBoundFromSplit = - QuickstepTransitionManager.getTaskbarToHomeDuration(isPinnedTaskbar) + QuickstepTransitionManager.getTaskbarToHomeDuration( + isPinnedTaskbarAndNotInDesktopMode) / (float) config.duration; scrimUpperBoundFromSplit = Math.min(scrimUpperBoundFromSplit, 1f); config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(LINEAR, 0, 0.25f)); @@ -142,7 +145,8 @@ public class QuickstepAtomicAnimationFactory extends if (mContainer.getDeviceProfile().isTaskbarPresent) { config.duration = Math.min( config.duration, - QuickstepTransitionManager.getTaskbarToHomeDuration(isPinnedTaskbar)); + QuickstepTransitionManager.getTaskbarToHomeDuration( + isPinnedTaskbarAndNotInDesktopMode)); } overview.snapToPage(DEFAULT_PAGE, Math.toIntExact(config.duration)); } else { diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java index 05d12c31af..58b274a47c 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java @@ -64,6 +64,7 @@ import android.animation.ValueAnimator; import android.graphics.PointF; import android.view.MotionEvent; import android.view.animation.Interpolator; +import android.window.DesktopModeFlags; import com.android.internal.jank.Cuj; import com.android.launcher3.LauncherState; @@ -86,7 +87,6 @@ import com.android.quickstep.util.MotionPauseDetector; import com.android.quickstep.util.WorkspaceRevealAnim; import com.android.quickstep.views.RecentsView; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; -import com.android.window.flags.Flags; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; /** @@ -188,7 +188,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, } if (DesktopModeStatus.canEnterDesktopMode(mLauncher) //TODO(b/345296916): replace with dev option once in teamfood - && Flags.enableQuickswitchDesktopSplitBugfix() + && DesktopModeFlags.ENABLE_QUICKSWITCH_DESKTOP_SPLIT_BUGFIX.isTrue() && mRecentsView.getNonDesktopTaskViewCount() < 1) { return false; } diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt index 98737a5568..454a307300 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt @@ -16,9 +16,11 @@ package com.android.launcher3.uioverrides.touchcontrollers import android.content.Context +import android.graphics.Rect import android.view.MotionEvent import androidx.dynamicanimation.animation.SpringAnimation import com.android.app.animation.Interpolators.DECELERATE +import com.android.app.animation.Interpolators.LINEAR import com.android.launcher3.AbstractFloatingView import com.android.launcher3.R import com.android.launcher3.Utilities.EDGE_NAV_BAR @@ -29,11 +31,11 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector import com.android.launcher3.util.MSDLPlayerWrapper import com.android.launcher3.util.TouchController import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY import com.android.quickstep.views.RecentsViewContainer import com.android.quickstep.views.TaskView import com.google.android.msdl.data.model.MSDLToken import kotlin.math.abs -import kotlin.math.sign /** Touch controller for handling task view card dismiss swipes */ class TaskViewDismissTouchController( @@ -50,6 +52,9 @@ CONTAINER : RecentsViewContainer { recentsView.pagedOrientationHandler.upDownSwipeDirection, ) private val isRtl = isRtl(container.resources) + private val upDirection: Int = recentsView.pagedOrientationHandler.getUpDirection(isRtl) + + private val tempTaskThumbnailBounds = Rect() private var taskBeingDragged: TaskView? = null private var springAnimation: SpringAnimation? = null @@ -57,6 +62,7 @@ CONTAINER : RecentsViewContainer { private var verticalFactor: Int = 0 private var hasDismissThresholdHapticRun = false private var initialDisplacement: Float = 0f + private var recentsScaleAnimation: SpringAnimation? = null private fun canInterceptTouch(ev: MotionEvent): Boolean = when { @@ -91,33 +97,42 @@ CONTAINER : RecentsViewContainer { } onControllerTouchEvent(ev) - return detector.isDraggingState && detector.wasInitialTouchPositive() + val upDirectionIsPositive = upDirection == SingleAxisSwipeDetector.DIRECTION_POSITIVE + val wasInitialTouchUp = + (upDirectionIsPositive && detector.wasInitialTouchPositive()) || + (!upDirectionIsPositive && !detector.wasInitialTouchPositive()) + return detector.isDraggingState && wasInitialTouchUp } override fun onControllerTouchEvent(ev: MotionEvent?): Boolean = detector.onTouchEvent(ev) private fun onActionDown(ev: MotionEvent): Boolean { springAnimation?.cancel() + recentsScaleAnimation?.cancel() if (!canInterceptTouch(ev)) { return false } - taskBeingDragged = recentsView.taskViews .firstOrNull { recentsView.isTaskViewVisible(it) && container.dragLayer.isEventOverView(it, ev) } ?.also { - dismissLength = recentsView.pagedOrientationHandler.getSecondaryDimension(it) + val secondaryLayerDimension = + recentsView.pagedOrientationHandler.getSecondaryDimension( + container.dragLayer + ) + // Dismiss length as bottom of task so it is fully off screen when dismissed. + it.getThumbnailBounds(tempTaskThumbnailBounds, relativeToDragLayer = true) + dismissLength = + recentsView.pagedOrientationHandler.getTaskDismissLength( + secondaryLayerDimension, + tempTaskThumbnailBounds, + ) verticalFactor = - recentsView.pagedOrientationHandler.secondaryTranslationDirectionFactor + recentsView.pagedOrientationHandler.getTaskDismissVerticalDirection() } - - detector.setDetectableScrollConditions( - recentsView.pagedOrientationHandler.getUpDirection(isRtl), - /* ignoreSlop = */ false, - ) - + detector.setDetectableScrollConditions(upDirection, /* ignoreSlop= */ false) return true } @@ -140,8 +155,8 @@ CONTAINER : RecentsViewContainer { boundToRange(abs(currentDisplacement), 0f, dismissLength.toFloat()) // When swiping below origin, allow slight undershoot to simulate resisting the movement. val totalDisplacement = - if (isDisplacementPositiveDirection(currentDisplacement)) - boundedDisplacement * sign(currentDisplacement) + if (recentsView.pagedOrientationHandler.isGoingUp(currentDisplacement, isRtl)) + boundedDisplacement * verticalFactor else mapToRange( boundedDisplacement, @@ -150,7 +165,7 @@ CONTAINER : RecentsViewContainer { 0f, container.resources.getDimension(R.dimen.task_dismiss_max_undershoot), DECELERATE, - ) + ) * -verticalFactor taskBeingDragged.secondaryDismissTranslationProperty.setValue( taskBeingDragged, totalDisplacement, @@ -162,6 +177,8 @@ CONTAINER : RecentsViewContainer { } recentsView.redrawLiveTile() } + val dismissFraction = displacement / (dismissLength * verticalFactor).toFloat() + RECENTS_SCALE_PROPERTY.setValue(recentsView, getRecentsScale(dismissFraction)) playDismissThresholdHaptic(displacement) return true } @@ -197,8 +214,9 @@ CONTAINER : RecentsViewContainer { } val isBeyondDismissThreshold = abs(currentDisplacement) > abs(DISMISS_THRESHOLD_FRACTION * dismissLength) - val isFlingingTowardsDismiss = detector.isFling(velocity) && velocity < 0 - val isFlingingTowardsRestState = detector.isFling(velocity) && velocity > 0 + val velocityIsGoingUp = recentsView.pagedOrientationHandler.isGoingUp(velocity, isRtl) + val isFlingingTowardsDismiss = detector.isFling(velocity) && velocityIsGoingUp + val isFlingingTowardsRestState = detector.isFling(velocity) && !velocityIsGoingUp val isDismissing = isFlingingTowardsDismiss || (isBeyondDismissThreshold && !isFlingingTowardsRestState) springAnimation = @@ -216,12 +234,12 @@ CONTAINER : RecentsViewContainer { if (isDismissing) (dismissLength * verticalFactor).toFloat() else 0f ) } + recentsScaleAnimation = + recentsView.animateRecentsScale(RECENTS_SCALE_DEFAULT).addEndListener { _, _, _, _ -> + recentsScaleAnimation = null + } } - // Returns if the current task being dragged is towards "positive" (e.g. dismissal). - private fun isDisplacementPositiveDirection(displacement: Float): Boolean = - sign(displacement) == sign(verticalFactor.toFloat()) - private fun clearState() { detector.finishedScrolling() detector.setDetectableScrollConditions(0, false) @@ -230,8 +248,54 @@ CONTAINER : RecentsViewContainer { springAnimation = null } + private fun getRecentsScale(dismissFraction: Float): Float { + return when { + // Do not scale recents when dragging below origin. + dismissFraction <= 0 -> { + RECENTS_SCALE_DEFAULT + } + // Initially scale recents as the drag begins, up to the first threshold. + dismissFraction < RECENTS_SCALE_FIRST_THRESHOLD_FRACTION -> { + mapToRange( + dismissFraction, + 0f, + RECENTS_SCALE_FIRST_THRESHOLD_FRACTION, + RECENTS_SCALE_DEFAULT, + RECENTS_SCALE_ON_DISMISS_CANCEL, + LINEAR, + ) + } + // Keep scale consistent until dragging to the dismiss threshold. + dismissFraction < RECENTS_SCALE_DISMISS_THRESHOLD_FRACTION -> { + RECENTS_SCALE_ON_DISMISS_CANCEL + } + // Scale beyond the dismiss threshold again, to indicate dismiss will occur on release. + dismissFraction < RECENTS_SCALE_SECOND_THRESHOLD_FRACTION -> { + mapToRange( + dismissFraction, + RECENTS_SCALE_DISMISS_THRESHOLD_FRACTION, + RECENTS_SCALE_SECOND_THRESHOLD_FRACTION, + RECENTS_SCALE_ON_DISMISS_CANCEL, + RECENTS_SCALE_ON_DISMISS_SUCCESS, + LINEAR, + ) + } + // Keep scale beyond the dismiss threshold scaling consistent. + else -> { + RECENTS_SCALE_ON_DISMISS_SUCCESS + } + } + } + companion object { private const val DISMISS_THRESHOLD_FRACTION = 0.5f private const val DISMISS_THRESHOLD_HAPTIC_RANGE = 10f + + private const val RECENTS_SCALE_ON_DISMISS_CANCEL = 0.9875f + private const val RECENTS_SCALE_ON_DISMISS_SUCCESS = 0.975f + private const val RECENTS_SCALE_DEFAULT = 1f + private const val RECENTS_SCALE_FIRST_THRESHOLD_FRACTION = 0.2f + private const val RECENTS_SCALE_DISMISS_THRESHOLD_FRACTION = 0.5f + private const val RECENTS_SCALE_SECOND_THRESHOLD_FRACTION = 0.575f } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt index c740dadbcd..8ee552d046 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt @@ -53,6 +53,7 @@ CONTAINER : RecentsViewContainer { recentsView.pagedOrientationHandler.upDownSwipeDirection, ) private val isRtl = isRtl(container.resources) + private val downDirection = recentsView.pagedOrientationHandler.getDownDirection(isRtl) private var taskBeingDragged: TaskView? = null private var launchEndDisplacement: Float = 0f @@ -104,7 +105,11 @@ CONTAINER : RecentsViewContainer { } } onControllerTouchEvent(ev) - return detector.isDraggingState && !detector.wasInitialTouchPositive() + val downDirectionIsNegative = downDirection == SingleAxisSwipeDetector.DIRECTION_NEGATIVE + val wasInitialTouchDown = + (downDirectionIsNegative && !detector.wasInitialTouchPositive()) || + (!downDirectionIsNegative && detector.wasInitialTouchPositive()) + return detector.isDraggingState && wasInitialTouchDown } override fun onControllerTouchEvent(ev: MotionEvent) = detector.onTouchEvent(ev) @@ -120,15 +125,12 @@ CONTAINER : RecentsViewContainer { } ?.also { verticalFactor = - recentsView.pagedOrientationHandler.secondaryTranslationDirectionFactor + recentsView.pagedOrientationHandler.getTaskDragDisplacementFactor(isRtl) } if (!canTaskLaunchTaskView(taskBeingDragged)) { return false } - detector.setDetectableScrollConditions( - recentsView.pagedOrientationHandler.getDownDirection(isRtl), - /* ignoreSlop = */ false, - ) + detector.setDetectableScrollConditions(downDirection, /* ignoreSlop= */ false) return true } @@ -143,7 +145,10 @@ CONTAINER : RecentsViewContainer { recentsView.createTaskLaunchAnimation(taskBeingDragged, maxDuration, ZOOM_IN) // Since the thumbnail is what is filling the screen, based the end displacement on it. taskBeingDragged.getThumbnailBounds(tempRect, /* relativeToDragLayer= */ true) - launchEndDisplacement = (secondaryLayerDimension - tempRect.bottom).toFloat() + launchEndDisplacement = + recentsView.pagedOrientationHandler + .getTaskLaunchLength(secondaryLayerDimension, tempRect) + .toFloat() * verticalFactor playbackController = pendingAnimation.createPlaybackController()?.apply { taskViewRecentsTouchContext.onUserControlledAnimationCreated(this) @@ -163,8 +168,9 @@ CONTAINER : RecentsViewContainer { val isBeyondLaunchThreshold = abs(playbackController.progressFraction) > abs(LAUNCH_THRESHOLD_FRACTION) - val isFlingingTowardsLaunch = detector.isFling(velocity) && velocity > 0 - val isFlingingTowardsRestState = detector.isFling(velocity) && velocity < 0 + val velocityIsNegative = !recentsView.pagedOrientationHandler.isGoingUp(velocity, isRtl) + val isFlingingTowardsLaunch = detector.isFling(velocity) && velocityIsNegative + val isFlingingTowardsRestState = detector.isFling(velocity) && !velocityIsNegative val isLaunching = isFlingingTowardsLaunch || (isBeyondLaunchThreshold && !isFlingingTowardsRestState) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index b43c3ac6cc..c51f65942d 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -120,6 +120,7 @@ import com.android.launcher3.compat.AccessibilityManagerCompat; import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.logging.StatsLogManager.StatsLogger; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulContainer; import com.android.launcher3.taskbar.TaskbarThresholdUtils; @@ -223,6 +224,7 @@ public abstract class AbsSwipeUpHandler< mRecentsView = null; mContainer = null; mStateCallback.clearState(STATE_LAUNCHER_PRESENT); + mRecentsAnimationStartCallbacks.clear(); }; private static int FLAG_COUNT = 0; @@ -1112,6 +1114,9 @@ public abstract class AbsSwipeUpHandler< public void onGestureEnded(float endVelocityPxPerMs, PointF velocityPxPerMs) { float flingThreshold = mContext.getResources() .getDimension(R.dimen.quickstep_fling_threshold_speed); + Log.d(TAG, "onGestureEnded: mGestureStarted=" + mGestureStarted + + ", mIsMotionPaused=" + mIsMotionPaused + + ", flingThresholdPassed=" + (Math.abs(endVelocityPxPerMs) > flingThreshold)); boolean isFling = mGestureStarted && !mIsMotionPaused && Math.abs(endVelocityPxPerMs) > flingThreshold; mStateCallback.setStateOnUiThread(STATE_GESTURE_COMPLETED); @@ -1260,12 +1265,12 @@ public abstract class AbsSwipeUpHandler< dpiFromPx(velocityPxPerMs.x), dpiFromPx(velocityPxPerMs.y), Math.toDegrees(Math.atan2(-velocityPxPerMs.y, velocityPxPerMs.x))); - if (mGestureState.isHandlingAtomicEvent()) { // Button mode, this is only used to go to recents. return RECENTS; } + Log.d(TAG, "calculateEndTarget: isCancel=" + isCancel + ", isFlingY=" + isFlingY); GestureEndTarget endTarget; if (isCancel) { endTarget = LAST_TASK; @@ -1275,6 +1280,7 @@ public abstract class AbsSwipeUpHandler< endTarget = calculateEndTargetForNonFling(velocityPxPerMs); } + Log.d(TAG, "calculateEndTarget: endTarget(1)=" + endTarget); if (mDeviceState.isOverviewDisabled() && endTarget == RECENTS) { return LAST_TASK; } @@ -1293,6 +1299,7 @@ public abstract class AbsSwipeUpHandler< return LAST_TASK; } } + Log.d(TAG, "calculateEndTarget: endTarget(2)=" + endTarget); return endTarget; } @@ -1301,9 +1308,12 @@ public abstract class AbsSwipeUpHandler< final boolean willGoToNewTask = isScrollingToNewTask() && Math.abs(velocity.x) > Math.abs(endVelocity); final boolean isSwipeUp = endVelocity < 0; + Log.d(TAG, "calculateEndTargetForFlingY: willGoToNewTask=" + willGoToNewTask + + ", isSwipeUp=" + isSwipeUp); if (!isSwipeUp) { final boolean isCenteredOnNewTask = mRecentsView != null && mRecentsView.getDestinationPage() != mRecentsView.getRunningTaskIndex(); + Log.d(TAG, "calculateEndTargetForFlingY: isCenteredOnNewTask=" + isCenteredOnNewTask); return willGoToNewTask || isCenteredOnNewTask ? NEW_TASK : LAST_TASK; } @@ -1316,6 +1326,9 @@ public abstract class AbsSwipeUpHandler< // Fully gestural mode. final boolean isFlingX = Math.abs(velocity.x) > mContext.getResources() .getDimension(R.dimen.quickstep_fling_threshold_speed); + Log.d(TAG, "calculateEndTargetForNonFling: isScrollingToNewTask=" + isScrollingToNewTask + + ", isFlingX=" + isFlingX + + ", mIsMotionPaused=" + mIsMotionPaused); if (isScrollingToNewTask && isFlingX) { // Flinging towards new task takes precedence over mIsMotionPaused (which only // checks y-velocity). @@ -1325,6 +1338,7 @@ public abstract class AbsSwipeUpHandler< } else if (isScrollingToNewTask) { return NEW_TASK; } + Log.d(TAG, "calculateEndTargetForNonFling: mCanSlowSwipeGoHome=" + mCanSlowSwipeGoHome); return velocity.y < 0 && mCanSlowSwipeGoHome ? HOME : LAST_TASK; } @@ -1408,8 +1422,10 @@ public abstract class AbsSwipeUpHandler< } if (endTarget == HOME) { boolean isPinnedTaskbar = DisplayController.isPinnedTaskbar(mContext); + boolean isNotInDesktop = !DisplayController.isInDesktopMode(mContext); duration = mContainer != null && mContainer.getDeviceProfile().isTaskbarPresent - ? QuickstepTransitionManager.getTaskbarToHomeDuration(isPinnedTaskbar) + ? QuickstepTransitionManager.getTaskbarToHomeDuration( + isPinnedTaskbar && isNotInDesktop) : StaggeredWorkspaceAnim.DURATION_MS; SystemUiProxy.INSTANCE.get(mContext).updateContextualEduStats( mGestureState.isTrackpadGesture(), GestureType.HOME); @@ -1588,10 +1604,28 @@ public abstract class AbsSwipeUpHandler< mTaskAnimationManager.getCurrentCallbacks()); if (mParallelRunningAnim != null) { mParallelRunningAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + if (DisplayController.isInDesktopMode(mContext) + && mGestureState.getEndTarget() == HOME) { + // Set launcher animation started, so we don't notify from + // desktop visibility controller + DesktopVisibilityController.INSTANCE.get( + mContext).setLauncherAnimationRunning(true); + } + } + @Override public void onAnimationEnd(Animator animation) { mParallelRunningAnim = null; mStateCallback.setStateOnUiThread(STATE_PARALLEL_ANIM_FINISHED); + // Swipe to home animation finished, notify DesktopVisibilityController + // to recreate Taskbar + if (DisplayController.isInDesktopMode(mContext) + && mGestureState.getEndTarget() == HOME) { + DesktopVisibilityController.INSTANCE.get( + mContext).onLauncherAnimationFromDesktopEnd(); + } } }); mParallelRunningAnim.start(); @@ -1678,7 +1712,6 @@ public abstract class AbsSwipeUpHandler< if (mHandOffAnimationToHome) { handOffAnimation(velocityPxPerMs); } - windowAnim[0].addAnimatorListener(new AnimationSuccessListener() { @Override public void onAnimationSuccess(Animator animator) { diff --git a/quickstep/src/com/android/quickstep/DesktopFullscreenDrawParams.kt b/quickstep/src/com/android/quickstep/DesktopFullscreenDrawParams.kt index bafb0b2ca6..444e77d38d 100644 --- a/quickstep/src/com/android/quickstep/DesktopFullscreenDrawParams.kt +++ b/quickstep/src/com/android/quickstep/DesktopFullscreenDrawParams.kt @@ -17,7 +17,7 @@ package com.android.quickstep import android.content.Context -import com.android.systemui.shared.system.QuickStepContract +import com.android.launcher3.R // DesktopTaskView thumbnail's corner radius is independent of fullscreenProgress. open class DesktopFullscreenDrawParams @@ -28,6 +28,6 @@ constructor(context: Context, cornerRadiusProvider: (Context) -> Float = ::compu // computeCornerRadius is used as cornerRadiusProvider, so // QuickStepContract::getWindowCornerRadius can be mocked properly. private fun computeCornerRadius(context: Context): Float = - QuickStepContract.getWindowCornerRadius(context) + context.resources.getDimension(R.dimen.desktop_windowing_freeform_rounded_corner_radius) } } diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java index be0a3390bf..783ec2c7da 100644 --- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java +++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java @@ -514,7 +514,13 @@ public class LauncherBackAnimationController { private void finishAnimation() { mLauncher.setPredictiveBackToHomeInProgress(false); + if (mBackTarget != null && mBackTarget.leash.isValid()) { + mBackTarget.leash.release(); + } mBackTarget = null; + if (mLauncherTarget != null && mLauncherTarget.leash.isValid()) { + mLauncherTarget.leash.release(); + } mLauncherTarget = null; mBackInProgress = false; mBackProgress = 0; diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt index 42aa86e9e0..afdb403897 100644 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt @@ -293,10 +293,6 @@ constructor( val recentsView: RecentsView<*, *>? = recentsViewContainer?.getOverviewPanel() val deviceProfile = recentsViewContainer?.getDeviceProfile() val uiController = containerInterface.getTaskbarController() - val allowQuickSwitch = - uiController != null && - deviceProfile != null && - (deviceProfile.isTablet || deviceProfile.isTwoPanels) val focusedDisplayId = focusState.focusedDisplayId val focusedDisplayUIController: TaskbarUIController? = @@ -322,26 +318,26 @@ constructor( when (command.type) { HIDE -> { - if (!allowQuickSwitch) return true + if (uiController == null || deviceProfile?.isTablet == false) return true keyboardTaskFocusIndex = if ( enableAltTabKqsOnConnectedDisplays() && focusedDisplayUIController != null ) { focusedDisplayUIController.launchFocusedTask() } else { - uiController!!.launchFocusedTask() + uiController.launchFocusedTask() } if (keyboardTaskFocusIndex == -1) return true } KEYBOARD_INPUT -> - if (allowQuickSwitch) { + if (uiController != null && deviceProfile?.isTablet == true) { if ( enableAltTabKqsOnConnectedDisplays() && focusedDisplayUIController != null ) { focusedDisplayUIController.openQuickSwitchView() } else { - uiController!!.openQuickSwitchView() + uiController.openQuickSwitchView() } return true } else { @@ -365,7 +361,11 @@ constructor( TOGGLE -> {} } - recentsView?.setKeyboardTaskFocusIndex(keyboardTaskFocusIndex) + recentsView?.setKeyboardTaskFocusIndex( + recentsView.indexOfChild(recentsView.taskViews.elementAtOrNull(keyboardTaskFocusIndex)) + ?: -1 + ) + // Handle recents view focus when launching from home val animatorListener: Animator.AnimatorListener = object : AnimatorListenerAdapter() { @@ -526,7 +526,7 @@ constructor( // Stops requesting focused after first view gets focused. recentsView.getTaskViewAt(keyboardTaskFocusIndex).requestFocus() || recentsView.nextTaskView.requestFocus() || - recentsView.getFirstTaskView().requestFocus() || + recentsView.firstTaskView.requestFocus() || recentsView.requestFocus() } diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java index 9b0e75ce5e..f47937cea4 100644 --- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java +++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java @@ -177,7 +177,7 @@ public class QuickstepTestInformationHandler extends TestInformationHandler { case TestProtocol.REQUEST_RECREATE_TASKBAR: // Allow null-pointer to catch illegal states. - runOnTISBinder(tisBinder -> tisBinder.getTaskbarManager().recreateTaskbar()); + runOnTISBinder(tisBinder -> tisBinder.getTaskbarManager().recreateTaskbars()); return response; case TestProtocol.REQUEST_TASKBAR_IME_DOCKED: return getTISBinderUIProperty(Bundle::putBoolean, tisBinder -> diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java index bb72408690..f506039a1b 100644 --- a/quickstep/src/com/android/quickstep/RecentTasksList.java +++ b/quickstep/src/com/android/quickstep/RecentTasksList.java @@ -21,7 +21,7 @@ import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static com.android.launcher3.Flags.enableSeparateExternalDisplayTasks; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.quickstep.util.SplitScreenUtils.convertShellSplitBoundsToLauncher; -import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_FREEFORM; +import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_DESK; import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_SPLIT; import android.app.ActivityManager.RunningTaskInfo; @@ -32,10 +32,12 @@ import android.content.Context; import android.os.Process; import android.os.RemoteException; import android.util.SparseBooleanArray; +import android.window.DesktopExperienceFlags; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.util.LooperExecutor; import com.android.launcher3.util.SplitConfigurationOptions; import com.android.quickstep.util.DesktopTask; @@ -351,15 +353,23 @@ public class RecentTasksList { TaskLoadResult allTasks = new TaskLoadResult(requestId, loadKeysOnly, rawTasks.size()); - int numVisibleTasks = 0; + boolean isFirstVisibleTaskFound = false; for (GroupedTaskInfo rawTask : rawTasks) { - if (rawTask.isBaseType(TYPE_FREEFORM)) { - // TYPE_FREEFORM tasks is only created when desktop mode can be entered, - // leftover TYPE_FREEFORM tasks created when flag was on should be ignored. + if (rawTask.isBaseType(TYPE_DESK)) { + // TYPE_DESK tasks is only created when desktop mode can be entered, + // leftover TYPE_DESK tasks created when flag was on should be ignored. if (DesktopModeStatus.canEnterDesktopMode(mContext)) { List desktopTasks = createDesktopTasks( rawTask.getBaseGroupedTask()); allTasks.addAll(desktopTasks); + + // If any task in desktop group task is visible, set isFirstVisibleTaskFound to + // true. This way if there is a transparent task in the list later on, it does + // not get its own tile in Overview. + if (rawTask.getBaseGroupedTask().getTaskInfoList().stream().anyMatch( + taskInfo -> taskInfo.isVisible)) { + isFirstVisibleTaskFound = true; + } } continue; } @@ -400,7 +410,7 @@ public class RecentTasksList { tmpLockedUsers.get(task2Key.userId) /* isLocked */); } else { // Is fullscreen task - if (numVisibleTasks > 0) { + if (isFirstVisibleTaskFound) { boolean isExcluded = (taskInfo1.baseIntent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0; if (taskInfo1.isTopActivityTransparent && isExcluded) { @@ -411,7 +421,7 @@ public class RecentTasksList { } } if (taskInfo1.isVisible) { - numVisibleTasks++; + isFirstVisibleTaskFound = true; } if (task2 != null) { Objects.requireNonNull(rawTask.getSplitBounds()); @@ -442,7 +452,11 @@ public class RecentTasksList { Set minimizedTaskIds = minimizedTaskIdArray != null ? CollectionsKt.toSet(ArraysKt.asIterable(minimizedTaskIdArray)) : Collections.emptySet(); - if (enableSeparateExternalDisplayTasks()) { + if (enableSeparateExternalDisplayTasks() + && !DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue()) { + // This code is not needed when the multiple desktop feature is enabled, since Shell + // will send a single `GroupedTaskInfo` for each desk with a unique `deskId` across + // all displays. Map> perDisplayTasks = new HashMap<>(); for (TaskInfo taskInfo : recentTaskInfo.getTaskInfoList()) { Task task = createTask(taskInfo, minimizedTaskIds); @@ -450,11 +464,16 @@ public class RecentTasksList { k -> new ArrayList<>()); tasks.add(task); } - return MapsKt.map(perDisplayTasks, it -> new DesktopTask(it.getValue())); + // When the multiple desktop feature is disabled, there can only be up to a single desk + // on each display, The desk ID doesn't matter and should not be used. + return MapsKt.map(perDisplayTasks, + it -> new DesktopTask(DesktopVisibilityController.INACTIVE_DESK_ID, + it.getValue())); } else { + final int deskId = recentTaskInfo.getDeskId(); List tasks = CollectionsKt.map(recentTaskInfo.getTaskInfoList(), it -> createTask(it, minimizedTaskIds)); - return List.of(new DesktopTask(tasks)); + return List.of(new DesktopTask(deskId, tasks)); } } diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index 090ccdc869..74f24ee3e7 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -88,6 +88,9 @@ import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; import java.io.PrintWriter; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import javax.inject.Inject; @@ -119,6 +122,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E InputMethodService.canImeRenderGesturalNavButtons(); private @SystemUiStateFlags long mSystemUiStateFlags = QuickStepContract.SYSUI_STATE_AWAKE; + private final Map mSysUIStateFlagsPerDisplay = new ConcurrentHashMap<>(); private NavigationMode mMode = THREE_BUTTONS; private NavBarPosition mNavBarPosition; @@ -353,21 +357,50 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E } /** - * Updates the system ui state flags from SystemUI. + * Updates the system ui state flags from SystemUI for a specific display. + * + * @param stateFlags the current {@link SystemUiStateFlags} for the display. + * @param displayId the display's ID. */ - public void setSystemUiFlags(@SystemUiStateFlags long stateFlags) { - mSystemUiStateFlags = stateFlags; + public void setSysUIStateFlagsForDisplay(@SystemUiStateFlags long stateFlags, + int displayId) { + mSysUIStateFlagsPerDisplay.put(displayId, stateFlags); } /** - * @return the system ui state flags. + * Clears the system ui state flags for a specific display. This is called when the display is + * destroyed. + * + * @param displayId the display's ID. + */ + public void clearSysUIStateFlagsForDisplay(int displayId) { + mSysUIStateFlagsPerDisplay.remove(displayId); + } + + /** + * @return the system ui state flags for the default display. */ // TODO(141886704): See if we can remove this @SystemUiStateFlags - public long getSystemUiStateFlags() { - return mSystemUiStateFlags; + public long getSysuiStateFlag() { + return getSystemUiStateFlags(DEFAULT_DISPLAY); } + /** + * @return the system ui state flags for a given display ID. + */ + @SystemUiStateFlags + public long getSystemUiStateFlags(int displayId) { + return mSysUIStateFlagsPerDisplay.getOrDefault(displayId, + QuickStepContract.SYSUI_STATE_AWAKE); + } + + /** + * @return the display ids that have sysui state. + */ + public Set getDisplaysWithSysUIState() { + return mSysUIStateFlagsPerDisplay.keySet(); + } /** * Sets the flag that indicates whether a predictive back-to-home animation is in progress */ @@ -386,8 +419,8 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E * @return whether SystemUI is in a state where we can start a system gesture. */ public boolean canStartSystemGesture() { - boolean canStartWithNavHidden = (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0 - || (mSystemUiStateFlags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0 + boolean canStartWithNavHidden = (getSysuiStateFlag() & SYSUI_STATE_NAV_BAR_HIDDEN) == 0 + || (getSysuiStateFlag() & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0 || mRotationTouchHelper.isTaskListFrozen(); return canStartWithNavHidden && canStartAnyGesture(); } @@ -399,7 +432,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E */ public boolean canStartTrackpadGesture() { boolean trackpadGesturesEnabled = - (mSystemUiStateFlags & SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED) == 0; + (getSysuiStateFlag() & SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED) == 0; return trackpadGesturesEnabled && canStartAnyGesture(); } @@ -407,8 +440,8 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E * Common logic to determine if either trackpad or finger gesture can be started */ private boolean canStartAnyGesture() { - boolean homeOrOverviewEnabled = (mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0 - || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0; + boolean homeOrOverviewEnabled = (getSysuiStateFlag() & SYSUI_STATE_HOME_DISABLED) == 0 + || (getSysuiStateFlag() & SYSUI_STATE_OVERVIEW_DISABLED) == 0; long gestureDisablingStates = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING | SYSUI_STATE_QUICK_SETTINGS_EXPANDED @@ -416,7 +449,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E | SYSUI_STATE_DEVICE_DREAMING | SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION | SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING; - return (gestureDisablingStates & mSystemUiStateFlags) == 0 && homeOrOverviewEnabled; + return (gestureDisablingStates & getSysuiStateFlag()) == 0 && homeOrOverviewEnabled; } /** @@ -424,35 +457,35 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E * (like camera or maps) */ public boolean isKeyguardShowingOccluded() { - return (mSystemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0; } /** * @return whether screen pinning is enabled and active */ public boolean isScreenPinningActive() { - return (mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_SCREEN_PINNING) != 0; } /** * @return whether assistant gesture is constraint */ public boolean isAssistantGestureIsConstrained() { - return (mSystemUiStateFlags & SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED) != 0; } /** * @return whether the bubble stack is expanded */ public boolean isBubblesExpanded() { - return (mSystemUiStateFlags & SYSUI_STATE_BUBBLES_EXPANDED) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_BUBBLES_EXPANDED) != 0; } /** * @return whether the global actions dialog is showing */ public boolean isSystemUiDialogShowing() { - return (mSystemUiStateFlags & SYSUI_STATE_DIALOG_SHOWING) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_DIALOG_SHOWING) != 0; } /** @@ -466,35 +499,35 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E * @return whether the accessibility menu is available. */ public boolean isAccessibilityMenuAvailable() { - return (mSystemUiStateFlags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0; } /** * @return whether the accessibility menu shortcut is available. */ public boolean isAccessibilityMenuShortcutAvailable() { - return (mSystemUiStateFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0; } /** * @return whether home is disabled (either by SUW/SysUI/device policy) */ public boolean isHomeDisabled() { - return (mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_HOME_DISABLED) != 0; } /** * @return whether overview is disabled (either by SUW/SysUI/device policy) */ public boolean isOverviewDisabled() { - return (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_OVERVIEW_DISABLED) != 0; } /** * @return whether one-handed mode is enabled and active */ public boolean isOneHandedModeActive() { - return (mSystemUiStateFlags & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0; + return (getSysuiStateFlag() & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0; } /** @@ -557,7 +590,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E */ public boolean canTriggerAssistantAction(MotionEvent ev) { return mAssistantAvailable - && !QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags) + && !QuickStepContract.isAssistantGestureDisabled(getSysuiStateFlag()) && mRotationTouchHelper.touchInAssistantRegion(ev) && !isTrackpadScroll(ev) && !isLockToAppActive(); @@ -597,7 +630,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E /** Returns whether IME is rendering nav buttons, and IME is currently showing. */ public boolean isImeRenderingNavButtons() { return mCanImeRenderGesturalNavButtons && mMode == NO_BUTTON - && ((mSystemUiStateFlags & SYSUI_STATE_IME_VISIBLE) != 0); + && ((getSysuiStateFlag() & SYSUI_STATE_IME_VISIBLE) != 0); } /** @@ -629,24 +662,37 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E return touchSlop * touchSlop; } + /** Returns a string representation of the system ui state flags for the default display. */ public String getSystemUiStateString() { - return QuickStepContract.getSystemUiStateString(mSystemUiStateFlags); + return getSystemUiStateString(getSysuiStateFlag()); + } + + /** Returns a string representation of the system ui state flags. */ + public String getSystemUiStateString(long flags) { + return QuickStepContract.getSystemUiStateString(flags); } public void dump(PrintWriter pw) { pw.println("DeviceState:"); pw.println(" canStartSystemGesture=" + canStartSystemGesture()); - pw.println(" systemUiFlags=" + mSystemUiStateFlags); + pw.println(" systemUiFlagsForDefaultDisplay=" + getSysuiStateFlag()); pw.println(" systemUiFlagsDesc=" + getSystemUiStateString()); pw.println(" assistantAvailable=" + mAssistantAvailable); pw.println(" assistantDisabled=" - + QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags)); + + QuickStepContract.isAssistantGestureDisabled(getSysuiStateFlag())); pw.println(" isOneHandedModeEnabled=" + mIsOneHandedModeEnabled); pw.println(" isSwipeToNotificationEnabled=" + mIsSwipeToNotificationEnabled); pw.println(" deferredGestureRegion=" + mDeferredGestureRegion.getBounds()); pw.println(" exclusionRegion=" + mExclusionRegion.getBounds()); pw.println(" pipIsActive=" + mPipIsActive); pw.println(" predictiveBackToHomeInProgress=" + mIsPredictiveBackToHomeInProgress); + for (int displayId : mSysUIStateFlagsPerDisplay.keySet()) { + pw.println(" systemUiFlagsForDisplay" + displayId + "=" + getSystemUiStateFlags( + displayId)); + pw.println(" systemUiFlagsForDisplay" + displayId + "Desc=" + getSystemUiStateString( + getSystemUiStateFlags(displayId))); + } + pw.println(" RotationTouchHelper:"); mRotationTouchHelper.dump(pw); } } diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java index a614327e9d..ae6cfa005b 100644 --- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java +++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java @@ -142,15 +142,17 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { mContext = context; mDisplayController = displayController; mSystemUiProxy = systemUiProxy; + // TODO (b/398195845): this needs updating so non-default displays do not rotate with the + // default display. mDisplayId = DEFAULT_DISPLAY; Resources resources = mContext.getResources(); mOrientationTouchTransformer = new OrientationTouchTransformer(resources, mMode, () -> QuickStepContract.getWindowCornerRadius(mContext)); - // Register for navigation mode changes - mDisplayController.addChangeListener(this); - DisplayController.Info info = mDisplayController.getInfo(); + // Register for navigation mode and rotation changes + mDisplayController.addChangeListenerForDisplay(this, mDisplayId); + DisplayController.Info info = mDisplayController.getInfoForDisplay(mDisplayId); onDisplayInfoChanged(context, info, CHANGE_ALL); mOrientationListener = new OrientationEventListener(mContext) { @@ -174,7 +176,7 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { }; lifeCycle.addCloseable(() -> { - mDisplayController.removeChangeListener(this); + mDisplayController.removeChangeListenerForDisplay(this, mDisplayId); mOrientationListener.disable(); TaskStackChangeListeners.getInstance() .unregisterTaskStackListener(mFrozenTaskListener); @@ -201,7 +203,8 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { return; } - mOrientationTouchTransformer.createOrAddTouchRegion(mDisplayController.getInfo(), + mOrientationTouchTransformer.createOrAddTouchRegion( + mDisplayController.getInfoForDisplay(mDisplayId), "RTH.updateGestureTouchRegions"); } @@ -258,7 +261,8 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { if ((flags & CHANGE_NAVIGATION_MODE) != 0) { NavigationMode newMode = info.getNavigationMode(); - mOrientationTouchTransformer.setNavigationMode(newMode, mDisplayController.getInfo(), + mOrientationTouchTransformer.setNavigationMode(newMode, + mDisplayController.getInfoForDisplay(mDisplayId), mContext.getResources()); TaskStackChangeListeners.getInstance() @@ -280,7 +284,8 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { */ void setGesturalHeight(int newGesturalHeight) { mOrientationTouchTransformer.setGesturalHeight( - newGesturalHeight, mDisplayController.getInfo(), mContext.getResources()); + newGesturalHeight, mDisplayController.getInfoForDisplay(mDisplayId), + mContext.getResources()); } /** @@ -296,7 +301,8 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { } private void enableMultipleRegions(boolean enable) { - mOrientationTouchTransformer.enableMultipleRegions(enable, mDisplayController.getInfo()); + mOrientationTouchTransformer.enableMultipleRegions(enable, + mDisplayController.getInfoForDisplay(mDisplayId)); notifySysuiOfCurrentRotation(mOrientationTouchTransformer.getQuickStepStartingRotation()); if (enable && !mInOverview && !TestProtocol.sDisableSensorRotation) { // Clear any previous state from sensor manager @@ -359,7 +365,8 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { * notifies system UI of the primary rotation the user is interacting with */ private void toggleSecondaryNavBarsForRotation() { - mOrientationTouchTransformer.setSingleActiveRegion(mDisplayController.getInfo()); + mOrientationTouchTransformer.setSingleActiveRegion( + mDisplayController.getInfoForDisplay(mDisplayId)); notifySysuiOfCurrentRotation(mOrientationTouchTransformer.getCurrentActiveRotation()); } diff --git a/quickstep/src/com/android/quickstep/SimpleOrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/SimpleOrientationTouchTransformer.java index d2a491dd24..de7fb89ebe 100644 --- a/quickstep/src/com/android/quickstep/SimpleOrientationTouchTransformer.java +++ b/quickstep/src/com/android/quickstep/SimpleOrientationTouchTransformer.java @@ -15,6 +15,8 @@ */ package com.android.quickstep; +import static android.view.Display.DEFAULT_DISPLAY; + import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN; import static com.android.launcher3.util.DisplayController.CHANGE_ALL; import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION; @@ -42,15 +44,20 @@ public class SimpleOrientationTouchTransformer implements private OrientationRectF mOrientationRectF; private OrientationRectF mTouchingOrientationRectF; private int mViewRotation; + private final int mDisplayId; @Inject public SimpleOrientationTouchTransformer(@ApplicationContext Context context, DisplayController displayController, DaggerSingletonTracker tracker) { - displayController.addChangeListener(this); - tracker.addCloseable(() -> displayController.removeChangeListener(this)); + // TODO (b/398195845): make sure non-default displays don't get affected by default display + // changes. + mDisplayId = DEFAULT_DISPLAY; + displayController.addChangeListenerForDisplay(this, mDisplayId); + tracker.addCloseable( + () -> displayController.removeChangeListenerForDisplay(this, mDisplayId)); - onDisplayInfoChanged(context, displayController.getInfo(), CHANGE_ALL); + onDisplayInfoChanged(context, displayController.getInfoForDisplay(mDisplayId), CHANGE_ALL); } @Override diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.kt b/quickstep/src/com/android/quickstep/SystemUiProxy.kt index 1f3eb2a347..0f6649b81b 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.kt +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.kt @@ -655,20 +655,28 @@ class SystemUiProxy @Inject constructor(@ApplicationContext private val context: * Tells SysUI to show a shortcut bubble. * * @param info the shortcut info used to create or identify the bubble. + * @param bubbleBarLocation the optional location of the bubble bar. */ - fun showShortcutBubble(info: ShortcutInfo?) = + @JvmOverloads + fun showShortcutBubble(info: ShortcutInfo?, bubbleBarLocation: BubbleBarLocation? = null) = executeWithErrorLog({ "Failed call showShortcutBubble" }) { - bubbles?.showShortcutBubble(info) + bubbles?.showShortcutBubble(info, bubbleBarLocation) } /** * Tells SysUI to show a bubble of an app. * * @param intent the intent used to create the bubble. + * @param bubbleBarLocation the optional location of the bubble bar. */ - fun showAppBubble(intent: Intent?, user: UserHandle) = + @JvmOverloads + fun showAppBubble( + intent: Intent?, + user: UserHandle, + bubbleBarLocation: BubbleBarLocation? = null, + ) = executeWithErrorLog({ "Failed call showAppBubble" }) { - bubbles?.showAppBubble(intent, user) + bubbles?.showAppBubble(intent, user, bubbleBarLocation) } /** Tells SysUI to show the expanded view. */ diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index 98103087ed..cb11afa509 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -286,8 +286,32 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn mCallbacks.addListener(listener); final ActivityOptions options = ActivityOptions.makeBasic(); + options.setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS); + options.setTransientLaunch(); + options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_RECENTS_ANIMATION, eventTime); + + // Notify taskbar that we should skip reacting to launcher visibility change to + // avoid a jumping taskbar. + TaskbarUIController taskbarUIController = containerInterface.getTaskbarController(); + if (enableScalingRevealHomeAnimation() && taskbarUIController != null) { + taskbarUIController.setSkipLauncherVisibilityChange(true); + + mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { + @Override + public void onRecentsAnimationCanceled( + @NonNull HashMap thumbnailDatas) { + taskbarUIController.setSkipLauncherVisibilityChange(false); + } + + @Override + public void onRecentsAnimationFinished( + @NonNull RecentsAnimationController controller) { + taskbarUIController.setSkipLauncherVisibilityChange(false); + } + }); + } - // TODO:(b/365777482) if flag is enabled, but on launcher it will crash. if(containerInterface.getCreatedContainer() instanceof RecentsWindowManager && (Flags.enableFallbackOverviewInWindow() || Flags.enableLauncherOverviewInWindow())) { @@ -297,32 +321,6 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn .getRecentsWindowManager(mDeviceState.getDisplayId()) .startRecentsWindow(mCallbacks); } else { - options.setPendingIntentBackgroundActivityStartMode( - ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS); - options.setTransientLaunch(); - options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_RECENTS_ANIMATION, eventTime); - - // Notify taskbar that we should skip reacting to launcher visibility change to - // avoid a jumping taskbar. - TaskbarUIController taskbarUIController = containerInterface.getTaskbarController(); - if (enableScalingRevealHomeAnimation() && taskbarUIController != null) { - taskbarUIController.setSkipLauncherVisibilityChange(true); - - mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { - @Override - public void onRecentsAnimationCanceled( - @NonNull HashMap thumbnailDatas) { - taskbarUIController.setSkipLauncherVisibilityChange(false); - } - - @Override - public void onRecentsAnimationFinished( - @NonNull RecentsAnimationController controller) { - taskbarUIController.setSkipLauncherVisibilityChange(false); - } - }); - } - mRecentsAnimationStartPending = getSystemUiProxy().startRecentsActivity(intent, options, mCallbacks, false /* useSyntheticRecentsTransition */); } diff --git a/quickstep/src/com/android/quickstep/TaskIconCache.kt b/quickstep/src/com/android/quickstep/TaskIconCache.kt index 6a7f1afb84..f0b9b7be5c 100644 --- a/quickstep/src/com/android/quickstep/TaskIconCache.kt +++ b/quickstep/src/com/android/quickstep/TaskIconCache.kt @@ -72,6 +72,8 @@ class TaskIconCache( var taskVisualsChangeListener: TaskVisualsChangeListener? = null init { + // TODO (b/397205964): this will need to be updated when we support caches for different + // displays. displayController.addChangeListener(this) } diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index a69d472600..f92581e117 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -312,7 +312,7 @@ public interface TaskShortcutFactory { RecentsView recentsView = taskView.getRecentsView(); if (recentsView != null) { dismissTaskMenuView(); - recentsView.dismissTask(taskView, true, true); + recentsView.dismissTaskView(taskView, true, true); mTarget.getStatsLogManager().logger().withItemInfo(mTaskContainer.getItemInfo()) .log(LAUNCHER_SYSTEM_SHORTCUT_CLOSE_APP_TAP); } diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java index 35a6e72378..37c2d1c17b 100644 --- a/quickstep/src/com/android/quickstep/TaskViewUtils.java +++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java @@ -38,6 +38,7 @@ import static com.android.launcher3.QuickstepTransitionManager.SPLIT_DIVIDER_ANI import static com.android.launcher3.QuickstepTransitionManager.SPLIT_LAUNCH_DURATION; import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor; import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; +import static com.android.quickstep.BaseContainerInterface.getTaskDimension; import static com.android.quickstep.util.AnimUtils.clampToDuration; import static com.android.wm.shell.shared.TransitionUtil.TYPE_SPLIT_SCREEN_DIM_LAYER; @@ -65,6 +66,7 @@ import androidx.annotation.Nullable; import com.android.app.animation.Interpolators; import com.android.internal.jank.Cuj; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; @@ -102,6 +104,11 @@ public final class TaskViewUtils { private TaskViewUtils() {} + private static final Rect TEMP_THUMBNAIL_BOUNDS = new Rect(); + private static final Rect TEMP_FULLSCREEN_BOUNDS = new Rect(); + private static final PointF TEMP_TASK_DIMENSION = new PointF(); + private static final PointF TEMP_PIVOT = new PointF(); + /** * Try to find a TaskView that corresponds with the component of the launched view. * @@ -164,7 +171,7 @@ public final class TaskViewUtils { public static > void createRecentsWindowAnimator( @NonNull RecentsView recentsView, - @NonNull TaskView v, + @NonNull TaskView taskView, boolean skipViewChanges, @NonNull RemoteAnimationTarget[] appTargets, @NonNull RemoteAnimationTarget[] wallpaperTargets, @@ -172,31 +179,31 @@ public final class TaskViewUtils { @Nullable DepthController depthController, @Nullable TransitionInfo transitionInfo, PendingAnimation out) { - boolean isQuickSwitch = v.isEndQuickSwitchCuj(); - v.setEndQuickSwitchCuj(false); + boolean isQuickSwitch = taskView.isEndQuickSwitchCuj(); + taskView.setEndQuickSwitchCuj(false); final RemoteAnimationTargets targets = new RemoteAnimationTargets(appTargets, wallpaperTargets, nonAppTargets, MODE_OPENING); final RemoteAnimationTarget navBarTarget = targets.getNavBarRemoteAnimationTarget(); - SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v); + SurfaceTransactionApplier applier = new SurfaceTransactionApplier(taskView); targets.addReleaseCheck(applier); RemoteTargetHandle[] remoteTargetHandles; RemoteTargetHandle[] recentsViewHandles = recentsView.getRemoteTargetHandles(); - if (v.isRunningTask() && recentsViewHandles != null) { + if (taskView.isRunningTask() && recentsViewHandles != null) { // Re-use existing handles remoteTargetHandles = recentsViewHandles; } else { - boolean forDesktop = v instanceof DesktopTaskView; - RemoteTargetGluer gluer = new RemoteTargetGluer(v.getContext(), + boolean forDesktop = taskView instanceof DesktopTaskView; + RemoteTargetGluer gluer = new RemoteTargetGluer(taskView.getContext(), recentsView.getSizeStrategy(), targets, forDesktop); if (forDesktop) { remoteTargetHandles = gluer.assignTargetsForDesktop(targets, transitionInfo); - } else if (v.containsMultipleTasks()) { + } else if (taskView.containsMultipleTasks()) { remoteTargetHandles = gluer.assignTargetsForSplitScreen(targets, - ((GroupedTaskView) v).getSplitBoundsConfig()); + ((GroupedTaskView) taskView).getSplitBoundsConfig()); } else { remoteTargetHandles = gluer.assignTargets(targets); } @@ -210,8 +217,8 @@ public final class TaskViewUtils { remoteTargetHandle.getTransformParams().setSyncTransactionApplier(applier); } - int taskIndex = recentsView.indexOfChild(v); - Context context = v.getContext(); + int taskIndex = recentsView.indexOfChild(taskView); + Context context = taskView.getContext(); T container = RecentsViewContainer.containerFromContext(context); DeviceProfile dp = container.getDeviceProfile(); @@ -219,11 +226,11 @@ public final class TaskViewUtils { boolean parallaxCenterAndAdjacentTask = !showAsGrid && taskIndex != recentsView.getCurrentPage(); int taskRectTranslationPrimary = recentsView.getScrollOffset(taskIndex); - int taskRectTranslationSecondary = showAsGrid ? (int) v.getGridTranslationY() : 0; + int taskRectTranslationSecondary = showAsGrid ? (int) taskView.getGridTranslationY() : 0; RemoteTargetHandle[] topMostSimulators = null; - if (!v.isRunningTask()) { + if (!taskView.isRunningTask()) { // TVSs already initialized from the running task, no need to re-init for (RemoteTargetHandle targetHandle : remoteTargetHandles) { TaskViewSimulator tvsLocal = targetHandle.getTaskViewSimulator(); @@ -237,13 +244,13 @@ public final class TaskViewUtils { tvsLocal.fullScreenProgress.value = 0; tvsLocal.recentsViewScale.value = 1; if (!enableGridOnlyOverview()) { - tvsLocal.setIsGridTask(v.isGridTask()); + tvsLocal.setIsGridTask(taskView.isGridTask()); } tvsLocal.getOrientationState().getOrientationHandler().set(tvsLocal, TaskViewSimulator::setTaskRectTranslation, taskRectTranslationPrimary, taskRectTranslationSecondary); - if (v instanceof DesktopTaskView) { + if (taskView instanceof DesktopTaskView) { targetHandle.getTransformParams().setTargetAlpha(1f); } else { // Fade in the task during the initial 20% of the animation @@ -260,8 +267,11 @@ public final class TaskViewUtils { out.setFloat(tvsLocal.recentsViewScale, AnimatedFloat.VALUE, tvsLocal.getFullScreenScale(), TOUCH_RESPONSE); - out.setFloat(tvsLocal.recentsViewScroll, AnimatedFloat.VALUE, 0, - TOUCH_RESPONSE); + if (!enableGridOnlyOverview()) { + out.setFloat(tvsLocal.recentsViewScroll, AnimatedFloat.VALUE, 0, + TOUCH_RESPONSE); + } + out.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { @@ -271,6 +281,18 @@ public final class TaskViewUtils { showTransaction.getTransaction().show(targets.apps[i].leash); } applier.scheduleApply(showTransaction); + + if (enableGridOnlyOverview()) { + taskView.getThumbnailBounds(TEMP_THUMBNAIL_BOUNDS, /*relativeToDragLayer=*/ + true); + getTaskDimension(context, container.getDeviceProfile(), + TEMP_TASK_DIMENSION); + TEMP_FULLSCREEN_BOUNDS.set(0, 0, (int) TEMP_TASK_DIMENSION.x, + (int) TEMP_TASK_DIMENSION.y); + Utilities.getPivotsForScalingRectToRect(TEMP_THUMBNAIL_BOUNDS, + TEMP_FULLSCREEN_BOUNDS, TEMP_PIVOT); + tvsLocal.setPivotOverride(TEMP_PIVOT); + } } }); out.addOnFrameCallback(() -> { @@ -321,7 +343,7 @@ public final class TaskViewUtils { if (!skipViewChanges && parallaxCenterAndAdjacentTask && topMostSimulators != null && topMostSimulators.length > 0) { - out.addFloat(v, VIEW_ALPHA, 1, 0, clampToProgress(LINEAR, 0.2f, 0.4f)); + out.addFloat(taskView, VIEW_ALPHA, 1, 0, clampToProgress(LINEAR, 0.2f, 0.4f)); RemoteTargetHandle[] simulatorCopies = topMostSimulators; for (RemoteTargetHandle handle : simulatorCopies) { @@ -340,7 +362,7 @@ public final class TaskViewUtils { // During animation we apply transformation on the thumbnailView (and not the rootView) // to follow the TaskViewSimulator. So the final matrix applied on the thumbnailView is: // Mt K(0)` K(t) Mt` - View[] thumbnails = v.getSnapshotViews(); + View[] thumbnails = taskView.getSnapshotViews(); // In case simulator copies and thumbnail size do no match, ensure we get the lesser. // This ensures we do not create arrays with empty elements or attempt to references diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index ba4c65a293..ffc0770ba2 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -53,6 +53,7 @@ import android.os.RemoteException; import android.os.SystemClock; import android.util.Log; import android.view.Choreographer; +import android.view.Display; import android.view.InputDevice; import android.view.InputEvent; import android.view.MotionEvent; @@ -274,11 +275,12 @@ public class TouchInteractionService extends Service { } @BinderThread - public void onSystemUiStateChanged(@SystemUiStateFlags long stateFlags) { + public void onSystemUiStateChanged(@SystemUiStateFlags long stateFlags, int displayId) { MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> { - long lastFlags = tis.mDeviceState.getSystemUiStateFlags(); - tis.mDeviceState.setSystemUiFlags(stateFlags); - tis.onSystemUiFlagsChanged(lastFlags); + // Last flags is only used for the default display case. + long lastFlags = tis.mDeviceState.getSysuiStateFlag(); + tis.mDeviceState.setSysUIStateFlagsForDisplay(stateFlags, displayId); + tis.onSystemUiFlagsChanged(lastFlags, displayId); })); } @@ -312,6 +314,9 @@ public class TouchInteractionService extends Service { public void onDisplayRemoved(int displayId) { executeForTaskbarManager(taskbarManager -> taskbarManager.onDisplayRemoved(displayId)); + executeForTouchInteractionService(tis -> { + tis.mDeviceState.clearSysUIStateFlagsForDisplay(displayId); + }); } @BinderThread @@ -649,7 +654,9 @@ public class TouchInteractionService extends Service { mResetGestureInputConsumer = new ResetGestureInputConsumer( mTaskAnimationManager, mTaskbarManager::getCurrentActivityContext); mInputConsumer.registerInputConsumer(); - onSystemUiFlagsChanged(mDeviceState.getSystemUiStateFlags()); + for (int displayId : mDeviceState.getDisplaysWithSysUIState()) { + onSystemUiFlagsChanged(mDeviceState.getSystemUiStateFlags(displayId), displayId); + } onAssistantVisibilityChanged(); // Initialize the task tracker @@ -705,19 +712,25 @@ public class TouchInteractionService extends Service { public void send(int code, Intent intent, String resolvedType, IBinder allowlistToken, IIntentReceiver finishedReceiver, String requiredPermission, Bundle options) { - MAIN_EXECUTOR.execute(() -> mTaskbarManager.toggleAllApps()); + MAIN_EXECUTOR.execute(() -> mTaskbarManager.toggleAllAppsSearch()); } }); } @UiThread - private void onSystemUiFlagsChanged(@SystemUiStateFlags long lastSysUIFlags) { + private void onSystemUiFlagsChanged(@SystemUiStateFlags long lastSysUIFlags, int displayId) { if (LockedUserState.get(this).isUserUnlocked()) { - long systemUiStateFlags = mDeviceState.getSystemUiStateFlags(); - SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(systemUiStateFlags); - mOverviewComponentObserver.setHomeDisabled(mDeviceState.isHomeDisabled()); - mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags); - mTaskAnimationManager.onSystemUiFlagsChanged(lastSysUIFlags, systemUiStateFlags); + long systemUiStateFlags = mDeviceState.getSystemUiStateFlags(displayId); + mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags, displayId); + if (displayId == Display.DEFAULT_DISPLAY) { + // The following don't care about non-default displays, at least for now. If they + // ever will, they should be taken care of. + SystemUiProxy.INSTANCE.get(this).setLastSystemUiStateFlags(systemUiStateFlags); + mOverviewComponentObserver.setHomeDisabled(mDeviceState.isHomeDisabled()); + // TODO b/399371607 - Propagate to taskAnimationManager once overview is multi + // display. + mTaskAnimationManager.onSystemUiFlagsChanged(lastSysUIFlags, systemUiStateFlags); + } } } diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java index b4b80c5705..2631efea1c 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java @@ -18,6 +18,7 @@ package com.android.quickstep.fallback; 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.enableDesktopExplodedView; import static com.android.launcher3.Flags.enableLargeDesktopWindowingTile; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE; @@ -36,6 +37,7 @@ import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLA import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_SPLIT_TRANSLATION; import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION; import static com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA; +import static com.android.quickstep.views.RecentsViewUtils.DESK_EXPLODE_PROGRESS; import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL; import android.util.FloatProperty; @@ -49,6 +51,7 @@ import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.anim.PropertySetter; import com.android.launcher3.statemanager.StateManager.StateHandler; import com.android.launcher3.states.StateAnimationConfig; +import com.android.quickstep.views.AddDesktopButton; import com.android.quickstep.views.ClearAllButton; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; @@ -95,8 +98,13 @@ public class FallbackRecentsStateController implements StateHandler { private static final int FLAG_RECENTS_VIEW_VISIBLE = BaseState.getFlag(7); private static final int FLAG_TASK_THUMBNAIL_SPLASH = BaseState.getFlag(8); private static final int FLAG_DETACH_DESKTOP_CAROUSEL = BaseState.getFlag(9); + private static final int FLAG_ADD_DESK_BUTTON = BaseState.getFlag(10); private static final RecentsState[] sAllStates = new RecentsState[6]; public static final RecentsState DEFAULT = new RecentsState(0, FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID - | FLAG_SCRIM | FLAG_LIVE_TILE | FLAG_RECENTS_VIEW_VISIBLE); + | FLAG_SCRIM | FLAG_LIVE_TILE | FLAG_RECENTS_VIEW_VISIBLE + | FLAG_ADD_DESK_BUTTON); public static final RecentsState MODAL_TASK = new ModalState(1, - FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_MODAL + FLAG_DISABLE_RESTORE | FLAG_OVERVIEW_ACTIONS | FLAG_MODAL | FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_LIVE_TILE | FLAG_RECENTS_VIEW_VISIBLE); public static final RecentsState BACKGROUND_APP = new BackgroundAppState(2, FLAG_DISABLE_RESTORE | FLAG_NON_INTERACTIVE | FLAG_FULL_SCREEN @@ -121,6 +123,13 @@ public class RecentsState implements BaseState { return hasFlag(FLAG_CLEAR_ALL_BUTTON); } + /** + * For this state, whether add desk button should be shown. + */ + public boolean hasAddDeskButton() { + return hasFlag(FLAG_ADD_DESK_BUTTON); + } + /** * For this state, whether overview actions should be shown. */ diff --git a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowContext.kt b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowContext.kt index 047658c419..cd4813631d 100644 --- a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowContext.kt +++ b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowContext.kt @@ -61,9 +61,13 @@ open class RecentsWindowContext(windowContext: Context, wallpaperColorHints: Int return dragLayer } + fun initDeviceProfile() { + deviceProfile = InvariantDeviceProfile.INSTANCE[this].getDeviceProfile(this) + } + override fun getDeviceProfile(): DeviceProfile { if (deviceProfile == null) { - deviceProfile = InvariantDeviceProfile.INSTANCE[this].getDeviceProfile(this).copy(this) + initDeviceProfile() } return deviceProfile!! } @@ -79,7 +83,10 @@ open class RecentsWindowContext(windowContext: Context, wallpaperColorHints: Int * @param type The window type to pass to the created WindowManager.LayoutParams. * @param title The window title to pass to the created WindowManager.LayoutParams. */ - fun createDefaultWindowLayoutParams(type: Int, title: String): WindowManager.LayoutParams { + private fun createDefaultWindowLayoutParams( + type: Int, + title: String, + ): WindowManager.LayoutParams { var windowFlags = (WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS or diff --git a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt index 07288d8f47..1f4961afe3 100644 --- a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt +++ b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt @@ -21,6 +21,7 @@ import android.app.ActivityOptions import android.content.ComponentName import android.content.Context import android.content.LocusId +import android.content.res.Configuration import android.os.Bundle import android.view.KeyEvent import android.view.LayoutInflater @@ -32,6 +33,7 @@ import android.view.View import android.view.WindowManager import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY import android.window.RemoteTransition +import com.android.launcher3.AbstractFloatingView import com.android.launcher3.BaseActivity import com.android.launcher3.LauncherAnimationRunner import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory @@ -135,73 +137,6 @@ class RecentsWindowManager(context: Context, wallpaperColorHints: Int) : listOf(RunnableList(), RunnableList(), RunnableList(), RunnableList()) private var onInitListener: Predicate? = null - private val taskStackChangeListener = - object : TaskStackChangeListener { - override fun onTaskMovedToFront(taskId: Int) { - if ((isShowing() && isInState(DEFAULT))) { - // handling state where we end recents animation by swiping livetile away - // TODO: animate this switch. - cleanupRecentsWindow() - } - } - } - - private val recentsAnimationListener = - object : RecentsAnimationListener { - override fun onRecentsAnimationCanceled(thumbnailDatas: HashMap) { - recentAnimationStopped() - } - - override fun onRecentsAnimationFinished(controller: RecentsAnimationController) { - recentAnimationStopped() - } - } - - init { - TaskStackChangeListeners.getInstance().registerTaskStackListener(taskStackChangeListener) - } - - override fun destroy() { - super.destroy() - cleanupRecentsWindow() - TaskStackChangeListeners.getInstance().unregisterTaskStackListener(taskStackChangeListener) - callbacks?.removeListener(recentsAnimationListener) - recentsWindowTracker.onContextDestroyed(this) - recentsView?.destroy() - } - - override fun startHome() { - startHome(/* finishRecentsAnimation= */ true) - } - - fun startHome(finishRecentsAnimation: Boolean) { - val recentsView: RecentsView<*, *> = getOverviewPanel() - - if (!finishRecentsAnimation) { - recentsView.switchToScreenshot(/* onFinishRunnable= */ null) - startHomeInternal() - return - } - recentsView.switchToScreenshot { - recentsView.finishRecentsAnimation(/* toRecents= */ true) { startHomeInternal() } - } - } - - private fun startHomeInternal() { - val runner = LauncherAnimationRunner(mainThreadHandler, animationToHomeFactory, true) - val options = - ActivityOptions.makeRemoteAnimation( - RemoteAnimationAdapter(runner, HOME_APPEAR_DURATION, 0), - RemoteTransition( - runner.toRemoteTransition(), - iApplicationThread, - "StartHomeFromRecents", - ), - ) - OverviewComponentObserver.startHomeIntentSafely(this, options.toBundle(), TAG) - stateManager.moveToRestState() - } - private val animationToHomeFactory = RemoteAnimationFactory { _: Int, @@ -229,7 +164,7 @@ class RecentsWindowManager(context: Context, wallpaperColorHints: Int) : anim, this@RecentsWindowManager, { - getStateManager().goToState(BG_LAUNCHER, false) + getStateManager().goToState(BG_LAUNCHER, true) cleanupRecentsWindow() }, true, /* skipFirstFrame */ @@ -242,17 +177,49 @@ class RecentsWindowManager(context: Context, wallpaperColorHints: Int) : TestLogging.recordEvent(SEQUENCE_MAIN, "onBackInvoked") } - private fun cleanupRecentsWindow() { - RecentsWindowProtoLogProxy.logCleanup(isShowing()) - if (isShowing()) { - windowManager.removeViewImmediate(windowView) + private val taskStackChangeListener = + object : TaskStackChangeListener { + override fun onTaskMovedToFront(taskId: Int) { + if ((isShowing() && isInState(DEFAULT))) { + // handling state where we end recents animation by swiping livetile away + // TODO: animate this switch. + cleanupRecentsWindow() + } + } } - stateManager.moveToRestState() - callbacks?.removeListener(recentsAnimationListener) + + private val recentsAnimationListener = + object : RecentsAnimationListener { + override fun onRecentsAnimationCanceled(thumbnailDatas: HashMap) { + recentAnimationStopped() + } + + override fun onRecentsAnimationFinished(controller: RecentsAnimationController) { + recentAnimationStopped() + } + } + + init { + TaskStackChangeListeners.getInstance().registerTaskStackListener(taskStackChangeListener) } - private fun isShowing(): Boolean { - return windowView?.parent != null + override fun handleConfigurationChanged(configuration: Configuration?) { + initDeviceProfile() + AbstractFloatingView.closeOpenViews( + this, + true, + AbstractFloatingView.TYPE_ALL and AbstractFloatingView.TYPE_REBIND_SAFE.inv(), + ) + dispatchDeviceProfileChanged() + } + + override fun destroy() { + super.destroy() + cleanupRecentsWindow() + TaskStackChangeListeners.getInstance().unregisterTaskStackListener(taskStackChangeListener) + callbacks?.removeListener(recentsAnimationListener) + recentsWindowTracker.onContextDestroyed(this) + recentsView?.destroy() } fun startRecentsWindow(callbacks: RecentsAnimationCallbacks? = null) { @@ -301,6 +268,51 @@ class RecentsWindowManager(context: Context, wallpaperColorHints: Int) : callbacks?.addListener(recentsAnimationListener) } + override fun startHome() { + startHome(/* finishRecentsAnimation= */ true) + } + + fun startHome(finishRecentsAnimation: Boolean) { + val recentsView: RecentsView<*, *> = getOverviewPanel() + + if (!finishRecentsAnimation) { + recentsView.switchToScreenshot /* onFinishRunnable= */ {} + startHomeInternal() + return + } + recentsView.switchToScreenshot { + recentsView.finishRecentsAnimation(/* toRecents= */ true) { startHomeInternal() } + } + } + + private fun startHomeInternal() { + val runner = LauncherAnimationRunner(mainThreadHandler, animationToHomeFactory, true) + val options = + ActivityOptions.makeRemoteAnimation( + RemoteAnimationAdapter(runner, HOME_APPEAR_DURATION, 0), + RemoteTransition( + runner.toRemoteTransition(), + iApplicationThread, + "StartHomeFromRecents", + ), + ) + OverviewComponentObserver.startHomeIntentSafely(this, options.toBundle(), TAG) + stateManager.moveToRestState() + } + + private fun cleanupRecentsWindow() { + RecentsWindowProtoLogProxy.logCleanup(isShowing()) + if (isShowing()) { + windowManager.removeViewImmediate(windowView) + } + stateManager.moveToRestState() + callbacks?.removeListener(recentsAnimationListener) + } + + private fun isShowing(): Boolean { + return windowView?.parent != null + } + private fun recentAnimationStopped() { if (isInState(BACKGROUND_APP)) { cleanupRecentsWindow() @@ -352,7 +364,6 @@ class RecentsWindowManager(context: Context, wallpaperColorHints: Int) : override fun onStateSetEnd(state: RecentsState) { super.onStateSetEnd(state) RecentsWindowProtoLogProxy.logOnStateSetEnd(getStateName(state)) - if (state == HOME || state == BG_LAUNCHER) { cleanupRecentsWindow() } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java index afe988d4eb..a703c23865 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java @@ -19,6 +19,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DEEP_PRESS_STASHED_TASKBAR; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LONG_PRESS_NAVBAR; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LONG_PRESS_STASHED_TASKBAR; +import static com.android.launcher3.logging.StatsLogManager.LauncherLatencyEvent.LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.LogConfig.NAV_HANDLE_LONG_PRESS; @@ -30,6 +31,7 @@ import android.view.ViewConfiguration; import androidx.annotation.VisibleForTesting; import com.android.launcher3.Utilities; +import com.android.launcher3.logging.InstanceIdSequence; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.util.DisplayController; import com.android.quickstep.DeviceConfigWrapper; @@ -49,6 +51,8 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { private static final String TAG = "NavHandleLongPressIC"; private static final boolean DEBUG_NAV_HANDLE = Utilities.isPropertyEnabled( NAV_HANDLE_LONG_PRESS); + // Minimum time between touch down and abandon to log. + @VisibleForTesting static final long MIN_TIME_TO_LOG_ABANDON_MS = 200; private NavHandleLongPressHandler mNavHandleLongPressHandler; private final float mNavHandleWidth; @@ -62,11 +66,12 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { private final int mOuterLongPressTimeout; private final boolean mDeepPressEnabled; private final NavHandle mNavHandle; - private final StatsLogManager mStatsLogManager; + private StatsLogManager mStatsLogManager; private final TopTaskTracker mTopTaskTracker; private final GestureState mGestureState; - private MotionEvent mCurrentDownEvent; + private MotionEvent mCurrentDownEvent; // Down event that started the current gesture. + private MotionEvent mCurrentMotionEvent; // Most recent motion event. private boolean mDeepPressLogged; // Whether deep press has been logged for the current touch. public NavHandleLongPressInputConsumer(Context context, InputConsumer delegate, @@ -125,6 +130,10 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { @Override public void onMotionEvent(MotionEvent ev) { + if (mCurrentMotionEvent != null) { + mCurrentMotionEvent.recycle(); + } + mCurrentMotionEvent = MotionEvent.obtain(ev); if (mDelegate.allowInterceptByParent()) { handleMotionEvent(ev); } else if (MAIN_EXECUTOR.getHandler().hasCallbacks(mTriggerLongPress)) { @@ -244,6 +253,15 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { if (DEBUG_NAV_HANDLE) { Log.d(TAG, "cancelLongPress: " + reason); } + // Log LPNH abandon latency if we didn't trigger but were still prepared to. + long latencyMs = mCurrentMotionEvent.getEventTime() - mCurrentDownEvent.getEventTime(); + if (mState != STATE_ACTIVE && MAIN_EXECUTOR.getHandler().hasCallbacks(mTriggerLongPress) + && latencyMs >= MIN_TIME_TO_LOG_ABANDON_MS) { + mStatsLogManager.latencyLogger() + .withInstanceId(new InstanceIdSequence().newInstanceId()) + .withLatency(latencyMs) + .log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); + } mGestureState.setIsInExtendedSlopRegion(false); MAIN_EXECUTOR.getHandler().removeCallbacks(mTriggerLongPress); mNavHandleLongPressHandler.onTouchFinished(mNavHandle, reason); @@ -274,4 +292,9 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { void setNavHandleLongPressHandler(NavHandleLongPressHandler navHandleLongPressHandler) { mNavHandleLongPressHandler = navHandleLongPressHandler; } + + @VisibleForTesting + void setStatsLogManager(StatsLogManager statsLogManager) { + mStatsLogManager = statsLogManager; + } } diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java index c986b88e1d..c1bb2501b6 100644 --- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java +++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java @@ -64,6 +64,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; import com.android.launcher3.R; +import com.android.launcher3.RemoveAnimationSettingsTracker; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.anim.AnimatorPlaybackController; @@ -92,6 +93,8 @@ public class AllSetActivity extends Activity { private static final String LOG_TAG = "AllSetActivity"; private static final String URI_SYSTEM_NAVIGATION_SETTING = "#Intent;action=com.android.settings.SEARCH_RESULT_TRAMPOLINE;S.:settings:fragment_args_key=gesture_system_navigation_input_summary;S.:settings:show_fragment=com.android.settings.gestures.SystemNavigationGestureSettings;end"; + private static final String INTENT_ACTION_ACTIVITY_CLOSED = + "com.android.quickstep.interaction.ACTION_ALL_SET_ACTIVITY_CLOSED"; private static final String EXTRA_ACCENT_COLOR_DARK_MODE = "suwColorAccentDark"; private static final String EXTRA_ACCENT_COLOR_LIGHT_MODE = "suwColorAccentLight"; private static final String EXTRA_DEVICE_NAME = "suwDeviceName"; @@ -105,6 +108,9 @@ public class AllSetActivity extends Activity { private static final float ANIMATION_PAUSE_ALPHA_THRESHOLD = 0.1f; + private static final String KEY_BACKGROUND_ANIMATION_TOGGLED_ON = + "background_animation_toggled_on"; + private final AnimatedFloat mSwipeProgress = new AnimatedFloat(this::onSwipeProgressUpdate); private final InvariantDeviceProfile.OnIDPChangeListener mOnIDPChangeListener = @@ -122,6 +128,9 @@ public class AllSetActivity extends Activity { private AnimatorPlaybackController mLauncherStartAnim = null; + // Auto play background animation by default + private boolean mBackgroundAnimationToggledOn = true; + private TextView mHintView; private final OverviewChangeListener mOverviewChangeListener = this::onOverviewTargetChange; @@ -198,6 +207,15 @@ public class AllSetActivity extends Activity { LOTTIE_TERTIARY_COLOR_TOKEN, R.color.all_set_bg_tertiary), getTheme()); + mBackgroundAnimationToggledOn = savedInstanceState == null + || savedInstanceState.getBoolean(KEY_BACKGROUND_ANIMATION_TOGGLED_ON, true); + // The animated background is behind a scroll view, which intercepts all input. + // However, the content view also covers the full screen + requireViewById(R.id.content).setOnClickListener(v -> { + mBackgroundAnimationToggledOn = !mBackgroundAnimationToggledOn; + maybeResumeOrPauseBackgroundAnimation(); + }); + setUpBackgroundAnimation(getDP().isTablet); getIDP().addOnChangeListener(mOnIDPChangeListener); @@ -206,6 +224,12 @@ public class AllSetActivity extends Activity { ActivityPreloadUtil.preloadOverviewForSUWAllSet(this); } + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putBoolean(KEY_BACKGROUND_ANIMATION_TOGGLED_ON, mBackgroundAnimationToggledOn); + } + private InvariantDeviceProfile getIDP() { return LauncherAppState.getInstance(this).getInvariantDeviceProfile(); } @@ -332,6 +356,7 @@ public class AllSetActivity extends Activity { mLauncherStartAnim.dispatchOnEnd(); mLauncherStartAnim = null; } + sendBroadcast(new Intent(INTENT_ACTION_ACTIVITY_CLOSED)); } @Override @@ -365,8 +390,10 @@ public class AllSetActivity extends Activity { private void maybeResumeOrPauseBackgroundAnimation() { boolean shouldPlayAnimation = - getContentViewAlphaForSwipeProgress() > ANIMATION_PAUSE_ALPHA_THRESHOLD - && isResumed(); + !RemoveAnimationSettingsTracker.INSTANCE.get(this).isRemoveAnimationEnabled() + && getContentViewAlphaForSwipeProgress() > ANIMATION_PAUSE_ALPHA_THRESHOLD + && isResumed() + && mBackgroundAnimationToggledOn; if (mAnimatedBackground.isAnimating() && !shouldPlayAnimation) { mAnimatedBackground.pauseAnimation(); } else if (!mAnimatedBackground.isAnimating() && shouldPlayAnimation) { diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java index 0fc95e2102..22227c997e 100644 --- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java @@ -36,7 +36,6 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.ViewOutlineProvider; -import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.widget.Button; import android.widget.FrameLayout; @@ -57,6 +56,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorListeners; +import com.android.launcher3.taskbar.TypefaceUtils; import com.android.launcher3.views.ClipIconView; import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureAttemptCallback; import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttemptCallback; @@ -123,13 +123,10 @@ abstract class TutorialController implements BackGestureAttemptCallback, // These runnables should be used when posting callbacks to their views and cleared from their // views before posting new callbacks. - private final Runnable mTitleViewCallback; - private final Runnable mSubtitleViewCallback; @Nullable private Runnable mFeedbackViewCallback; @Nullable private Runnable mFakeTaskViewCallback; @Nullable private Runnable mFakeTaskbarViewCallback; private final Runnable mShowFeedbackRunnable; - private final AccessibilityManager mAccessibilityManager; TutorialController(TutorialFragment tutorialFragment, TutorialType tutorialType) { mTutorialFragment = tutorialFragment; @@ -177,6 +174,7 @@ abstract class TutorialController implements BackGestureAttemptCallback, mFeedbackTitleView.setText(getIntroductionTitle()); mFeedbackSubtitleView.setText(getIntroductionSubtitle()); + setTitleTypefaces(); mExitingAppView.setClipToOutline(true); mExitingAppView.setOutlineProvider(new ViewOutlineProvider() { @@ -185,17 +183,6 @@ abstract class TutorialController implements BackGestureAttemptCallback, outline.setRoundRect(mExitingAppRect, mExitingAppRadius); } }); - - mAccessibilityManager = AccessibilityManager.getInstance(mContext); - mTitleViewCallback = () -> { - mFeedbackTitleView.requestFocus(); - mFeedbackTitleView.sendAccessibilityEvent( - AccessibilityEvent.TYPE_VIEW_FOCUSED); - }; - mSubtitleViewCallback = () -> { - mFeedbackSubtitleView.requestFocus(); - mFeedbackSubtitleView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED); - }; mShowFeedbackRunnable = () -> { mFeedbackView.setAlpha(0f); mFeedbackView.setScaleX(0.95f); @@ -214,14 +201,14 @@ abstract class TutorialController implements BackGestureAttemptCallback, mFeedbackViewCallback = mTutorialFragment::continueTutorial; mFeedbackView.postDelayed( mFeedbackViewCallback, - mAccessibilityManager.getRecommendedTimeoutMillis( - ADVANCE_TUTORIAL_TIMEOUT_MS, - AccessibilityManager.FLAG_CONTENT_TEXT + AccessibilityManager.getInstance(mContext) + .getRecommendedTimeoutMillis( + ADVANCE_TUTORIAL_TIMEOUT_MS, + AccessibilityManager.FLAG_CONTENT_TEXT | AccessibilityManager.FLAG_CONTENT_CONTROLS)); } }) .start(); - mFeedbackTitleView.postDelayed(mTitleViewCallback, FEEDBACK_ANIMATION_MS); }; } @@ -414,8 +401,6 @@ abstract class TutorialController implements BackGestureAttemptCallback, int titleResId, int subtitleResId, boolean isGestureSuccessful) { - mFeedbackTitleView.removeCallbacks(mTitleViewCallback); - mFeedbackSubtitleView.removeCallbacks(mSubtitleViewCallback); if (mFeedbackViewCallback != null) { mFeedbackView.removeCallbacks(mFeedbackViewCallback); mFeedbackViewCallback = null; @@ -423,17 +408,12 @@ abstract class TutorialController implements BackGestureAttemptCallback, mFeedbackTitleView.setText(titleResId); mFeedbackSubtitleView.setText(subtitleResId); - mFeedbackTitleView.postDelayed(mTitleViewCallback, mAccessibilityManager - .getRecommendedTimeoutMillis( - FEEDBACK_ANIMATION_MS, - AccessibilityManager.FLAG_CONTENT_TEXT)); - mFeedbackSubtitleView.postDelayed(mSubtitleViewCallback, mAccessibilityManager - .getRecommendedTimeoutMillis( - SUBTITLE_ANNOUNCE_DELAY_MS, - AccessibilityManager.FLAG_CONTENT_TEXT)); - if (isGestureSuccessful) { if (mTutorialFragment.isAtFinalStep()) { + TypefaceUtils.setTypeface( + mDoneButton, + TypefaceUtils.FONT_FAMILY_LABEL_LARGE_BASELINE + ); showActionButton(); } @@ -458,7 +438,8 @@ abstract class TutorialController implements BackGestureAttemptCallback, pauseAndHideLottieAnimation(); mCheckmarkAnimation.setVisibility(View.VISIBLE); mCheckmarkAnimation.playAnimation(); - mFeedbackTitleView.setTextAppearance(mContext, getSuccessTitleTextAppearance()); + mFeedbackTitleView.setTextAppearance(getSuccessTitleTextAppearance()); + setTitleTypefaces(); } public boolean isGestureCompleted() { @@ -487,8 +468,6 @@ abstract class TutorialController implements BackGestureAttemptCallback, mFakeTaskbarView.removeCallbacks(mFakeTaskbarViewCallback); mFakeTaskbarViewCallback = null; } - mFeedbackTitleView.removeCallbacks(mTitleViewCallback); - mFeedbackSubtitleView.removeCallbacks(mSubtitleViewCallback); } private void playFeedbackAnimation() { @@ -513,8 +492,10 @@ abstract class TutorialController implements BackGestureAttemptCallback, updateDrawables(); updateLayout(); - mFeedbackTitleView.setTextAppearance(mContext, getTitleTextAppearance()); - mDoneButton.setTextAppearance(mContext, getDoneButtonTextAppearance()); + mFeedbackTitleView.setTextAppearance(getTitleTextAppearance()); + mDoneButton.setTextAppearance(getDoneButtonTextAppearance()); + + setTitleTypefaces(); mDoneButton.getBackground().setTint(getDoneButtonColor()); mCheckmarkAnimation.setAnimation(mTutorialFragment.isAtFinalStep() ? R.raw.checkmark_animation_end @@ -533,6 +514,21 @@ abstract class TutorialController implements BackGestureAttemptCallback, } } + /** + * Apply expressive typefaces to the feedback title and subtitle views. + */ + private void setTitleTypefaces() { + TypefaceUtils.setTypeface( + mFeedbackTitleView, + mTutorialFragment.isLargeScreen() + ? TypefaceUtils.FONT_FAMILY_DISPLAY_MEDIUM_EMPHASIZED + : TypefaceUtils.FONT_FAMILY_DISPLAY_SMALL_EMPHASIZED); + TypefaceUtils.setTypeface( + mFeedbackSubtitleView, + TypefaceUtils.FONT_FAMILY_BODY_LARGE_BASELINE + ); + } + protected void resetViewsForBackGesture() { mFakeTaskView.setVisibility(View.VISIBLE); mFakeTaskView.setBackgroundColor(getFakeTaskViewColor()); @@ -564,13 +560,6 @@ abstract class TutorialController implements BackGestureAttemptCallback, mSkipButton.setVisibility(GONE); mDoneButton.setVisibility(View.VISIBLE); mDoneButton.setOnClickListener(this::onActionButtonClicked); - mDoneButton.postDelayed(() -> { - mDoneButton.requestFocus(); - mDoneButton.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED); - }, mAccessibilityManager - .getRecommendedTimeoutMillis( - DONE_BUTTON_ANNOUNCE_DELAY_MS, - AccessibilityManager.FLAG_CONTENT_CONTROLS)); } void hideFakeTaskbar(boolean animateToHotseat) { diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index 594c99a9c8..58e54cffbf 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -382,18 +382,15 @@ public class StatsLogCompatManager extends StatsLogManager { return; } - if (mItemInfo.container < 0 || !LauncherAppState.INSTANCE.executeIfCreated(app -> { - // Item is inside a collection, fetch collection info in a BG thread - // and then write to StatsLog. - app.getModel().enqueueModelUpdateTask((taskController, dataModel, apps) -> - write(event, applyOverwrites(mItemInfo.buildProto( - (CollectionInfo) dataModel.itemsIdMap.get(mItemInfo.container), - mContext)))); - })) { - // Write log on the model thread so that logs do not go out of order - // (for eg: drop comes after drag) - Executors.MODEL_EXECUTOR.execute( - () -> write(event, applyOverwrites(mItemInfo.buildProto(mContext)))); + // Item is inside a collection, fetch collection info in a BG thread + // and then write to StatsLog. + if (mItemInfo.container < 0) { + LauncherAppState.INSTANCE.get(mContext).getModel().enqueueModelUpdateTask( + (taskController, dataModel, apps) -> write(event, applyOverwrites( + mItemInfo.buildProto( + (CollectionInfo) dataModel.itemsIdMap + .get(mItemInfo.container), + mContext)))); } } diff --git a/quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.kt b/quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.kt index e72ccbfb7b..e3c9b2bb65 100644 --- a/quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.kt +++ b/quickstep/src/com/android/quickstep/orientation/LandscapePagedViewHandler.kt @@ -103,7 +103,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { target: T, action: Int2DAction, primaryParam: Int, - secondaryParam: Int + secondaryParam: Int, ) = action.call(target, secondaryParam, primaryParam) override fun getPrimaryDirection(event: MotionEvent, pointerIndex: Int): Float = @@ -171,7 +171,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun getSplitTranslationDirectionFactor( stagePosition: Int, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Int = if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) -1 else 1 override fun getTaskMenuX( @@ -179,7 +179,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { thumbnailView: View, deviceProfile: DeviceProfile, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float = thumbnailView.measuredWidth + x - taskInsetMargin override fun getTaskMenuY( @@ -188,7 +188,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { stagePosition: Int, taskMenuView: View, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float { val layoutParams = taskMenuView.layoutParams as BaseDragLayer.LayoutParams var taskMenuY = y + taskInsetMargin @@ -203,7 +203,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun getTaskMenuWidth( thumbnailView: View, deviceProfile: DeviceProfile, - @StagePosition stagePosition: Int + @StagePosition stagePosition: Int, ): Int = when { Flags.enableOverviewIconMenu() -> @@ -218,14 +218,14 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { taskInsetMargin: Float, deviceProfile: DeviceProfile, taskMenuX: Float, - taskMenuY: Float + taskMenuY: Float, ): Int = (taskMenuX - taskInsetMargin).toInt() override fun setTaskOptionsMenuLayoutOrientation( deviceProfile: DeviceProfile, taskMenuLayout: LinearLayout, dividerSpacing: Int, - dividerDrawable: ShapeDrawable + dividerDrawable: ShapeDrawable, ) { taskMenuLayout.orientation = LinearLayout.VERTICAL dividerDrawable.intrinsicHeight = dividerSpacing @@ -235,7 +235,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun setLayoutParamsForTaskMenuOptionItem( lp: LinearLayout.LayoutParams, viewGroup: LinearLayout, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ) { // Phone fake landscape viewGroup.orientation = LinearLayout.HORIZONTAL @@ -250,7 +250,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { deviceProfile: DeviceProfile, snapshotViewWidth: Int, snapshotViewHeight: Int, - banner: View + banner: View, ) { banner.pivotX = 0f banner.pivotY = 0f @@ -273,7 +273,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { deviceProfile: DeviceProfile, thumbnailViews: Array, desiredTaskId: Int, - banner: View + banner: View, ): Pair { val snapshotParams = thumbnailViews[0].layoutParams as FrameLayout.LayoutParams val translationX = banner.height.toFloat() @@ -285,11 +285,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { translationY = snapshotParams.topMargin.toFloat() } else { val topLeftTaskPlusDividerPercent = - if (splitBounds.appsStackedVertically) { - splitBounds.topTaskPercent + splitBounds.dividerHeightPercent - } else { - splitBounds.leftTaskPercent + splitBounds.dividerWidthPercent - } + splitBounds.leftTopTaskPercent + splitBounds.dividerPercent translationY = snapshotParams.topMargin + (taskViewHeight - snapshotParams.topMargin) * topLeftTaskPlusDividerPercent @@ -315,13 +311,21 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun getTaskDragDisplacementFactor(isRtl: Boolean): Int = if (isRtl) 1 else -1 + override fun getTaskDismissVerticalDirection(): Int = 1 + + override fun getTaskDismissLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + secondaryDimension - taskThumbnailBounds.left + + override fun getTaskLaunchLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + taskThumbnailBounds.left + /* -------------------- */ override fun getChildBounds( child: View, childStart: Int, pageCenter: Int, - layoutChild: Boolean + layoutChild: Boolean, ): ChildBounds { val childHeight = child.measuredHeight val childWidth = child.measuredWidth @@ -342,7 +346,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, STAGE_POSITION_TOP_OR_LEFT, - STAGE_TYPE_MAIN + STAGE_TYPE_MAIN, ) ) @@ -351,7 +355,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { placeholderInset: Int, dp: DeviceProfile, @StagePosition stagePosition: Int, - out: Rect + out: Rect, ) { // In fake land/seascape, the placeholder always needs to go to the "top" of the device, // which is the same bounds as 0 rotation. @@ -378,7 +382,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { drawableWidth: Int, drawableHeight: Int, dp: DeviceProfile, - @StagePosition stagePosition: Int + @StagePosition stagePosition: Int, ) { val insetAdjustment = getPlaceholderSizeAdjustment(dp) / 2f out.x = (onScreenRectCenterX / fullscreenScaleX - 1.0f * drawableWidth / 2) @@ -397,7 +401,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { out: View, dp: DeviceProfile, splitInstructionsHeight: Int, - splitInstructionsWidth: Int + splitInstructionsWidth: Int, ) { out.pivotX = 0f out.pivotY = splitInstructionsHeight.toFloat() @@ -425,7 +429,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { dp: DeviceProfile, @StagePosition stagePosition: Int, out1: Rect, - out2: Rect + out2: Rect, ) { // In fake land/seascape, the window bounds are always top and bottom half val screenHeight = dp.heightPx @@ -438,17 +442,10 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { dp: DeviceProfile, outRect: Rect, splitInfo: SplitBounds, - desiredStagePosition: Int + desiredStagePosition: Int, ) { - val topLeftTaskPercent: Float - val dividerBarPercent: Float - if (splitInfo.appsStackedVertically) { - topLeftTaskPercent = splitInfo.topTaskPercent - dividerBarPercent = splitInfo.dividerHeightPercent - } else { - topLeftTaskPercent = splitInfo.leftTaskPercent - dividerBarPercent = splitInfo.dividerWidthPercent - } + val topLeftTaskPercent = splitInfo.leftTopTaskPercent + val dividerBarPercent = splitInfo.dividerPercent if (desiredStagePosition == STAGE_POSITION_TOP_OR_LEFT) { outRect.bottom = outRect.top + (outRect.height() * topLeftTaskPercent).toInt() @@ -459,7 +456,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { /** * @param inSplitSelection Whether user currently has a task from this task group staged for - * split screen. Currently this state is not reachable in fake landscape. + * split screen. Currently this state is not reachable in fake landscape. */ override fun measureGroupedTaskViewThumbnailBounds( primarySnapshot: View, @@ -469,7 +466,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { splitBoundsConfig: SplitBounds, dp: DeviceProfile, isRtl: Boolean, - inSplitSelection: Boolean + inSplitSelection: Boolean, ) { val primaryParams = primarySnapshot.layoutParams as FrameLayout.LayoutParams val secondaryParams = secondarySnapshot.layoutParams as FrameLayout.LayoutParams @@ -490,13 +487,13 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { primarySnapshot.translationY = spaceAboveSnapshot.toFloat() primarySnapshot.measure( MeasureSpec.makeMeasureSpec(taskViewFirst.x, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(taskViewFirst.y, MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(taskViewFirst.y, MeasureSpec.EXACTLY), ) val translationY = taskViewFirst.y + spaceAboveSnapshot + dividerBar secondarySnapshot.translationY = (translationY - spaceAboveSnapshot).toFloat() secondarySnapshot.measure( MeasureSpec.makeMeasureSpec(taskViewSecond.x, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(taskViewSecond.y, MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(taskViewSecond.y, MeasureSpec.EXACTLY), ) } @@ -504,18 +501,13 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { dp: DeviceProfile, splitBoundsConfig: SplitBounds, parentWidth: Int, - parentHeight: Int + parentHeight: Int, ): Pair { val spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx val totalThumbnailHeight = parentHeight - spaceAboveSnapshot val dividerBar = getDividerBarSize(totalThumbnailHeight, splitBoundsConfig) - val taskPercent = - if (splitBoundsConfig.appsStackedVertically) { - splitBoundsConfig.topTaskPercent - } else { - splitBoundsConfig.leftTaskPercent - } + val taskPercent = splitBoundsConfig.leftTopTaskPercent val firstTaskViewSize = Point(parentWidth, (totalThumbnailHeight * taskPercent).toInt()) val secondTaskViewSize = Point(parentWidth, totalThumbnailHeight - firstTaskViewSize.y - dividerBar) @@ -527,7 +519,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { taskIconMargin: Int, taskIconHeight: Int, thumbnailTopMargin: Int, - isRtl: Boolean + isRtl: Boolean, ) { iconParams.gravity = if (isRtl) { @@ -543,7 +535,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun setIconAppChipChildrenParams( iconParams: FrameLayout.LayoutParams, - chipChildMarginStart: Int + chipChildMarginStart: Int, ) { iconParams.gravity = Gravity.START or Gravity.CENTER_VERTICAL iconParams.marginStart = chipChildMarginStart @@ -554,7 +546,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { iconAppChipView: IconAppChipView, iconMenuParams: FrameLayout.LayoutParams, iconMenuMargin: Int, - thumbnailTopMargin: Int + thumbnailTopMargin: Int, ) { val isRtl = iconAppChipView.layoutDirection == View.LAYOUT_DIRECTION_RTL @@ -580,7 +572,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { /** * @param inSplitSelection Whether user currently has a task from this task group staged for - * split screen. Currently this state is not reachable in fake landscape. + * split screen. Currently this state is not reachable in fake landscape. */ override fun setSplitIconParams( primaryIconView: View, @@ -593,7 +585,8 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { isRtl: Boolean, deviceProfile: DeviceProfile, splitConfig: SplitBounds, - inSplitSelection: Boolean + inSplitSelection: Boolean, + oneIconHiddenDueToSmallWidth: Boolean, ) { val spaceAboveSnapshot = deviceProfile.overviewTaskThumbnailTopMarginPx val totalThumbnailHeight = groupedTaskViewHeight - spaceAboveSnapshot @@ -606,7 +599,8 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { totalThumbnailHeight, isRtl, deviceProfile.overviewTaskMarginPx, - dividerBar + dividerBar, + oneIconHiddenDueToSmallWidth, ) updateSplitIconsPosition(primaryIconView, topLeftY, isRtl) @@ -620,20 +614,20 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { override fun getSplitSelectTaskOffset( primary: FloatProperty, secondary: FloatProperty, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Pair, FloatProperty> = Pair(primary, secondary) override fun getFloatingTaskOffscreenTranslationTarget( floatingTask: View, onScreenRect: RectF, @StagePosition stagePosition: Int, - dp: DeviceProfile + dp: DeviceProfile, ): Float = floatingTask.translationY - onScreenRect.height() override fun setFloatingTaskPrimaryTranslation( floatingTask: View, translation: Float, - dp: DeviceProfile + dp: DeviceProfile, ) { floatingTask.translationY = translation } @@ -663,6 +657,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { isRtl: Boolean, overviewTaskMarginPx: Int, dividerSize: Int, + oneIconHiddenDueToSmallWidth: Boolean, ): SplitIconPositions { return if (Flags.enableOverviewIconMenu()) { if (isRtl) { @@ -671,11 +666,20 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { SplitIconPositions(0, primarySnapshotHeight + dividerSize) } } else { - val topLeftY = primarySnapshotHeight + overviewTaskMarginPx - SplitIconPositions( - topLeftY = topLeftY, - bottomRightY = topLeftY + dividerSize + taskIconHeight - ) + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerY = + primarySnapshotHeight + + overviewTaskMarginPx + + ((taskIconHeight + dividerSize) / 2) + SplitIconPositions(topLeftY = centerY, bottomRightY = centerY) + } else { + val topLeftY = primarySnapshotHeight + overviewTaskMarginPx + SplitIconPositions( + topLeftY = topLeftY, + bottomRightY = topLeftY + dividerSize + taskIconHeight, + ) + } } } @@ -715,11 +719,7 @@ open class LandscapePagedViewHandler : RecentsPagedOrientationHandler { * @return The divider size for the group task view. */ protected fun getDividerBarSize(totalThumbnailHeight: Int, splitConfig: SplitBounds): Int { - return Math.round( - totalThumbnailHeight * - if (splitConfig.appsStackedVertically) splitConfig.dividerHeightPercent - else splitConfig.dividerWidthPercent - ) + return Math.round(totalThumbnailHeight * splitConfig.dividerPercent) } /** diff --git a/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.java b/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.java deleted file mode 100644 index c1e1c2b115..0000000000 --- a/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.java +++ /dev/null @@ -1,851 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.quickstep.orientation; - -import static android.view.Gravity.BOTTOM; -import static android.view.Gravity.CENTER_HORIZONTAL; -import static android.view.Gravity.END; -import static android.view.Gravity.START; -import static android.view.Gravity.TOP; -import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; -import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; - -import static com.android.launcher3.Flags.enableOverviewIconMenu; -import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X; -import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y; -import static com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN; - -import android.graphics.Matrix; -import android.graphics.Point; -import android.graphics.PointF; -import android.graphics.Rect; -import android.graphics.RectF; -import android.graphics.drawable.ShapeDrawable; -import android.util.FloatProperty; -import android.util.Pair; -import android.view.Gravity; -import android.view.Surface; -import android.view.View; -import android.widget.FrameLayout; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.R; -import com.android.launcher3.Utilities; -import com.android.launcher3.logger.LauncherAtom; -import com.android.launcher3.touch.DefaultPagedViewHandler; -import com.android.launcher3.touch.SingleAxisSwipeDetector; -import com.android.launcher3.util.SplitConfigurationOptions; -import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; -import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; -import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; -import com.android.quickstep.views.IconAppChipView; - -import java.util.ArrayList; -import java.util.List; - -public class PortraitPagedViewHandler extends DefaultPagedViewHandler implements - RecentsPagedOrientationHandler { - - private final Matrix mTmpMatrix = new Matrix(); - private final RectF mTmpRectF = new RectF(); - - @Override - public T getPrimaryValue(T x, T y) { - return x; - } - - @Override - public T getSecondaryValue(T x, T y) { - return y; - } - - @Override - public boolean isLayoutNaturalToLauncher() { - return true; - } - - @Override - public void adjustFloatingIconStartVelocity(PointF velocity) { - //no-op - } - - @Override - public void fixBoundsForHomeAnimStartRect(RectF outStartRect, DeviceProfile deviceProfile) { - if (outStartRect.left > deviceProfile.widthPx) { - outStartRect.offsetTo(0, outStartRect.top); - } else if (outStartRect.left < -deviceProfile.widthPx) { - outStartRect.offsetTo(0, outStartRect.top); - } - } - - @Override - public void setSecondary(T target, Float2DAction action, float param) { - action.call(target, 0, param); - } - - @Override - public void set(T target, Int2DAction action, int primaryParam, - int secondaryParam) { - action.call(target, primaryParam, secondaryParam); - } - - @Override - public int getPrimarySize(View view) { - return view.getWidth(); - } - - @Override - public float getPrimarySize(RectF rect) { - return rect.width(); - } - - @Override - public float getStart(RectF rect) { - return rect.left; - } - - @Override - public float getEnd(RectF rect) { - return rect.right; - } - - @Override - public void rotateInsets(@NonNull Rect insets, @NonNull Rect outInsets) { - outInsets.set(insets); - } - - @Override - public int getClearAllSidePadding(View view, boolean isRtl) { - return (isRtl ? view.getPaddingRight() : - view.getPaddingLeft()) / 2; - } - - @Override - public int getSecondaryDimension(View view) { - return view.getHeight(); - } - - @Override - public FloatProperty getPrimaryViewTranslate() { - return VIEW_TRANSLATE_X; - } - - @Override - public FloatProperty getSecondaryViewTranslate() { - return VIEW_TRANSLATE_Y; - } - - @Override - public float getDegreesRotated() { - return 0; - } - - @Override - public int getRotation() { - return Surface.ROTATION_0; - } - - @Override - public void setPrimaryScale(View view, float scale) { - view.setScaleX(scale); - } - - @Override - public void setSecondaryScale(View view, float scale) { - view.setScaleY(scale); - } - - public int getSecondaryTranslationDirectionFactor() { - return -1; - } - - @Override - public int getSplitTranslationDirectionFactor(int stagePosition, DeviceProfile deviceProfile) { - if (deviceProfile.isLeftRightSplit && stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) { - return -1; - } else { - return 1; - } - } - - @Override - public float getTaskMenuX(float x, View thumbnailView, - DeviceProfile deviceProfile, float taskInsetMargin, View taskViewIcon) { - if (deviceProfile.isLandscape) { - return x + taskInsetMargin - + (thumbnailView.getMeasuredWidth() - thumbnailView.getMeasuredHeight()) / 2f; - } else { - return x + taskInsetMargin; - } - } - - @Override - public float getTaskMenuY(float y, View thumbnailView, int stagePosition, - View taskMenuView, float taskInsetMargin, View taskViewIcon) { - return y + taskInsetMargin; - } - - @Override - public int getTaskMenuWidth(View thumbnailView, DeviceProfile deviceProfile, - @StagePosition int stagePosition) { - if (enableOverviewIconMenu()) { - return thumbnailView.getResources().getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_expanded_width); - } - int padding = thumbnailView.getResources() - .getDimensionPixelSize(R.dimen.task_menu_edge_padding); - return (deviceProfile.isLandscape && !deviceProfile.isTablet - ? thumbnailView.getMeasuredHeight() - : thumbnailView.getMeasuredWidth()) - (2 * padding); - } - - @Override - public int getTaskMenuHeight(float taskInsetMargin, DeviceProfile deviceProfile, - float taskMenuX, float taskMenuY) { - return (int) (deviceProfile.heightPx - deviceProfile.getInsets().top - taskMenuY - - deviceProfile.getOverviewActionsClaimedSpaceBelow()); - } - - @Override - public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile, - LinearLayout taskMenuLayout, int dividerSpacing, - ShapeDrawable dividerDrawable) { - taskMenuLayout.setOrientation(LinearLayout.VERTICAL); - dividerDrawable.setIntrinsicHeight(dividerSpacing); - taskMenuLayout.setDividerDrawable(dividerDrawable); - } - - @Override - public void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp, - LinearLayout viewGroup, DeviceProfile deviceProfile) { - viewGroup.setOrientation(LinearLayout.HORIZONTAL); - lp.width = LinearLayout.LayoutParams.MATCH_PARENT; - lp.height = WRAP_CONTENT; - } - - @Override - public void updateDwbBannerLayout(int taskViewWidth, int taskViewHeight, - boolean isGroupedTaskView, @NonNull DeviceProfile deviceProfile, - int snapshotViewWidth, int snapshotViewHeight, @NonNull View banner) { - FrameLayout.LayoutParams bannerParams = (FrameLayout.LayoutParams) banner.getLayoutParams(); - banner.setPivotX(0); - banner.setPivotY(0); - banner.setRotation(getDegreesRotated()); - if (isGroupedTaskView) { - bannerParams.gravity = - BOTTOM | (deviceProfile.isLeftRightSplit ? START : CENTER_HORIZONTAL); - bannerParams.width = snapshotViewWidth; - } else { - bannerParams.width = MATCH_PARENT; - bannerParams.gravity = BOTTOM | CENTER_HORIZONTAL; - } - banner.setLayoutParams(bannerParams); - } - - @NonNull - @Override - public Pair getDwbBannerTranslations(int taskViewWidth, - int taskViewHeight, SplitBounds splitBounds, @NonNull DeviceProfile deviceProfile, - @NonNull View[] thumbnailViews, int desiredTaskId, @NonNull View banner) { - float translationX = 0; - float translationY = 0; - if (splitBounds != null) { - if (deviceProfile.isLeftRightSplit) { - if (desiredTaskId == splitBounds.rightBottomTaskId) { - float leftTopTaskPercent = splitBounds.appsStackedVertically - ? splitBounds.topTaskPercent - : splitBounds.leftTaskPercent; - float dividerThicknessPercent = splitBounds.appsStackedVertically - ? splitBounds.dividerHeightPercent - : splitBounds.dividerWidthPercent; - translationX = ((taskViewWidth * leftTopTaskPercent) - + (taskViewWidth * dividerThicknessPercent)); - } - } else { - if (desiredTaskId == splitBounds.leftTopTaskId) { - FrameLayout.LayoutParams snapshotParams = - (FrameLayout.LayoutParams) thumbnailViews[0] - .getLayoutParams(); - float bottomRightTaskPlusDividerPercent = splitBounds.appsStackedVertically - ? (1f - splitBounds.topTaskPercent) - : (1f - splitBounds.leftTaskPercent); - translationY = -((taskViewHeight - snapshotParams.topMargin) - * bottomRightTaskPlusDividerPercent); - } - } - } - return new Pair<>(translationX, translationY); - } - - /* ---------- The following are only used by TaskViewTouchHandler. ---------- */ - - @Override - public SingleAxisSwipeDetector.Direction getUpDownSwipeDirection() { - return VERTICAL; - } - - @Override - public int getUpDirection(boolean isRtl) { - // Ignore rtl since it only affects X value displacement, Y displacement doesn't change - return SingleAxisSwipeDetector.DIRECTION_POSITIVE; - } - - @Override - public int getDownDirection(boolean isRtl) { - // Ignore rtl since it only affects X value displacement, Y displacement doesn't change - return SingleAxisSwipeDetector.DIRECTION_NEGATIVE; - } - - @Override - public boolean isGoingUp(float displacement, boolean isRtl) { - // Ignore rtl since it only affects X value displacement, Y displacement doesn't change - return displacement < 0; - } - - @Override - public int getTaskDragDisplacementFactor(boolean isRtl) { - // Ignore rtl since it only affects X value displacement, Y displacement doesn't change - return 1; - } - - /* -------------------- */ - @Override - public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) { - return dp.heightPx - rect.bottom; - } - - @Override - public List getSplitPositionOptions(DeviceProfile dp) { - if (dp.isTablet) { - return Utilities.getSplitPositionOptions(dp); - } - - List options = new ArrayList<>(); - if (dp.isSeascape()) { - options.add(new SplitPositionOption( - R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, - STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN)); - } else if (dp.isLeftRightSplit) { - options.add(new SplitPositionOption( - R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, - STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); - } else { - // Only add top option - options.add(new SplitPositionOption( - R.drawable.ic_split_vertical, R.string.recent_task_option_split_screen, - STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); - } - return options; - } - - @Override - public void getInitialSplitPlaceholderBounds(int placeholderHeight, int placeholderInset, - DeviceProfile dp, @StagePosition int stagePosition, Rect out) { - int screenWidth = dp.widthPx; - int screenHeight = dp.heightPx; - boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT; - int insetSizeAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight); - - out.set(0, 0, screenWidth, placeholderHeight + insetSizeAdjustment); - if (!dp.isLeftRightSplit) { - // portrait, phone or tablet - spans width of screen, nothing else to do - out.inset(placeholderInset, 0); - - // Adjust the top to account for content off screen. This will help to animate the view - // in with rounded corners. - int totalHeight = (int) (1.0f * screenHeight / 2 * (screenWidth - 2 * placeholderInset) - / screenWidth); - out.top -= (totalHeight - placeholderHeight); - return; - } - - // Now we rotate the portrait rect depending on what side we want pinned - - float postRotateScale = (float) screenHeight / screenWidth; - mTmpMatrix.reset(); - mTmpMatrix.postRotate(pinToRight ? 90 : 270); - mTmpMatrix.postTranslate(pinToRight ? screenWidth : 0, pinToRight ? 0 : screenWidth); - // The placeholder height stays constant after rotation, so we don't change width scale - mTmpMatrix.postScale(1, postRotateScale); - - mTmpRectF.set(out); - mTmpMatrix.mapRect(mTmpRectF); - mTmpRectF.inset(0, placeholderInset); - mTmpRectF.roundOut(out); - - // Adjust the top to account for content off screen. This will help to animate the view in - // with rounded corners. - int totalWidth = (int) (1.0f * screenWidth / 2 * (screenHeight - 2 * placeholderInset) - / screenHeight); - int width = out.width(); - if (pinToRight) { - out.right += totalWidth - width; - } else { - out.left -= totalWidth - width; - } - } - - @Override - public void updateSplitIconParams(View out, float onScreenRectCenterX, - float onScreenRectCenterY, float fullscreenScaleX, float fullscreenScaleY, - int drawableWidth, int drawableHeight, DeviceProfile dp, - @StagePosition int stagePosition) { - boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT; - float insetAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight) / 2f; - if (!dp.isLeftRightSplit) { - out.setX(onScreenRectCenterX / fullscreenScaleX - - 1.0f * drawableWidth / 2); - out.setY((onScreenRectCenterY + insetAdjustment) / fullscreenScaleY - - 1.0f * drawableHeight / 2); - } else { - if (pinToRight) { - out.setX((onScreenRectCenterX - insetAdjustment) / fullscreenScaleX - - 1.0f * drawableWidth / 2); - } else { - out.setX((onScreenRectCenterX + insetAdjustment) / fullscreenScaleX - - 1.0f * drawableWidth / 2); - } - out.setY(onScreenRectCenterY / fullscreenScaleY - - 1.0f * drawableHeight / 2); - } - } - - /** - * The split placeholder comes with a default inset to buffer the icon from the top of the - * screen. But if the device already has a large inset (from cutouts etc), use that instead. - */ - private int getPlaceholderSizeAdjustment(DeviceProfile dp, boolean pinToRight) { - int insetThickness; - if (!dp.isLandscape) { - insetThickness = dp.getInsets().top; - } else { - insetThickness = pinToRight ? dp.getInsets().right : dp.getInsets().left; - } - return Math.max(insetThickness - dp.splitPlaceholderInset, 0); - } - - @Override - public void setSplitInstructionsParams(View out, DeviceProfile dp, int splitInstructionsHeight, - int splitInstructionsWidth) { - out.setPivotX(0); - out.setPivotY(splitInstructionsHeight); - out.setRotation(getDegreesRotated()); - int distanceToEdge; - if (dp.isPhone) { - if (dp.isLandscape) { - distanceToEdge = out.getResources().getDimensionPixelSize( - R.dimen.split_instructions_bottom_margin_phone_landscape); - } else { - distanceToEdge = out.getResources().getDimensionPixelSize( - R.dimen.split_instructions_bottom_margin_phone_portrait); - } - } else { - distanceToEdge = dp.getOverviewActionsClaimedSpaceBelow(); - } - - // Center the view in case of unbalanced insets on left or right of screen - int insetCorrectionX = (dp.getInsets().right - dp.getInsets().left) / 2; - // Adjust for any insets on the bottom edge - int insetCorrectionY = dp.getInsets().bottom; - out.setTranslationX(insetCorrectionX); - out.setTranslationY(-distanceToEdge + insetCorrectionY); - FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) out.getLayoutParams(); - lp.gravity = CENTER_HORIZONTAL | BOTTOM; - out.setLayoutParams(lp); - } - - @Override - public void getFinalSplitPlaceholderBounds(int splitDividerSize, DeviceProfile dp, - @StagePosition int stagePosition, Rect out1, Rect out2) { - int screenHeight = dp.heightPx; - int screenWidth = dp.widthPx; - out1.set(0, 0, screenWidth, screenHeight / 2 - splitDividerSize); - out2.set(0, screenHeight / 2 + splitDividerSize, screenWidth, screenHeight); - if (!dp.isLeftRightSplit) { - // Portrait - the window bounds are always top and bottom half - return; - } - - // Now we rotate the portrait rect depending on what side we want pinned - boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT; - float postRotateScale = (float) screenHeight / screenWidth; - - mTmpMatrix.reset(); - mTmpMatrix.postRotate(pinToRight ? 90 : 270); - mTmpMatrix.postTranslate(pinToRight ? screenHeight : 0, pinToRight ? 0 : screenWidth); - mTmpMatrix.postScale(1 / postRotateScale, postRotateScale); - - mTmpRectF.set(out1); - mTmpMatrix.mapRect(mTmpRectF); - mTmpRectF.roundOut(out1); - - mTmpRectF.set(out2); - mTmpMatrix.mapRect(mTmpRectF); - mTmpRectF.roundOut(out2); - } - - @Override - public void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect, - SplitBounds splitInfo, int desiredStagePosition) { - float topLeftTaskPercent = splitInfo.appsStackedVertically - ? splitInfo.topTaskPercent - : splitInfo.leftTaskPercent; - float dividerBarPercent = splitInfo.appsStackedVertically - ? splitInfo.dividerHeightPercent - : splitInfo.dividerWidthPercent; - - int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight; - float scale = (float) outRect.height() / (dp.availableHeightPx - taskbarHeight); - float topTaskHeight = dp.availableHeightPx * topLeftTaskPercent; - float scaledTopTaskHeight = topTaskHeight * scale; - float dividerHeight = dp.availableHeightPx * dividerBarPercent; - float scaledDividerHeight = dividerHeight * scale; - - if (desiredStagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) { - if (dp.isLeftRightSplit) { - outRect.right = outRect.left + Math.round(outRect.width() * topLeftTaskPercent); - } else { - outRect.bottom = Math.round(outRect.top + scaledTopTaskHeight); - } - } else { - if (dp.isLeftRightSplit) { - outRect.left += Math.round(outRect.width() - * (topLeftTaskPercent + dividerBarPercent)); - } else { - outRect.top += Math.round(scaledTopTaskHeight + scaledDividerHeight); - } - } - } - - /** - * @param inSplitSelection Whether user currently has a task from this task group staged for - * split screen. If true, we have custom translations/scaling in place - * for the remaining snapshot, so we'll skip setting translation/scale - * here. - */ - @Override - public void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot, - int parentWidth, int parentHeight, SplitBounds splitBoundsConfig, - DeviceProfile dp, boolean isRtl, boolean inSplitSelection) { - int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx; - - FrameLayout.LayoutParams primaryParams = - (FrameLayout.LayoutParams) primarySnapshot.getLayoutParams(); - FrameLayout.LayoutParams secondaryParams = - (FrameLayout.LayoutParams) secondarySnapshot.getLayoutParams(); - - // Reset margins that aren't used in this method, but are used in other - // `RecentsPagedOrientationHandler` variants. - secondaryParams.topMargin = 0; - primaryParams.topMargin = spaceAboveSnapshot; - - int totalThumbnailHeight = parentHeight - spaceAboveSnapshot; - float dividerScale = splitBoundsConfig.appsStackedVertically - ? splitBoundsConfig.dividerHeightPercent - : splitBoundsConfig.dividerWidthPercent; - Pair taskViewSizes = - getGroupedTaskViewSizes(dp, splitBoundsConfig, parentWidth, parentHeight); - if (!inSplitSelection) { - // Reset translations that aren't used in this method, but are used in other - // `RecentsPagedOrientationHandler` variants. - primarySnapshot.setTranslationY(0); - - if (dp.isLeftRightSplit) { - int scaledDividerBar = Math.round(parentWidth * dividerScale); - if (isRtl) { - int translationX = taskViewSizes.second.x + scaledDividerBar; - primarySnapshot.setTranslationX(-translationX); - secondarySnapshot.setTranslationX(0); - } else { - int translationX = taskViewSizes.first.x + scaledDividerBar; - secondarySnapshot.setTranslationX(translationX); - primarySnapshot.setTranslationX(0); - } - secondarySnapshot.setTranslationY(spaceAboveSnapshot); - } else { - float finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale); - float translationY = - taskViewSizes.first.y + spaceAboveSnapshot + finalDividerHeight; - secondarySnapshot.setTranslationY(translationY); - - // Reset unused translations. - secondarySnapshot.setTranslationX(0); - primarySnapshot.setTranslationX(0); - } - } - - primarySnapshot.measure( - View.MeasureSpec.makeMeasureSpec(taskViewSizes.first.x, View.MeasureSpec.EXACTLY), - View.MeasureSpec.makeMeasureSpec(taskViewSizes.first.y, View.MeasureSpec.EXACTLY)); - secondarySnapshot.measure( - View.MeasureSpec.makeMeasureSpec(taskViewSizes.second.x, View.MeasureSpec.EXACTLY), - View.MeasureSpec.makeMeasureSpec(taskViewSizes.second.y, - View.MeasureSpec.EXACTLY)); - } - - @Override - public Pair getGroupedTaskViewSizes( - DeviceProfile dp, - SplitBounds splitBoundsConfig, - int parentWidth, - int parentHeight) { - int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx; - int totalThumbnailHeight = parentHeight - spaceAboveSnapshot; - float dividerScale = splitBoundsConfig.appsStackedVertically - ? splitBoundsConfig.dividerHeightPercent - : splitBoundsConfig.dividerWidthPercent; - float taskPercent = splitBoundsConfig.appsStackedVertically - ? splitBoundsConfig.topTaskPercent - : splitBoundsConfig.leftTaskPercent; - - Point firstTaskViewSize = new Point(); - Point secondTaskViewSize = new Point(); - - if (dp.isLeftRightSplit) { - int scaledDividerBar = Math.round(parentWidth * dividerScale); - firstTaskViewSize.x = Math.round(parentWidth * taskPercent); - firstTaskViewSize.y = totalThumbnailHeight; - - secondTaskViewSize.x = parentWidth - firstTaskViewSize.x - scaledDividerBar; - secondTaskViewSize.y = totalThumbnailHeight; - } else { - int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight; - float scale = (float) totalThumbnailHeight / (dp.availableHeightPx - taskbarHeight); - float topTaskHeight = dp.availableHeightPx * taskPercent; - float finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale); - float scaledTopTaskHeight = topTaskHeight * scale; - firstTaskViewSize.x = parentWidth; - firstTaskViewSize.y = Math.round(scaledTopTaskHeight); - - secondTaskViewSize.x = parentWidth; - secondTaskViewSize.y = Math.round(totalThumbnailHeight - firstTaskViewSize.y - - finalDividerHeight); - } - - return new Pair<>(firstTaskViewSize, secondTaskViewSize); - } - - @Override - public void setTaskIconParams(FrameLayout.LayoutParams iconParams, int taskIconMargin, - int taskIconHeight, int thumbnailTopMargin, boolean isRtl) { - iconParams.gravity = TOP | CENTER_HORIZONTAL; - // Reset margins, since they may have been set on rotation - iconParams.leftMargin = iconParams.rightMargin = 0; - iconParams.topMargin = iconParams.bottomMargin = 0; - } - - @Override - public void setIconAppChipChildrenParams(FrameLayout.LayoutParams iconParams, - int chipChildMarginStart) { - iconParams.setMarginStart(chipChildMarginStart); - iconParams.gravity = Gravity.START | Gravity.CENTER_VERTICAL; - iconParams.topMargin = 0; - } - - @Override - public void setIconAppChipMenuParams(IconAppChipView iconAppChipView, - FrameLayout.LayoutParams iconMenuParams, int iconMenuMargin, int thumbnailTopMargin) { - iconMenuParams.gravity = TOP | START; - iconMenuParams.setMarginStart(iconMenuMargin); - iconMenuParams.topMargin = thumbnailTopMargin; - iconMenuParams.bottomMargin = 0; - iconMenuParams.setMarginEnd(0); - - iconAppChipView.setPivotX(0); - iconAppChipView.setPivotY(0); - iconAppChipView.setSplitTranslationY(0); - iconAppChipView.setRotation(getDegreesRotated()); - } - - /** - * @param inSplitSelection Whether user currently has a task from this task group staged for - * split screen. If true, we have custom translations in place for the - * remaining icon, so we'll skip setting translations here. - */ - @Override - public void setSplitIconParams(View primaryIconView, View secondaryIconView, - int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight, - int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl, - DeviceProfile deviceProfile, SplitBounds splitConfig, boolean inSplitSelection) { - FrameLayout.LayoutParams primaryIconParams = - (FrameLayout.LayoutParams) primaryIconView.getLayoutParams(); - FrameLayout.LayoutParams secondaryIconParams = enableOverviewIconMenu() - ? (FrameLayout.LayoutParams) secondaryIconView.getLayoutParams() - : new FrameLayout.LayoutParams(primaryIconParams); - - if (enableOverviewIconMenu()) { - IconAppChipView primaryAppChipView = (IconAppChipView) primaryIconView; - IconAppChipView secondaryAppChipView = (IconAppChipView) secondaryIconView; - primaryIconParams.gravity = TOP | START; - secondaryIconParams.gravity = TOP | START; - secondaryIconParams.topMargin = primaryIconParams.topMargin; - secondaryIconParams.setMarginStart(primaryIconParams.getMarginStart()); - if (!inSplitSelection) { - if (deviceProfile.isLeftRightSplit) { - if (isRtl) { - int secondarySnapshotWidth = groupedTaskViewWidth - primarySnapshotWidth; - primaryAppChipView.setSplitTranslationX(-secondarySnapshotWidth); - } else { - secondaryAppChipView.setSplitTranslationX(primarySnapshotWidth); - } - } else { - primaryAppChipView.setSplitTranslationX(0); - secondaryAppChipView.setSplitTranslationX(0); - int dividerThickness = Math.min(splitConfig.visualDividerBounds.width(), - splitConfig.visualDividerBounds.height()); - secondaryAppChipView.setSplitTranslationY( - primarySnapshotHeight + (deviceProfile.isTablet ? 0 - : dividerThickness)); - } - } - } else if (deviceProfile.isLeftRightSplit) { - // We calculate the "midpoint" of the thumbnail area, and place the icons there. - // This is the place where the thumbnail area splits by default, in a near-50/50 split. - // It is usually not exactly 50/50, due to insets/screen cutouts. - int fullscreenInsetThickness = deviceProfile.isSeascape() - ? deviceProfile.getInsets().right - : deviceProfile.getInsets().left; - int fullscreenMidpointFromBottom = ((deviceProfile.widthPx - - fullscreenInsetThickness) / 2); - float midpointFromEndPct = (float) fullscreenMidpointFromBottom - / deviceProfile.widthPx; - float insetPct = (float) fullscreenInsetThickness / deviceProfile.widthPx; - int spaceAboveSnapshots = 0; - int overviewThumbnailAreaThickness = groupedTaskViewWidth - spaceAboveSnapshots; - int bottomToMidpointOffset = (int) (overviewThumbnailAreaThickness - * midpointFromEndPct); - int insetOffset = (int) (overviewThumbnailAreaThickness * insetPct); - - if (deviceProfile.isSeascape()) { - primaryIconParams.gravity = TOP | (isRtl ? END : START); - secondaryIconParams.gravity = TOP | (isRtl ? END : START); - if (!inSplitSelection) { - if (splitConfig.initiatedFromSeascape) { - // if the split was initiated from seascape, - // the task on the right (secondary) is slightly larger - primaryIconView.setTranslationX(bottomToMidpointOffset - taskIconHeight); - secondaryIconView.setTranslationX(bottomToMidpointOffset); - } else { - // if not, - // the task on the left (primary) is slightly larger - primaryIconView.setTranslationX(bottomToMidpointOffset + insetOffset - - taskIconHeight); - secondaryIconView.setTranslationX(bottomToMidpointOffset + insetOffset); - } - } - } else { - primaryIconParams.gravity = TOP | (isRtl ? START : END); - secondaryIconParams.gravity = TOP | (isRtl ? START : END); - if (!inSplitSelection) { - if (!splitConfig.initiatedFromSeascape) { - // if the split was initiated from landscape, - // the task on the left (primary) is slightly larger - primaryIconView.setTranslationX(-bottomToMidpointOffset); - secondaryIconView.setTranslationX(-bottomToMidpointOffset + taskIconHeight); - } else { - // if not, - // the task on the right (secondary) is slightly larger - primaryIconView.setTranslationX(-bottomToMidpointOffset - insetOffset); - secondaryIconView.setTranslationX(-bottomToMidpointOffset - insetOffset - + taskIconHeight); - } - } - } - } else { - primaryIconParams.gravity = TOP | CENTER_HORIZONTAL; - secondaryIconParams.gravity = TOP | CENTER_HORIZONTAL; - if (!inSplitSelection) { - // shifts icon half a width left (height is used here since icons are square) - primaryIconView.setTranslationX(-(taskIconHeight / 2f)); - secondaryIconView.setTranslationX(taskIconHeight / 2f); - } - } - if (!enableOverviewIconMenu() && !inSplitSelection) { - primaryIconView.setTranslationY(0); - secondaryIconView.setTranslationY(0); - } - - - primaryIconView.setLayoutParams(primaryIconParams); - secondaryIconView.setLayoutParams(secondaryIconParams); - } - - @Override - public int getDefaultSplitPosition(DeviceProfile deviceProfile) { - if (!deviceProfile.isTablet) { - throw new IllegalStateException("Default position available only for large screens"); - } - if (deviceProfile.isLeftRightSplit) { - return STAGE_POSITION_BOTTOM_OR_RIGHT; - } else { - return STAGE_POSITION_TOP_OR_LEFT; - } - } - - @Override - public Pair getSplitSelectTaskOffset(FloatProperty primary, - FloatProperty secondary, DeviceProfile deviceProfile) { - if (deviceProfile.isLeftRightSplit) { // or seascape - return new Pair<>(primary, secondary); - } else { - return new Pair<>(secondary, primary); - } - } - - @Override - public float getFloatingTaskOffscreenTranslationTarget(View floatingTask, RectF onScreenRect, - @StagePosition int stagePosition, DeviceProfile dp) { - if (dp.isLeftRightSplit) { - float currentTranslationX = floatingTask.getTranslationX(); - return stagePosition == STAGE_POSITION_TOP_OR_LEFT - ? currentTranslationX - onScreenRect.width() - : currentTranslationX + onScreenRect.width(); - } else { - float currentTranslationY = floatingTask.getTranslationY(); - return currentTranslationY - onScreenRect.height(); - } - } - - @Override - public void setFloatingTaskPrimaryTranslation(View floatingTask, float translation, - DeviceProfile dp) { - if (dp.isLeftRightSplit) { - floatingTask.setTranslationX(translation); - } else { - floatingTask.setTranslationY(translation); - } - - } - - @Override - public float getFloatingTaskPrimaryTranslation(View floatingTask, DeviceProfile dp) { - return dp.isLeftRightSplit - ? floatingTask.getTranslationX() - : floatingTask.getTranslationY(); - } - - @NonNull - @Override - public LauncherAtom.TaskSwitcherContainer.OrientationHandler getHandlerTypeForLogging() { - return LauncherAtom.TaskSwitcherContainer.OrientationHandler.PORTRAIT; - } -} diff --git a/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.kt b/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.kt new file mode 100644 index 0000000000..18836492b6 --- /dev/null +++ b/quickstep/src/com/android/quickstep/orientation/PortraitPagedViewHandler.kt @@ -0,0 +1,911 @@ +/* + * 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.quickstep.orientation + +import android.graphics.Matrix +import android.graphics.Point +import android.graphics.PointF +import android.graphics.Rect +import android.graphics.RectF +import android.graphics.drawable.ShapeDrawable +import android.util.FloatProperty +import android.util.Pair +import android.view.Gravity +import android.view.Surface +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import android.widget.LinearLayout +import androidx.core.view.updateLayoutParams +import com.android.launcher3.DeviceProfile +import com.android.launcher3.Flags.enableOverviewIconMenu +import com.android.launcher3.LauncherAnimUtils +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.logger.LauncherAtom +import com.android.launcher3.touch.DefaultPagedViewHandler +import com.android.launcher3.touch.PagedOrientationHandler.Float2DAction +import com.android.launcher3.touch.PagedOrientationHandler.Int2DAction +import com.android.launcher3.touch.SingleAxisSwipeDetector +import com.android.launcher3.util.SplitConfigurationOptions +import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption +import com.android.launcher3.util.SplitConfigurationOptions.StagePosition +import com.android.quickstep.views.IconAppChipView +import kotlin.math.max +import kotlin.math.min + +class PortraitPagedViewHandler : DefaultPagedViewHandler(), RecentsPagedOrientationHandler { + private val tmpMatrix = Matrix() + private val tmpRectF = RectF() + + override fun getPrimaryValue(x: T, y: T): T = x + + override fun getSecondaryValue(x: T, y: T): T = y + + override val isLayoutNaturalToLauncher: Boolean = true + + override fun adjustFloatingIconStartVelocity(velocity: PointF) { + // no-op + } + + override fun fixBoundsForHomeAnimStartRect(outStartRect: RectF, deviceProfile: DeviceProfile) { + if (outStartRect.left > deviceProfile.widthPx) { + outStartRect.offsetTo(0f, outStartRect.top) + } else if (outStartRect.left < -deviceProfile.widthPx) { + outStartRect.offsetTo(0f, outStartRect.top) + } + } + + override fun setSecondary(target: T, action: Float2DAction, param: Float) = + action.call(target, 0f, param) + + override fun set( + target: T, + action: Int2DAction, + primaryParam: Int, + secondaryParam: Int, + ) = action.call(target, primaryParam, secondaryParam) + + override fun getPrimarySize(view: View): Int = view.width + + override fun getPrimarySize(rect: RectF): Float = rect.width() + + override fun getStart(rect: RectF): Float = rect.left + + override fun getEnd(rect: RectF): Float = rect.right + + override fun rotateInsets(insets: Rect, outInsets: Rect) = outInsets.set(insets) + + override fun getClearAllSidePadding(view: View, isRtl: Boolean): Int = + (if (isRtl) view.paddingRight else -view.paddingLeft) / 2 + + override fun getSecondaryDimension(view: View): Int = view.height + + override val primaryViewTranslate: FloatProperty = LauncherAnimUtils.VIEW_TRANSLATE_X + + override val secondaryViewTranslate: FloatProperty = LauncherAnimUtils.VIEW_TRANSLATE_Y + + override val degreesRotated: Float = 0f + + override val rotation: Int = Surface.ROTATION_0 + + override fun setPrimaryScale(view: View, scale: Float) { + view.scaleX = scale + } + + override fun setSecondaryScale(view: View, scale: Float) { + view.scaleY = scale + } + + override val secondaryTranslationDirectionFactor: Int + get() = -1 + + override fun getSplitTranslationDirectionFactor( + stagePosition: Int, + deviceProfile: DeviceProfile, + ): Int = + if ( + deviceProfile.isLeftRightSplit && + stagePosition == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + ) { + -1 + } else { + 1 + } + + override fun getTaskMenuX( + x: Float, + thumbnailView: View, + deviceProfile: DeviceProfile, + taskInsetMargin: Float, + taskViewIcon: View, + ): Float = + if (deviceProfile.isLandscape) { + (x + + taskInsetMargin + + (thumbnailView.measuredWidth - thumbnailView.measuredHeight) / 2f) + } else { + x + taskInsetMargin + } + + override fun getTaskMenuY( + y: Float, + thumbnailView: View, + stagePosition: Int, + taskMenuView: View, + taskInsetMargin: Float, + taskViewIcon: View, + ): Float = y + taskInsetMargin + + override fun getTaskMenuWidth( + thumbnailView: View, + deviceProfile: DeviceProfile, + @StagePosition stagePosition: Int, + ): Int = + when { + enableOverviewIconMenu() -> { + thumbnailView.resources.getDimensionPixelSize( + R.dimen.task_thumbnail_icon_menu_expanded_width + ) + } + + (deviceProfile.isLandscape && !deviceProfile.isTablet) -> { + val padding = + thumbnailView.resources.getDimensionPixelSize(R.dimen.task_menu_edge_padding) + thumbnailView.measuredHeight - (2 * padding) + } + + else -> { + val padding = + thumbnailView.resources.getDimensionPixelSize(R.dimen.task_menu_edge_padding) + thumbnailView.measuredWidth - (2 * padding) + } + } + + override fun getTaskMenuHeight( + taskInsetMargin: Float, + deviceProfile: DeviceProfile, + taskMenuX: Float, + taskMenuY: Float, + ): Int = + deviceProfile.heightPx - + deviceProfile.insets.top - + taskMenuY.toInt() - + deviceProfile.overviewActionsClaimedSpaceBelow + + override fun setTaskOptionsMenuLayoutOrientation( + deviceProfile: DeviceProfile, + taskMenuLayout: LinearLayout, + dividerSpacing: Int, + dividerDrawable: ShapeDrawable, + ) { + taskMenuLayout.orientation = LinearLayout.VERTICAL + dividerDrawable.intrinsicHeight = dividerSpacing + taskMenuLayout.dividerDrawable = dividerDrawable + } + + override fun setLayoutParamsForTaskMenuOptionItem( + lp: LinearLayout.LayoutParams, + viewGroup: LinearLayout, + deviceProfile: DeviceProfile, + ) { + viewGroup.orientation = LinearLayout.HORIZONTAL + lp.width = LinearLayout.LayoutParams.MATCH_PARENT + lp.height = ViewGroup.LayoutParams.WRAP_CONTENT + } + + override fun updateDwbBannerLayout( + taskViewWidth: Int, + taskViewHeight: Int, + isGroupedTaskView: Boolean, + deviceProfile: DeviceProfile, + snapshotViewWidth: Int, + snapshotViewHeight: Int, + banner: View, + ) { + banner.pivotX = 0f + banner.pivotY = 0f + banner.rotation = degreesRotated + banner.updateLayoutParams { + if (isGroupedTaskView) { + gravity = + Gravity.BOTTOM or + (if (deviceProfile.isLeftRightSplit) Gravity.START + else Gravity.CENTER_HORIZONTAL) + width = snapshotViewWidth + } else { + width = ViewGroup.LayoutParams.MATCH_PARENT + gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL + } + } + } + + override fun getDwbBannerTranslations( + taskViewWidth: Int, + taskViewHeight: Int, + splitBounds: SplitConfigurationOptions.SplitBounds?, + deviceProfile: DeviceProfile, + thumbnailViews: Array, + desiredTaskId: Int, + banner: View, + ): Pair { + var translationX = 0f + var translationY = 0f + if (splitBounds != null) { + if (deviceProfile.isLeftRightSplit) { + if (desiredTaskId == splitBounds.rightBottomTaskId) { + val leftTopTaskPercent = splitBounds.leftTopTaskPercent + val dividerThicknessPercent = splitBounds.dividerPercent + translationX = + ((taskViewWidth * leftTopTaskPercent) + + (taskViewWidth * dividerThicknessPercent)) + } + } else { + if (desiredTaskId == splitBounds.leftTopTaskId) { + val snapshotParams = thumbnailViews[0].layoutParams as FrameLayout.LayoutParams + val bottomRightTaskPlusDividerPercent = + (splitBounds.rightBottomTaskPercent + splitBounds.dividerPercent) + translationY = + -((taskViewHeight - snapshotParams.topMargin) * + bottomRightTaskPlusDividerPercent) + } + } + } + return Pair(translationX, translationY) + } + + /* ---------- The following are only used by TaskViewTouchHandler. ---------- */ + + override val upDownSwipeDirection: SingleAxisSwipeDetector.Direction = + SingleAxisSwipeDetector.VERTICAL + + // Ignore rtl since it only affects X value displacement, Y displacement doesn't change + override fun getUpDirection(isRtl: Boolean): Int = SingleAxisSwipeDetector.DIRECTION_POSITIVE + + // Ignore rtl since it only affects X value displacement, Y displacement doesn't change + override fun getDownDirection(isRtl: Boolean): Int = SingleAxisSwipeDetector.DIRECTION_NEGATIVE + + // Ignore rtl since it only affects X value displacement, Y displacement doesn't change + override fun isGoingUp(displacement: Float, isRtl: Boolean): Boolean = displacement < 0 + + // Ignore rtl since it only affects X value displacement, Y displacement doesn't change + override fun getTaskDragDisplacementFactor(isRtl: Boolean): Int = 1 + + override fun getTaskDismissVerticalDirection(): Int = -1 + + override fun getTaskDismissLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + taskThumbnailBounds.bottom + + override fun getTaskLaunchLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + secondaryDimension - taskThumbnailBounds.bottom + + /* -------------------- */ + + override fun getDistanceToBottomOfRect(dp: DeviceProfile, rect: Rect): Int = + dp.heightPx - rect.bottom + + override fun getSplitPositionOptions(dp: DeviceProfile): List = + when { + dp.isTablet -> { + Utilities.getSplitPositionOptions(dp) + } + + dp.isSeascape -> { + listOf( + SplitPositionOption( + R.drawable.ic_split_horizontal, + R.string.recent_task_option_split_screen, + SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT, + SplitConfigurationOptions.STAGE_TYPE_MAIN, + ) + ) + } + + dp.isLeftRightSplit -> { + listOf( + SplitPositionOption( + R.drawable.ic_split_horizontal, + R.string.recent_task_option_split_screen, + SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT, + SplitConfigurationOptions.STAGE_TYPE_MAIN, + ) + ) + } + + else -> { + // Only add top option + listOf( + SplitPositionOption( + R.drawable.ic_split_vertical, + R.string.recent_task_option_split_screen, + SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT, + SplitConfigurationOptions.STAGE_TYPE_MAIN, + ) + ) + } + } + + override fun getInitialSplitPlaceholderBounds( + placeholderHeight: Int, + placeholderInset: Int, + dp: DeviceProfile, + @StagePosition stagePosition: Int, + out: Rect, + ) { + val screenWidth = dp.widthPx + val screenHeight = dp.heightPx + val pinToRight = stagePosition == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + val insetSizeAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight) + + out.set(0, 0, screenWidth, placeholderHeight + insetSizeAdjustment) + if (!dp.isLeftRightSplit) { + // portrait, phone or tablet - spans width of screen, nothing else to do + out.inset(placeholderInset, 0) + + // Adjust the top to account for content off screen. This will help to animate the view + // in with rounded corners. + val totalHeight = + (1.0f * screenHeight / 2 * (screenWidth - 2 * placeholderInset) / screenWidth) + .toInt() + out.top -= (totalHeight - placeholderHeight) + return + } + + // Now we rotate the portrait rect depending on what side we want pinned + val postRotateScale = screenHeight.toFloat() / screenWidth + tmpMatrix.reset() + tmpMatrix.postRotate(if (pinToRight) 90f else 270f) + tmpMatrix.postTranslate( + (if (pinToRight) screenWidth else 0).toFloat(), + (if (pinToRight) 0 else screenWidth).toFloat(), + ) + // The placeholder height stays constant after rotation, so we don't change width scale + tmpMatrix.postScale(1f, postRotateScale) + + tmpRectF.set(out) + tmpMatrix.mapRect(tmpRectF) + tmpRectF.inset(0f, placeholderInset.toFloat()) + tmpRectF.roundOut(out) + + // Adjust the top to account for content off screen. This will help to animate the view in + // with rounded corners. + val totalWidth = + (1.0f * screenWidth / 2 * (screenHeight - 2 * placeholderInset) / screenHeight).toInt() + val width = out.width() + if (pinToRight) { + out.right += totalWidth - width + } else { + out.left -= totalWidth - width + } + } + + override fun updateSplitIconParams( + out: View, + onScreenRectCenterX: Float, + onScreenRectCenterY: Float, + fullscreenScaleX: Float, + fullscreenScaleY: Float, + drawableWidth: Int, + drawableHeight: Int, + dp: DeviceProfile, + @StagePosition stagePosition: Int, + ) { + val pinToRight = stagePosition == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + val insetAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight) / 2f + if (!dp.isLeftRightSplit) { + out.x = (onScreenRectCenterX / fullscreenScaleX - 1.0f * drawableWidth / 2) + out.y = + ((onScreenRectCenterY + insetAdjustment) / fullscreenScaleY - + 1.0f * drawableHeight / 2) + } else { + if (pinToRight) { + out.x = + ((onScreenRectCenterX - insetAdjustment) / fullscreenScaleX - + 1.0f * drawableWidth / 2) + } else { + out.x = + ((onScreenRectCenterX + insetAdjustment) / fullscreenScaleX - + 1.0f * drawableWidth / 2) + } + out.y = (onScreenRectCenterY / fullscreenScaleY - 1.0f * drawableHeight / 2) + } + } + + /** + * The split placeholder comes with a default inset to buffer the icon from the top of the + * screen. But if the device already has a large inset (from cutouts etc), use that instead. + */ + private fun getPlaceholderSizeAdjustment(dp: DeviceProfile, pinToRight: Boolean): Int { + val insetThickness = + if (!dp.isLandscape) { + dp.insets.top + } else { + if (pinToRight) dp.insets.right else dp.insets.left + } + return max((insetThickness - dp.splitPlaceholderInset).toDouble(), 0.0).toInt() + } + + override fun setSplitInstructionsParams( + out: View, + dp: DeviceProfile, + splitInstructionsHeight: Int, + splitInstructionsWidth: Int, + ) { + out.pivotX = 0f + out.pivotY = splitInstructionsHeight.toFloat() + out.rotation = degreesRotated + val distanceToEdge = + if (dp.isPhone) { + if (dp.isLandscape) { + out.resources.getDimensionPixelSize( + R.dimen.split_instructions_bottom_margin_phone_landscape + ) + } else { + out.resources.getDimensionPixelSize( + R.dimen.split_instructions_bottom_margin_phone_portrait + ) + } + } else { + dp.overviewActionsClaimedSpaceBelow + } + + // Center the view in case of unbalanced insets on left or right of screen + val insetCorrectionX = (dp.insets.right - dp.insets.left) / 2 + // Adjust for any insets on the bottom edge + val insetCorrectionY = dp.insets.bottom + out.translationX = insetCorrectionX.toFloat() + out.translationY = (-distanceToEdge + insetCorrectionY).toFloat() + val lp = out.layoutParams as FrameLayout.LayoutParams + lp.gravity = Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM + out.layoutParams = lp + } + + override fun getFinalSplitPlaceholderBounds( + splitDividerSize: Int, + dp: DeviceProfile, + @StagePosition stagePosition: Int, + out1: Rect, + out2: Rect, + ) { + val screenHeight = dp.heightPx + val screenWidth = dp.widthPx + out1.set(0, 0, screenWidth, screenHeight / 2 - splitDividerSize) + out2.set(0, screenHeight / 2 + splitDividerSize, screenWidth, screenHeight) + if (!dp.isLeftRightSplit) { + // Portrait - the window bounds are always top and bottom half + return + } + + // Now we rotate the portrait rect depending on what side we want pinned + val pinToRight = stagePosition == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + val postRotateScale = screenHeight.toFloat() / screenWidth + + tmpMatrix.reset() + tmpMatrix.postRotate(if (pinToRight) 90f else 270f) + tmpMatrix.postTranslate( + (if (pinToRight) screenHeight else 0).toFloat(), + (if (pinToRight) 0 else screenWidth).toFloat(), + ) + tmpMatrix.postScale(1 / postRotateScale, postRotateScale) + + tmpRectF.set(out1) + tmpMatrix.mapRect(tmpRectF) + tmpRectF.roundOut(out1) + + tmpRectF.set(out2) + tmpMatrix.mapRect(tmpRectF) + tmpRectF.roundOut(out2) + } + + override fun setSplitTaskSwipeRect( + dp: DeviceProfile, + outRect: Rect, + splitInfo: SplitConfigurationOptions.SplitBounds, + desiredStagePosition: Int, + ) { + val topLeftTaskPercent = splitInfo.leftTopTaskPercent + val dividerBarPercent = splitInfo.dividerPercent + + val taskbarHeight = if (dp.isTransientTaskbar) 0 else dp.taskbarHeight + val scale = outRect.height().toFloat() / (dp.availableHeightPx - taskbarHeight) + val topTaskHeight = dp.availableHeightPx * topLeftTaskPercent + val scaledTopTaskHeight = topTaskHeight * scale + val dividerHeight = dp.availableHeightPx * dividerBarPercent + val scaledDividerHeight = dividerHeight * scale + + if (desiredStagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) { + if (dp.isLeftRightSplit) { + outRect.right = outRect.left + Math.round(outRect.width() * topLeftTaskPercent) + } else { + outRect.bottom = Math.round(outRect.top + scaledTopTaskHeight) + } + } else { + if (dp.isLeftRightSplit) { + outRect.left += + Math.round(outRect.width() * (topLeftTaskPercent + dividerBarPercent)) + } else { + outRect.top += Math.round(scaledTopTaskHeight + scaledDividerHeight) + } + } + } + + /** + * @param inSplitSelection Whether user currently has a task from this task group staged for + * split screen. If true, we have custom translations/scaling in place for the remaining + * snapshot, so we'll skip setting translation/scale here. + */ + override fun measureGroupedTaskViewThumbnailBounds( + primarySnapshot: View, + secondarySnapshot: View, + parentWidth: Int, + parentHeight: Int, + splitBoundsConfig: SplitConfigurationOptions.SplitBounds, + dp: DeviceProfile, + isRtl: Boolean, + inSplitSelection: Boolean, + ) { + val spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx + + val primaryParams = primarySnapshot.layoutParams as FrameLayout.LayoutParams + val secondaryParams = secondarySnapshot.layoutParams as FrameLayout.LayoutParams + + // Reset margins that aren't used in this method, but are used in other + // `RecentsPagedOrientationHandler` variants. + secondaryParams.topMargin = 0 + primaryParams.topMargin = spaceAboveSnapshot + + val totalThumbnailHeight = parentHeight - spaceAboveSnapshot + val dividerScale = splitBoundsConfig.dividerPercent + val taskViewSizes = + getGroupedTaskViewSizes(dp, splitBoundsConfig, parentWidth, parentHeight) + if (!inSplitSelection) { + // Reset translations that aren't used in this method, but are used in other + // `RecentsPagedOrientationHandler` variants. + primarySnapshot.translationY = 0f + + if (dp.isLeftRightSplit) { + val scaledDividerBar = Math.round(parentWidth * dividerScale) + if (isRtl) { + val translationX = taskViewSizes.second.x + scaledDividerBar + primarySnapshot.translationX = -translationX.toFloat() + secondarySnapshot.translationX = 0f + } else { + val translationX = taskViewSizes.first.x + scaledDividerBar + secondarySnapshot.translationX = translationX.toFloat() + primarySnapshot.translationX = 0f + } + secondarySnapshot.translationY = spaceAboveSnapshot.toFloat() + } else { + val finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale).toFloat() + val translationY = taskViewSizes.first.y + spaceAboveSnapshot + finalDividerHeight + secondarySnapshot.translationY = translationY + + // Reset unused translations. + secondarySnapshot.translationX = 0f + primarySnapshot.translationX = 0f + } + } + + primarySnapshot.measure( + View.MeasureSpec.makeMeasureSpec(taskViewSizes.first.x, View.MeasureSpec.EXACTLY), + View.MeasureSpec.makeMeasureSpec(taskViewSizes.first.y, View.MeasureSpec.EXACTLY), + ) + secondarySnapshot.measure( + View.MeasureSpec.makeMeasureSpec(taskViewSizes.second.x, View.MeasureSpec.EXACTLY), + View.MeasureSpec.makeMeasureSpec(taskViewSizes.second.y, View.MeasureSpec.EXACTLY), + ) + } + + override fun getGroupedTaskViewSizes( + dp: DeviceProfile, + splitBoundsConfig: SplitConfigurationOptions.SplitBounds, + parentWidth: Int, + parentHeight: Int, + ): Pair { + val spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx + val totalThumbnailHeight = parentHeight - spaceAboveSnapshot + val dividerScale = splitBoundsConfig.dividerPercent + val taskPercent = splitBoundsConfig.leftTopTaskPercent + + val firstTaskViewSize = Point() + val secondTaskViewSize = Point() + + if (dp.isLeftRightSplit) { + val scaledDividerBar = Math.round(parentWidth * dividerScale) + firstTaskViewSize.x = Math.round(parentWidth * taskPercent) + firstTaskViewSize.y = totalThumbnailHeight + + secondTaskViewSize.x = parentWidth - firstTaskViewSize.x - scaledDividerBar + secondTaskViewSize.y = totalThumbnailHeight + } else { + val taskbarHeight = if (dp.isTransientTaskbar) 0 else dp.taskbarHeight + val scale = totalThumbnailHeight.toFloat() / (dp.availableHeightPx - taskbarHeight) + val topTaskHeight = dp.availableHeightPx * taskPercent + val finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale).toFloat() + val scaledTopTaskHeight = topTaskHeight * scale + firstTaskViewSize.x = parentWidth + firstTaskViewSize.y = Math.round(scaledTopTaskHeight) + + secondTaskViewSize.x = parentWidth + secondTaskViewSize.y = + Math.round((totalThumbnailHeight - firstTaskViewSize.y - finalDividerHeight)) + } + + return Pair(firstTaskViewSize, secondTaskViewSize) + } + + override fun setTaskIconParams( + iconParams: FrameLayout.LayoutParams, + taskIconMargin: Int, + taskIconHeight: Int, + thumbnailTopMargin: Int, + isRtl: Boolean, + ) { + iconParams.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL + // Reset margins, since they may have been set on rotation + iconParams.rightMargin = 0 + iconParams.leftMargin = iconParams.rightMargin + iconParams.bottomMargin = 0 + iconParams.topMargin = iconParams.bottomMargin + } + + override fun setIconAppChipChildrenParams( + iconParams: FrameLayout.LayoutParams, + chipChildMarginStart: Int, + ) { + iconParams.marginStart = chipChildMarginStart + iconParams.gravity = Gravity.START or Gravity.CENTER_VERTICAL + iconParams.topMargin = 0 + } + + override fun setIconAppChipMenuParams( + iconAppChipView: IconAppChipView, + iconMenuParams: FrameLayout.LayoutParams, + iconMenuMargin: Int, + thumbnailTopMargin: Int, + ) { + iconMenuParams.gravity = Gravity.TOP or Gravity.START + iconMenuParams.marginStart = iconMenuMargin + iconMenuParams.topMargin = thumbnailTopMargin + iconMenuParams.bottomMargin = 0 + iconMenuParams.marginEnd = 0 + + iconAppChipView.pivotX = 0f + iconAppChipView.pivotY = 0f + iconAppChipView.setSplitTranslationY(0f) + iconAppChipView.rotation = degreesRotated + } + + /** + * @param inSplitSelection Whether user currently has a task from this task group staged for + * split screen. If true, we have custom translations in place for the remaining icon, so + * we'll skip setting translations here. + */ + override fun setSplitIconParams( + primaryIconView: View, + secondaryIconView: View, + taskIconHeight: Int, + primarySnapshotWidth: Int, + primarySnapshotHeight: Int, + groupedTaskViewHeight: Int, + groupedTaskViewWidth: Int, + isRtl: Boolean, + deviceProfile: DeviceProfile, + splitConfig: SplitConfigurationOptions.SplitBounds, + inSplitSelection: Boolean, + oneIconHiddenDueToSmallWidth: Boolean, + ) { + val primaryIconParams = primaryIconView.layoutParams as FrameLayout.LayoutParams + val secondaryIconParams = + if (enableOverviewIconMenu()) secondaryIconView.layoutParams as FrameLayout.LayoutParams + else FrameLayout.LayoutParams(primaryIconParams) + + if (enableOverviewIconMenu()) { + val primaryAppChipView = primaryIconView as IconAppChipView + val secondaryAppChipView = secondaryIconView as IconAppChipView + primaryIconParams.gravity = Gravity.TOP or Gravity.START + secondaryIconParams.gravity = Gravity.TOP or Gravity.START + secondaryIconParams.topMargin = primaryIconParams.topMargin + secondaryIconParams.marginStart = primaryIconParams.marginStart + if (!inSplitSelection) { + if (deviceProfile.isLeftRightSplit) { + if (isRtl) { + val secondarySnapshotWidth = groupedTaskViewWidth - primarySnapshotWidth + primaryAppChipView.setSplitTranslationX(-secondarySnapshotWidth.toFloat()) + } else { + secondaryAppChipView.setSplitTranslationX(primarySnapshotWidth.toFloat()) + } + } else { + primaryAppChipView.setSplitTranslationX(0f) + secondaryAppChipView.setSplitTranslationX(0f) + val dividerThickness = + min( + splitConfig.visualDividerBounds.width().toDouble(), + splitConfig.visualDividerBounds.height().toDouble(), + ) + .toInt() + secondaryAppChipView.setSplitTranslationY( + (primarySnapshotHeight + + (if (deviceProfile.isTablet) 0 else dividerThickness)) + .toFloat() + ) + } + } + } else if (deviceProfile.isLeftRightSplit) { + // We calculate the "midpoint" of the thumbnail area, and place the icons there. + // This is the place where the thumbnail area splits by default, in a near-50/50 split. + // It is usually not exactly 50/50, due to insets/screen cutouts. + val fullscreenInsetThickness = + if (deviceProfile.isSeascape) deviceProfile.insets.right + else deviceProfile.insets.left + val fullscreenMidpointFromBottom = + ((deviceProfile.widthPx - fullscreenInsetThickness) / 2) + val midpointFromEndPct = fullscreenMidpointFromBottom.toFloat() / deviceProfile.widthPx + val insetPct = fullscreenInsetThickness.toFloat() / deviceProfile.widthPx + val spaceAboveSnapshots = 0 + val overviewThumbnailAreaThickness = groupedTaskViewWidth - spaceAboveSnapshots + val bottomToMidpointOffset = + (overviewThumbnailAreaThickness * midpointFromEndPct).toInt() + val insetOffset = (overviewThumbnailAreaThickness * insetPct).toInt() + + if (deviceProfile.isSeascape) { + primaryIconParams.gravity = + Gravity.TOP or (if (isRtl) Gravity.END else Gravity.START) + secondaryIconParams.gravity = + Gravity.TOP or (if (isRtl) Gravity.END else Gravity.START) + if (!inSplitSelection) { + if (splitConfig.initiatedFromSeascape) { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerX = bottomToMidpointOffset - (taskIconHeight / 2f) + primaryIconView.translationX = centerX + secondaryIconView.translationX = centerX + } else { + // the task on the right (secondary) is slightly larger + primaryIconView.translationX = + (bottomToMidpointOffset - taskIconHeight).toFloat() + secondaryIconView.translationX = bottomToMidpointOffset.toFloat() + } + } else { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerX = + bottomToMidpointOffset + insetOffset - (taskIconHeight / 2f) + primaryIconView.translationX = centerX + secondaryIconView.translationX = centerX + } else { + // the task on the left (primary) is slightly larger + primaryIconView.translationX = + (bottomToMidpointOffset + insetOffset - taskIconHeight).toFloat() + secondaryIconView.translationX = + (bottomToMidpointOffset + insetOffset).toFloat() + } + } + } + } else { + primaryIconParams.gravity = + Gravity.TOP or (if (isRtl) Gravity.START else Gravity.END) + secondaryIconParams.gravity = + Gravity.TOP or (if (isRtl) Gravity.START else Gravity.END) + if (!inSplitSelection) { + if (!splitConfig.initiatedFromSeascape) { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerX = -bottomToMidpointOffset + (taskIconHeight / 2f) + primaryIconView.translationX = centerX + secondaryIconView.translationX = centerX + } else { + // the task on the left (primary) is slightly larger + primaryIconView.translationX = -bottomToMidpointOffset.toFloat() + secondaryIconView.translationX = + (-bottomToMidpointOffset + taskIconHeight).toFloat() + } + } else { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerX = + -bottomToMidpointOffset - insetOffset + (taskIconHeight / 2f) + primaryIconView.translationX = centerX + secondaryIconView.translationX = centerX + } else { + // the task on the right (secondary) is slightly larger + primaryIconView.translationX = + (-bottomToMidpointOffset - insetOffset).toFloat() + secondaryIconView.translationX = + (-bottomToMidpointOffset - insetOffset + taskIconHeight).toFloat() + } + } + } + } + } else { + primaryIconParams.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL + secondaryIconParams.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL + if (!inSplitSelection) { + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + primaryIconView.translationX = 0f + secondaryIconView.translationX = 0f + } else { + // shifts icon half a width left (height is used here since icons are square) + primaryIconView.translationX = -(taskIconHeight / 2f) + secondaryIconView.translationX = taskIconHeight / 2f + } + } + } + if (!enableOverviewIconMenu() && !inSplitSelection) { + primaryIconView.translationY = 0f + secondaryIconView.translationY = 0f + } + + primaryIconView.layoutParams = primaryIconParams + secondaryIconView.layoutParams = secondaryIconParams + } + + override fun getDefaultSplitPosition(deviceProfile: DeviceProfile): Int { + check(deviceProfile.isTablet) { "Default position available only for large screens" } + return if (deviceProfile.isLeftRightSplit) { + SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + } else { + SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT + } + } + + override fun getSplitSelectTaskOffset( + primary: FloatProperty, + secondary: FloatProperty, + deviceProfile: DeviceProfile, + ): Pair, FloatProperty> = + if (deviceProfile.isLeftRightSplit) { // or seascape + Pair(primary, secondary) + } else { + Pair(secondary, primary) + } + + override fun getFloatingTaskOffscreenTranslationTarget( + floatingTask: View, + onScreenRect: RectF, + @StagePosition stagePosition: Int, + dp: DeviceProfile, + ): Float { + if (dp.isLeftRightSplit) { + val currentTranslationX = floatingTask.translationX + return if (stagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) + currentTranslationX - onScreenRect.width() + else currentTranslationX + onScreenRect.width() + } else { + val currentTranslationY = floatingTask.translationY + return currentTranslationY - onScreenRect.height() + } + } + + override fun setFloatingTaskPrimaryTranslation( + floatingTask: View, + translation: Float, + dp: DeviceProfile, + ) { + if (dp.isLeftRightSplit) { + floatingTask.translationX = translation + } else { + floatingTask.translationY = translation + } + } + + override fun getFloatingTaskPrimaryTranslation(floatingTask: View, dp: DeviceProfile): Float = + if (dp.isLeftRightSplit) floatingTask.translationX else floatingTask.translationY + + override fun getHandlerTypeForLogging(): LauncherAtom.TaskSwitcherContainer.OrientationHandler = + LauncherAtom.TaskSwitcherContainer.OrientationHandler.PORTRAIT +} diff --git a/quickstep/src/com/android/quickstep/orientation/RecentsPagedOrientationHandler.kt b/quickstep/src/com/android/quickstep/orientation/RecentsPagedOrientationHandler.kt index 78f9a0a556..a7bc93b3d4 100644 --- a/quickstep/src/com/android/quickstep/orientation/RecentsPagedOrientationHandler.kt +++ b/quickstep/src/com/android/quickstep/orientation/RecentsPagedOrientationHandler.kt @@ -82,13 +82,13 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { fun getSplitTranslationDirectionFactor( @StagePosition stagePosition: Int, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Int fun getSplitSelectTaskOffset( primary: FloatProperty, secondary: FloatProperty, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Pair, FloatProperty> fun getDistanceToBottomOfRect(dp: DeviceProfile, rect: Rect): Int @@ -101,7 +101,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { placeholderInset: Int, dp: DeviceProfile, @StagePosition stagePosition: Int, - out: Rect + out: Rect, ) /** @@ -128,7 +128,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { drawableWidth: Int, drawableHeight: Int, dp: DeviceProfile, - @StagePosition stagePosition: Int + @StagePosition stagePosition: Int, ) /** @@ -143,7 +143,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { out: View, dp: DeviceProfile, splitInstructionsHeight: Int, - splitInstructionsWidth: Int + splitInstructionsWidth: Int, ) /** @@ -159,7 +159,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { dp: DeviceProfile, @StagePosition stagePosition: Int, out1: Rect, - out2: Rect + out2: Rect, ) fun getDefaultSplitPosition(deviceProfile: DeviceProfile): Int @@ -174,7 +174,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { dp: DeviceProfile, outRect: Rect, splitInfo: SplitConfigurationOptions.SplitBounds, - @StagePosition desiredStagePosition: Int + @StagePosition desiredStagePosition: Int, ) fun measureGroupedTaskViewThumbnailBounds( @@ -185,7 +185,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { splitBoundsConfig: SplitConfigurationOptions.SplitBounds, dp: DeviceProfile, isRtl: Boolean, - inSplitSelection: Boolean + inSplitSelection: Boolean, ) /** @@ -198,7 +198,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { dp: DeviceProfile, splitBoundsConfig: SplitConfigurationOptions.SplitBounds, parentWidth: Int, - parentHeight: Int + parentHeight: Int, ): Pair // Overview TaskMenuView methods @@ -208,7 +208,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { taskIconMargin: Int, taskIconHeight: Int, thumbnailTopMargin: Int, - isRtl: Boolean + isRtl: Boolean, ) /** @@ -216,14 +216,14 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { */ fun setIconAppChipChildrenParams( iconParams: FrameLayout.LayoutParams, - chipChildMarginStart: Int + chipChildMarginStart: Int, ) fun setIconAppChipMenuParams( iconAppChipView: IconAppChipView, iconMenuParams: FrameLayout.LayoutParams, iconMenuMargin: Int, - thumbnailTopMargin: Int + thumbnailTopMargin: Int, ) fun setSplitIconParams( @@ -237,7 +237,8 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { isRtl: Boolean, deviceProfile: DeviceProfile, splitConfig: SplitConfigurationOptions.SplitBounds, - inSplitSelection: Boolean + inSplitSelection: Boolean, + oneIconHiddenDueToSmallWidth: Boolean, ) /* @@ -251,7 +252,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { thumbnailView: View, deviceProfile: DeviceProfile, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float fun getTaskMenuY( @@ -260,20 +261,20 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { stagePosition: Int, taskMenuView: View, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float fun getTaskMenuWidth( thumbnailView: View, deviceProfile: DeviceProfile, - @StagePosition stagePosition: Int + @StagePosition stagePosition: Int, ): Int fun getTaskMenuHeight( taskInsetMargin: Float, deviceProfile: DeviceProfile, taskMenuX: Float, - taskMenuY: Float + taskMenuY: Float, ): Int /** @@ -284,7 +285,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { deviceProfile: DeviceProfile, taskMenuLayout: LinearLayout, dividerSpacing: Int, - dividerDrawable: ShapeDrawable + dividerDrawable: ShapeDrawable, ) /** @@ -294,7 +295,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { fun setLayoutParamsForTaskMenuOptionItem( lp: LinearLayout.LayoutParams, viewGroup: LinearLayout, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ) /** Layout a Digital Wellbeing Banner on its parent. TaskView. */ @@ -305,7 +306,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { deviceProfile: DeviceProfile, snapshotViewWidth: Int, snapshotViewHeight: Int, - banner: View + banner: View, ) /** @@ -321,7 +322,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { deviceProfile: DeviceProfile, thumbnailViews: Array, desiredTaskId: Int, - banner: View + banner: View, ): Pair // The following are only used by TaskViewTouchHandler. @@ -341,6 +342,15 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { /** @return Either 1 or -1, a factor to multiply by so the animation goes the correct way. */ fun getTaskDragDisplacementFactor(isRtl: Boolean): Int + /** @return Either 1 or -1, the direction sign towards task dismiss. */ + fun getTaskDismissVerticalDirection(): Int + + /** @return the length to drag a task off screen for dismiss. */ + fun getTaskDismissLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int + + /** @return the length to drag a task to full screen for launch. */ + fun getTaskLaunchLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int + /** * Maps the velocity from the coordinate plane of the foreground app to that of Launcher's * (which now will always be portrait) @@ -370,7 +380,7 @@ interface RecentsPagedOrientationHandler : PagedOrientationHandler { floatingTask: View, onScreenRect: RectF, @StagePosition stagePosition: Int, - dp: DeviceProfile + dp: DeviceProfile, ): Float /** diff --git a/quickstep/src/com/android/quickstep/orientation/SeascapePagedViewHandler.kt b/quickstep/src/com/android/quickstep/orientation/SeascapePagedViewHandler.kt index 3fb4f54ae5..1f9f75290c 100644 --- a/quickstep/src/com/android/quickstep/orientation/SeascapePagedViewHandler.kt +++ b/quickstep/src/com/android/quickstep/orientation/SeascapePagedViewHandler.kt @@ -53,7 +53,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { override fun getSplitTranslationDirectionFactor( stagePosition: Int, - deviceProfile: DeviceProfile + deviceProfile: DeviceProfile, ): Int = if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) -1 else 1 override fun getRecentsRtlSetting(resources: Resources): Boolean = Utilities.isRtl(resources) @@ -70,7 +70,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { thumbnailView: View, deviceProfile: DeviceProfile, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float = x + taskInsetMargin override fun getTaskMenuY( @@ -79,7 +79,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { stagePosition: Int, taskMenuView: View, taskInsetMargin: Float, - taskViewIcon: View + taskViewIcon: View, ): Float { if (Flags.enableOverviewIconMenu()) { return y @@ -97,24 +97,17 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { taskInsetMargin: Float, deviceProfile: DeviceProfile, taskMenuX: Float, - taskMenuY: Float + taskMenuY: Float, ): Int = (deviceProfile.availableWidthPx - taskInsetMargin - taskMenuX).toInt() override fun setSplitTaskSwipeRect( dp: DeviceProfile, outRect: Rect, splitInfo: SplitBounds, - desiredStagePosition: Int + desiredStagePosition: Int, ) { - val topLeftTaskPercent: Float - val dividerBarPercent: Float - if (splitInfo.appsStackedVertically) { - topLeftTaskPercent = splitInfo.topTaskPercent - dividerBarPercent = splitInfo.dividerHeightPercent - } else { - topLeftTaskPercent = splitInfo.leftTaskPercent - dividerBarPercent = splitInfo.dividerWidthPercent - } + val topLeftTaskPercent = splitInfo.leftTopTaskPercent + val dividerBarPercent = splitInfo.dividerPercent // In seascape, the primary thumbnail is counterintuitively placed at the physical bottom of // the screen. This is to preserve consistency when the user rotates: From the user's POV, @@ -133,7 +126,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { deviceProfile: DeviceProfile, snapshotViewWidth: Int, snapshotViewHeight: Int, - banner: View + banner: View, ) { banner.pivotX = 0f banner.pivotY = 0f @@ -156,7 +149,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { deviceProfile: DeviceProfile, thumbnailViews: Array, desiredTaskId: Int, - banner: View + banner: View, ): Pair { val snapshotParams = thumbnailViews[0].layoutParams as FrameLayout.LayoutParams val translationX: Float = (taskViewWidth - banner.height).toFloat() @@ -166,11 +159,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { } else { if (desiredTaskId == splitBounds.leftTopTaskId) { val bottomRightTaskPlusDividerPercent = - if (splitBounds.appsStackedVertically) { - 1f - splitBounds.topTaskPercent - } else { - 1f - splitBounds.leftTaskPercent - } + splitBounds.rightBottomTaskPercent + splitBounds.dividerPercent translationY = banner.height - (taskViewHeight - snapshotParams.topMargin) * @@ -192,7 +181,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, STAGE_POSITION_BOTTOM_OR_RIGHT, - STAGE_TYPE_MAIN + STAGE_TYPE_MAIN, ) ) @@ -200,7 +189,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { out: View, dp: DeviceProfile, splitInstructionsHeight: Int, - splitInstructionsWidth: Int + splitInstructionsWidth: Int, ) { out.pivotX = 0f out.pivotY = splitInstructionsHeight.toFloat() @@ -228,7 +217,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { taskIconMargin: Int, taskIconHeight: Int, thumbnailTopMargin: Int, - isRtl: Boolean + isRtl: Boolean, ) { iconParams.gravity = if (isRtl) { @@ -241,7 +230,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { override fun setIconAppChipChildrenParams( iconParams: FrameLayout.LayoutParams, - chipChildMarginStart: Int + chipChildMarginStart: Int, ) { iconParams.setMargins(0, 0, 0, 0) iconParams.marginStart = chipChildMarginStart @@ -252,7 +241,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { iconAppChipView: IconAppChipView, iconMenuParams: FrameLayout.LayoutParams, iconMenuMargin: Int, - thumbnailTopMargin: Int + thumbnailTopMargin: Int, ) { val isRtl = iconAppChipView.layoutDirection == View.LAYOUT_DIRECTION_RTL val iconCenter = iconAppChipView.getHeight() / 2f @@ -279,7 +268,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { /** * @param inSplitSelection Whether user currently has a task from this task group staged for - * split screen. Currently this state is not reachable in fake seascape. + * split screen. Currently this state is not reachable in fake seascape. */ override fun measureGroupedTaskViewThumbnailBounds( primarySnapshot: View, @@ -289,7 +278,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { splitBoundsConfig: SplitBounds, dp: DeviceProfile, isRtl: Boolean, - inSplitSelection: Boolean + inSplitSelection: Boolean, ) { val primaryParams = primarySnapshot.layoutParams as FrameLayout.LayoutParams val secondaryParams = secondarySnapshot.layoutParams as FrameLayout.LayoutParams @@ -311,11 +300,11 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { (taskViewSecond.y + spaceAboveSnapshot + dividerBar).toFloat() primarySnapshot.measure( MeasureSpec.makeMeasureSpec(taskViewFirst.x, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(taskViewFirst.y, MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(taskViewFirst.y, MeasureSpec.EXACTLY), ) secondarySnapshot.measure( MeasureSpec.makeMeasureSpec(taskViewSecond.x, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(taskViewSecond.y, MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(taskViewSecond.y, MeasureSpec.EXACTLY), ) } @@ -323,7 +312,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { dp: DeviceProfile, splitBoundsConfig: SplitBounds, parentWidth: Int, - parentHeight: Int + parentHeight: Int, ): Pair { // Measure and layout the thumbnails bottom up, since the primary is on the visual left // (portrait bottom) and secondary is on the right (portrait top) @@ -331,12 +320,7 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { val totalThumbnailHeight = parentHeight - spaceAboveSnapshot val dividerBar = getDividerBarSize(totalThumbnailHeight, splitBoundsConfig) - val taskPercent = - if (splitBoundsConfig.appsStackedVertically) { - splitBoundsConfig.topTaskPercent - } else { - splitBoundsConfig.leftTaskPercent - } + val taskPercent = splitBoundsConfig.leftTopTaskPercent val firstTaskViewSize = Point(parentWidth, (totalThumbnailHeight * taskPercent).toInt()) val secondTaskViewSize = Point(parentWidth, totalThumbnailHeight - firstTaskViewSize.y - dividerBar) @@ -360,6 +344,14 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { override fun getTaskDragDisplacementFactor(isRtl: Boolean): Int = if (isRtl) -1 else 1 + override fun getTaskDismissVerticalDirection(): Int = -1 + + override fun getTaskDismissLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + taskThumbnailBounds.right + + override fun getTaskLaunchLength(secondaryDimension: Int, taskThumbnailBounds: Rect): Int = + secondaryDimension - taskThumbnailBounds.right + /* -------------------- */ override fun getSplitIconsPosition( @@ -369,17 +361,18 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { isRtl: Boolean, overviewTaskMarginPx: Int, dividerSize: Int, + oneIconHiddenDueToSmallWidth: Boolean, ): SplitIconPositions { return if (Flags.enableOverviewIconMenu()) { if (isRtl) { SplitIconPositions( topLeftY = totalThumbnailHeight - primarySnapshotHeight, - bottomRightY = 0 + bottomRightY = 0, ) } else { SplitIconPositions( topLeftY = 0, - bottomRightY = -(primarySnapshotHeight + dividerSize) + bottomRightY = -(primarySnapshotHeight + dividerSize), ) } } else { @@ -388,10 +381,16 @@ class SeascapePagedViewHandler : LandscapePagedViewHandler() { // from the bottom to the almost-center of the screen using the bottom margin. // The primary snapshot is placed at the bottom, thus we translate the icons using // the size of the primary snapshot minus the icon size for the top-left icon. - SplitIconPositions( - topLeftY = primarySnapshotHeight - taskIconHeight, - bottomRightY = primarySnapshotHeight + dividerSize - ) + if (oneIconHiddenDueToSmallWidth) { + // Center both icons + val centerY = primarySnapshotHeight + ((dividerSize - taskIconHeight) / 2) + SplitIconPositions(topLeftY = centerY, bottomRightY = centerY) + } else { + SplitIconPositions( + topLeftY = primarySnapshotHeight - taskIconHeight, + bottomRightY = primarySnapshotHeight + dividerSize, + ) + } } } diff --git a/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegate.kt b/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegate.kt index 608fafd9b2..12616a8f84 100644 --- a/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegate.kt +++ b/quickstep/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegate.kt @@ -17,6 +17,7 @@ package com.android.quickstep.recents.data import android.os.UserHandle +import android.util.Log import com.android.quickstep.HighResLoadingState.HighResLoadingStateChangedCallback import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskIconChangedCallback import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskThumbnailChangedCallback @@ -58,7 +59,7 @@ interface TaskVisualsChangedDelegate : fun onTaskThumbnailChanged(thumbnailData: ThumbnailData?) /** Informs the listener that the default resolution for loading thumbnails has changed */ - fun onHighResLoadingStateChanged() + fun onHighResLoadingStateChanged(highResEnabled: Boolean) } } @@ -91,8 +92,9 @@ class TaskVisualsChangedDelegateImpl( } override fun onHighResLoadingStateChanged(enabled: Boolean) { + Log.d(TAG, "onHighResLoadingStateChanged(enabled = $enabled)") taskThumbnailChangedCallbacks.values.forEach { (_, callback) -> - callback.onHighResLoadingStateChanged() + callback.onHighResLoadingStateChanged(enabled) } } @@ -142,4 +144,8 @@ class TaskVisualsChangedDelegateImpl( } } } + + companion object { + const val TAG = "TaskVisualsChangedDelegateImpl" + } } diff --git a/quickstep/src/com/android/quickstep/recents/data/TasksRepository.kt b/quickstep/src/com/android/quickstep/recents/data/TasksRepository.kt index b1a59202ae..5274ef3266 100644 --- a/quickstep/src/com/android/quickstep/recents/data/TasksRepository.kt +++ b/quickstep/src/com/android/quickstep/recents/data/TasksRepository.kt @@ -160,7 +160,17 @@ class TasksRepository( updateThumbnail(task.key.id, thumbnailData) } - override fun onHighResLoadingStateChanged() { + override fun onHighResLoadingStateChanged(highResEnabled: Boolean) { + val isTaskVisible = taskRequests.containsKey(task.key.id) + if (!isTaskVisible) return + + val isCurrentThumbnailLowRes = + tasks.value[task.key.id]?.thumbnail?.reducedResolution + val isRequestedResHigherThanCurrent = + isCurrentThumbnailLowRes == null || + (isCurrentThumbnailLowRes && highResEnabled) + if (!isRequestedResHigherThanCurrent) return + recentsCoroutineScope.launch(dispatcherProvider.background) { updateThumbnail(task.key.id, getThumbnailFromDataSource(task)) } diff --git a/quickstep/src/com/android/quickstep/recents/di/RecentsDependencies.kt b/quickstep/src/com/android/quickstep/recents/di/RecentsDependencies.kt index 4b3bef38cf..c6b3d6ac00 100644 --- a/quickstep/src/com/android/quickstep/recents/di/RecentsDependencies.kt +++ b/quickstep/src/com/android/quickstep/recents/di/RecentsDependencies.kt @@ -31,7 +31,6 @@ import com.android.quickstep.recents.domain.usecase.GetTaskUseCase import com.android.quickstep.recents.domain.usecase.GetThumbnailPositionUseCase import com.android.quickstep.recents.domain.usecase.IsThumbnailValidUseCase import com.android.quickstep.recents.domain.usecase.OrganizeDesktopTasksUseCase -import com.android.quickstep.recents.usecase.GetThumbnailUseCase import com.android.quickstep.recents.viewmodel.RecentsViewData import com.android.quickstep.task.viewmodel.TaskOverlayViewModel import com.android.systemui.shared.recents.model.Task @@ -42,7 +41,7 @@ import kotlinx.coroutines.SupervisorJob internal typealias RecentsScopeId = String -class RecentsDependencies private constructor(private val appContext: Context) { +class RecentsDependencies private constructor(appContext: Context) { private val scopes = mutableMapOf() init { @@ -185,7 +184,6 @@ class RecentsDependencies private constructor(private val appContext: Context) { IsThumbnailValidUseCase::class.java -> IsThumbnailValidUseCase(rotationStateRepository = inject()) GetTaskUseCase::class.java -> GetTaskUseCase(repository = inject()) - GetThumbnailUseCase::class.java -> GetThumbnailUseCase(taskRepository = inject()) GetSysUiStatusNavFlagsUseCase::class.java -> GetSysUiStatusNavFlagsUseCase() GetThumbnailPositionUseCase::class.java -> GetThumbnailPositionUseCase( diff --git a/quickstep/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapper.kt b/quickstep/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapper.kt index fb622686dc..619075ff83 100644 --- a/quickstep/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapper.kt +++ b/quickstep/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapper.kt @@ -16,6 +16,7 @@ package com.android.quickstep.recents.ui.mapper +import android.view.View.OnClickListener import com.android.quickstep.recents.ui.viewmodel.TaskData import com.android.quickstep.task.thumbnail.TaskThumbnailUiState import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.BackgroundOnly @@ -36,29 +37,38 @@ object TaskUiStateMapper { * @param taskData The [TaskData] to convert. Can be null or a specific subclass. * @param isLiveTile A flag indicating whether the task data represents live tile. * @param hasHeader A flag indicating whether the UI should display a header. + * @param clickCloseListener A callback when the close button in the UI is clicked. * @return A [TaskThumbnailUiState] representing the UI state for the given task data. */ fun toTaskThumbnailUiState( taskData: TaskData?, isLiveTile: Boolean, hasHeader: Boolean, + clickCloseListener: OnClickListener?, ): TaskThumbnailUiState = when { taskData !is TaskData.Data -> Uninitialized - isLiveTile -> createLiveTileState(taskData, hasHeader) + isLiveTile -> createLiveTileState(taskData, hasHeader, clickCloseListener) isBackgroundOnly(taskData) -> BackgroundOnly(taskData.backgroundColor) isSnapshotSplash(taskData) -> - SnapshotSplash(createSnapshotState(taskData, hasHeader), taskData.icon) + SnapshotSplash( + createSnapshotState(taskData, hasHeader, clickCloseListener), + taskData.icon, + ) else -> Uninitialized } - private fun createSnapshotState(taskData: TaskData.Data, hasHeader: Boolean): Snapshot = - if (canHeaderBeCreated(taskData, hasHeader)) { + private fun createSnapshotState( + taskData: TaskData.Data, + hasHeader: Boolean, + clickCloseListener: OnClickListener?, + ): Snapshot = + if (canHeaderBeCreated(taskData, hasHeader, clickCloseListener)) { Snapshot.WithHeader( taskData.thumbnailData?.thumbnail!!, taskData.thumbnailData.rotation, taskData.backgroundColor, - ThumbnailHeader(taskData.icon!!, taskData.titleDescription!!), + ThumbnailHeader(taskData.icon!!, taskData.titleDescription!!, clickCloseListener!!), ) } else { Snapshot.WithoutHeader( @@ -74,13 +84,26 @@ object TaskUiStateMapper { private fun isSnapshotSplash(taskData: TaskData.Data) = taskData.thumbnailData?.thumbnail != null && !taskData.isLocked - private fun canHeaderBeCreated(taskData: TaskData.Data, hasHeader: Boolean) = - hasHeader && taskData.icon != null && taskData.titleDescription != null + private fun canHeaderBeCreated( + taskData: TaskData.Data, + hasHeader: Boolean, + clickCloseListener: OnClickListener?, + ) = + hasHeader && + taskData.icon != null && + taskData.titleDescription != null && + clickCloseListener != null - private fun createLiveTileState(taskData: TaskData.Data, hasHeader: Boolean) = - if (canHeaderBeCreated(taskData, hasHeader)) { + private fun createLiveTileState( + taskData: TaskData.Data, + hasHeader: Boolean, + clickCloseListener: OnClickListener?, + ) = + if (canHeaderBeCreated(taskData, hasHeader, clickCloseListener)) { // TODO(http://b/353965691): figure out what to do when `icon` or `titleDescription` is // null. - LiveTile.WithHeader(ThumbnailHeader(taskData.icon!!, taskData.titleDescription!!)) + LiveTile.WithHeader( + ThumbnailHeader(taskData.icon!!, taskData.titleDescription!!, clickCloseListener!!) + ) } else LiveTile.WithoutHeader } diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailUiState.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailUiState.kt index 61185448be..db593d34d3 100644 --- a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailUiState.kt +++ b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailUiState.kt @@ -19,6 +19,7 @@ package com.android.quickstep.task.thumbnail import android.graphics.Bitmap import android.graphics.drawable.Drawable import android.view.Surface +import android.view.View.OnClickListener import androidx.annotation.ColorInt sealed class TaskThumbnailUiState { @@ -54,5 +55,9 @@ sealed class TaskThumbnailUiState { ) : Snapshot() } - data class ThumbnailHeader(val icon: Drawable, val title: String) + data class ThumbnailHeader( + val icon: Drawable, + val title: String, + val clickCloseListener: OnClickListener, + ) } diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt index e672ec4abc..0edbacc710 100644 --- a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt +++ b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt @@ -20,6 +20,7 @@ import android.content.Context import android.graphics.Color import android.graphics.Matrix import android.graphics.Outline +import android.graphics.Path import android.graphics.Rect import android.graphics.drawable.ShapeDrawable import android.util.AttributeSet @@ -52,6 +53,7 @@ class TaskThumbnailView : FrameLayout, ViewPool.Reusable { private val dimAlpha: MultiPropertyFactory by lazy { MultiPropertyFactory(scrimView, VIEW_ALPHA, ScrimViewAlpha.entries.size, ::maxOf) } + private val outlinePath = Path() private var onSizeChanged: ((width: Int, height: Int) -> Unit)? = null private var taskThumbnailViewHeader: TaskThumbnailViewHeader? = null @@ -96,7 +98,20 @@ class TaskThumbnailView : FrameLayout, ViewPool.Reusable { outlineProvider = object : ViewOutlineProvider() { override fun getOutline(view: View, outline: Outline) { - outline.setRoundRect(outlineBounds ?: bounds, cornerRadius) + val outlineRect = outlineBounds ?: bounds + outlinePath.apply { + rewind() + addRoundRect( + outlineRect.left.toFloat(), + outlineRect.top.toFloat(), + outlineRect.right.toFloat(), + outlineRect.bottom.toFloat(), + cornerRadius / scaleX, + cornerRadius / scaleY, + Path.Direction.CW, + ) + } + outline.setPath(outlinePath) } } } @@ -166,8 +181,10 @@ class TaskThumbnailView : FrameLayout, ViewPool.Reusable { private fun resetViews() { liveTileView.isInvisible = true thumbnailView.isInvisible = true + thumbnailView.setImageBitmap(null) splashBackground.alpha = 0f splashIcon.alpha = 0f + splashIcon.setImageDrawable(null) scrimView.alpha = 0f setBackgroundColor(Color.BLACK) taskThumbnailViewHeader?.isInvisible = true diff --git a/quickstep/src/com/android/quickstep/util/AppPairsController.java b/quickstep/src/com/android/quickstep/util/AppPairsController.java index f20d7a551d..8385485253 100644 --- a/quickstep/src/com/android/quickstep/util/AppPairsController.java +++ b/quickstep/src/com/android/quickstep/util/AppPairsController.java @@ -26,6 +26,7 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; +import static com.android.systemui.shared.recents.utilities.Utilities.isFreeformTask; import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50; import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_NONE; import static com.android.wm.shell.shared.split.SplitScreenConstants.getIndex; @@ -69,6 +70,7 @@ import com.android.quickstep.views.TaskContainer; import com.android.quickstep.views.TaskView; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import com.android.wm.shell.shared.split.SplitScreenConstants.PersistentSnapPosition; import java.util.Arrays; @@ -337,10 +339,12 @@ public class AppPairsController { * c) App B is on-screen, but App A isn't. * d) Neither is on-screen. * - * If the user tapped an app pair while inside a single app, there are 3 cases: - * a) The on-screen app is App A of the app pair. - * b) The on-screen app is App B of the app pair. - * c) It is neither. + * If the user tapped an app pair while a fullscreen or freeform app is visible on screen, + * there are 4 cases: + * a) At least one of the apps in the app pair is in freeform windowing mode. + * b) The on-screen app is App A of the app pair. + * c) The on-screen app is App B of the app pair. + * d) It is neither. * * For each case, we call the appropriate animation and split launch type. */ @@ -422,6 +426,14 @@ public class AppPairsController { foundTasks -> { Task foundTask1 = foundTasks[0]; Task foundTask2 = foundTasks[1]; + + if (DesktopModeStatus.canEnterDesktopMode(context) && (isFreeformTask( + foundTask1) || isFreeformTask(foundTask2))) { + launchAppPair(launchingIconView, + CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR); + return; + } + boolean task1IsOnScreen; boolean task2IsOnScreen; if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { diff --git a/quickstep/src/com/android/quickstep/util/DesktopTask.kt b/quickstep/src/com/android/quickstep/util/DesktopTask.kt index 53ea022a23..fbe3bc64d0 100644 --- a/quickstep/src/com/android/quickstep/util/DesktopTask.kt +++ b/quickstep/src/com/android/quickstep/util/DesktopTask.kt @@ -20,17 +20,19 @@ import com.android.systemui.shared.recents.model.Task /** * A [Task] container that can contain N number of tasks that are part of the desktop in recent - * tasks list. Note that desktops can be empty with no tasks in them. + * tasks list. Note that desktops can be empty with no tasks in them. The [deskId] makes sense only + * when the multiple desks feature is enabled. */ -class DesktopTask(tasks: List) : GroupTask(tasks, TaskViewType.DESKTOP) { +class DesktopTask(val deskId: Int, tasks: List) : GroupTask(tasks, TaskViewType.DESKTOP) { - override fun copy() = DesktopTask(tasks) + override fun copy() = DesktopTask(deskId, tasks) - override fun toString() = "type=$taskViewType tasks=$tasks" + override fun toString() = "type=$taskViewType deskId=$deskId tasks=$tasks" override fun equals(o: Any?): Boolean { if (this === o) return true if (o !is DesktopTask) return false + if (deskId != o.deskId) return false return super.equals(o) } } diff --git a/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt b/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt index a1963c9ec8..96a5733a46 100644 --- a/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt +++ b/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt @@ -143,7 +143,7 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC } else { // Initiating split from overview on fullscreen task TaskView val taskView = taskViewSupplier.get() - taskView.taskContainers.first().let { + taskView.firstTaskContainer!!.let { val drawable = getDrawable(it.iconView, splitSelectSource) return SplitAnimInitProps( it.snapshotView, @@ -215,13 +215,13 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC if (enableOverviewIconMenu()) { builder.add( ObjectAnimator.ofFloat( - (iconView as IconAppChipView).splitTranslationX, + (iconView as IconAppChipView).getSplitTranslationX(), MULTI_PROPERTY_VALUE, 0f, ) ) builder.add( - ObjectAnimator.ofFloat(iconView.splitTranslationY, MULTI_PROPERTY_VALUE, 0f) + ObjectAnimator.ofFloat(iconView.getSplitTranslationY(), MULTI_PROPERTY_VALUE, 0f) ) } @@ -985,12 +985,11 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC val splitTree: Pair>? = extractTopParentAndChildren(transitionInfo) check(splitTree != null) { "Could not find a split root candidate" } val rootCandidate = splitTree.first - val stageRootTaskIds: Set = splitTree.second - .map { it.taskInfo!!.taskId } - .toSet() - val leafTasks: List = transitionInfo.changes - .filter { it.taskInfo != null && it.taskInfo!!.parentTaskId in stageRootTaskIds} - .toList() + val stageRootTaskIds: Set = splitTree.second.map { it.taskInfo!!.taskId }.toSet() + val leafTasks: List = + transitionInfo.changes + .filter { it.taskInfo != null && it.taskInfo!!.parentTaskId in stageRootTaskIds } + .toList() // Starting position is a 34% size tile centered in the middle of the screen. // Ending position is the full device screen. @@ -1031,8 +1030,13 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC val endAbsBounds = leaf.endAbsBounds t.setAlpha(leaf.leash, 1f) - t.setCrop(leaf.leash, 0f, 0f, - endAbsBounds.width().toFloat(), endAbsBounds.height().toFloat()) + t.setCrop( + leaf.leash, + 0f, + 0f, + endAbsBounds.width().toFloat(), + endAbsBounds.height().toFloat(), + ) t.setPosition(leaf.leash, 0f, 0f) } @@ -1040,10 +1044,18 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC val endAbsBounds = stageRoot.endAbsBounds t.setAlpha(stageRoot.leash, 1f) - t.setCrop(stageRoot.leash, 0f, 0f, - endAbsBounds.width().toFloat(), endAbsBounds.height().toFloat()) - t.setPosition(stageRoot.leash, endAbsBounds.left.toFloat(), - endAbsBounds.top.toFloat()) + t.setCrop( + stageRoot.leash, + 0f, + 0f, + endAbsBounds.width().toFloat(), + endAbsBounds.height().toFloat(), + ) + t.setPosition( + stageRoot.leash, + endAbsBounds.left.toFloat(), + endAbsBounds.top.toFloat(), + ) } t.apply() } diff --git a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java index 12ca25702e..a2856a6012 100644 --- a/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java +++ b/quickstep/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java @@ -81,8 +81,10 @@ public class StaggeredWorkspaceAnim { public StaggeredWorkspaceAnim(QuickstepLauncher launcher, float velocity, boolean animateOverviewScrim, @Nullable View ignoredView, boolean staggerWorkspace) { + boolean isPinnedTaskbarAndNotInDesktopMode = DisplayController.isPinnedTaskbar(launcher) + && !DisplayController.isInDesktopMode(launcher); mTaskbarDurationInMs = QuickstepTransitionManager.getTaskbarToHomeDuration( - DisplayController.isPinnedTaskbar(launcher)); + isPinnedTaskbarAndNotInDesktopMode); prepareToAnimate(launcher, animateOverviewScrim); mIgnoredView = ignoredView; diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java index 7d5b471f02..d2f9652d69 100644 --- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java +++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java @@ -18,6 +18,7 @@ package com.android.quickstep.util; import android.animation.Animator; import android.animation.RectEvaluator; +import android.app.PictureInPictureParams; import android.content.ComponentName; import android.content.Context; import android.content.pm.ActivityInfo; @@ -25,6 +26,7 @@ import android.graphics.Matrix; import android.graphics.Rect; import android.graphics.RectF; import android.util.Log; +import android.util.Rational; import android.view.Surface; import android.view.SurfaceControl; import android.view.View; @@ -50,8 +52,6 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { private static final float END_PROGRESS = 1.0f; - private static final float PIP_ASPECT_RATIO_MISMATCH_THRESHOLD = 0.01f; - private final int mTaskId; private final ActivityInfo mActivityInfo; private final SurfaceControl mLeash; @@ -158,9 +158,8 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { // not a valid rectangle to use for cropping app surface reasonForCreateOverlay = "Source rect hint exceeds display bounds " + sourceRectHint; sourceRectHint.setEmpty(); - } else if (Math.abs( - aspectRatio - (sourceRectHint.width() / (float) sourceRectHint.height())) - > PIP_ASPECT_RATIO_MISMATCH_THRESHOLD) { + } else if (!PictureInPictureParams.isSameAspectRatio(sourceRectHint, + new Rational(destinationBounds.width(), destinationBounds.height()))) { // The source rect hint does not aspect ratio reasonForCreateOverlay = "Source rect hint does not match aspect ratio " + sourceRectHint + " aspect ratio " + aspectRatio; diff --git a/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java b/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java index 91e8376990..6e2d469d18 100644 --- a/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java +++ b/quickstep/src/com/android/quickstep/util/TaskRestartedDuringLaunchListener.java @@ -16,16 +16,11 @@ package com.android.quickstep.util; -import static android.app.ActivityTaskManager.INVALID_TASK_ID; - -import android.app.Activity; import android.app.ActivityManager; import android.util.Log; import androidx.annotation.NonNull; -import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter; -import com.android.quickstep.RecentsModel; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java index 09e9c8b119..b844079a14 100644 --- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java +++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java @@ -97,6 +97,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { private final FullscreenDrawParams mCurrentFullscreenParams; public final AnimatedFloat taskPrimaryTranslation = new AnimatedFloat(); public final AnimatedFloat taskSecondaryTranslation = new AnimatedFloat(); + public final AnimatedFloat taskGridTranslationX = new AnimatedFloat(); + public final AnimatedFloat taskGridTranslationY = new AnimatedFloat(); // Carousel properties public final AnimatedFloat carouselScale = new AnimatedFloat(); @@ -445,6 +447,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { taskPrimaryTranslation.value); mOrientationState.getOrientationHandler().setSecondary(mMatrix, MATRIX_POST_TRANSLATE, taskSecondaryTranslation.value); + mMatrix.postTranslate(taskGridTranslationX.value, taskGridTranslationY.value); mMatrix.postScale(carouselScale.value, carouselScale.value, mIsRecentsRtl ? mCarouselTaskSize.right : mCarouselTaskSize.left, @@ -484,6 +487,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { + " taskRect: " + mTaskRect + " taskPrimaryT: " + taskPrimaryTranslation.value + " taskSecondaryT: " + taskSecondaryTranslation.value + + " taskGridTranslationX: " + taskGridTranslationX.value + + " taskGridTranslationY: " + taskGridTranslationY.value + " recentsPrimaryT: " + recentsViewPrimaryTranslation.value + " recentsSecondaryT: " + recentsViewSecondaryTranslation.value + " recentsScroll: " + recentsViewScroll.value diff --git a/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt b/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt index 9f3c017fbe..b83acf0707 100644 --- a/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt +++ b/quickstep/src/com/android/quickstep/views/AddDesktopButton.kt @@ -20,10 +20,14 @@ import android.content.Context import android.graphics.Canvas import android.graphics.Rect import android.util.AttributeSet +import android.util.FloatProperty import android.widget.ImageButton import com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X import com.android.launcher3.R +import com.android.launcher3.util.KFloatProperty +import com.android.launcher3.util.MultiPropertyDelegate import com.android.launcher3.util.MultiPropertyFactory +import com.android.launcher3.util.MultiValueAlpha import com.android.quickstep.util.BorderAnimator import com.android.quickstep.util.BorderAnimator.Companion.createSimpleBorderAnimator @@ -34,28 +38,17 @@ import com.android.quickstep.util.BorderAnimator.Companion.createSimpleBorderAni class AddDesktopButton @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageButton(context, attrs) { - private enum class TranslationX { - GRID, - OFFSET, - } + private val addDeskButtonAlpha = MultiValueAlpha(this, Alpha.entries.size) + var contentAlpha by MultiPropertyDelegate(addDeskButtonAlpha, Alpha.CONTENT) + var visibilityAlpha by MultiPropertyDelegate(addDeskButtonAlpha, Alpha.VISIBILITY) private val multiTranslationX = MultiPropertyFactory(this, VIEW_TRANSLATE_X, TranslationX.entries.size) { a: Float, b: Float -> a + b } - - var gridTranslationX - get() = multiTranslationX[TranslationX.GRID.ordinal].value - set(value) { - multiTranslationX[TranslationX.GRID.ordinal].value = value - } - - var offsetTranslationX - get() = multiTranslationX[TranslationX.OFFSET.ordinal].value - set(value) { - multiTranslationX[TranslationX.OFFSET.ordinal].value = value - } + var gridTranslationX by MultiPropertyDelegate(multiTranslationX, TranslationX.GRID) + var offsetTranslationX by MultiPropertyDelegate(multiTranslationX, TranslationX.OFFSET) private val focusBorderAnimator: BorderAnimator = createSimpleBorderAnimator( @@ -91,6 +84,9 @@ class AddDesktopButton @JvmOverloads constructor(context: Context, attrs: Attrib } } + fun getScrollAdjustment(showAsGrid: Boolean): Int = + if (showAsGrid) gridTranslationX.toInt() else 0 + private fun getBorderBounds(bounds: Rect) { bounds.set(0, 0, width, height) val outlinePadding = @@ -102,4 +98,20 @@ class AddDesktopButton @JvmOverloads constructor(context: Context, attrs: Attrib focusBorderAnimator.drawBorder(canvas) super.draw(canvas) } + + companion object { + private enum class Alpha { + CONTENT, + VISIBILITY, + } + + private enum class TranslationX { + GRID, + OFFSET, + } + + @JvmField + val VISIBILITY_ALPHA: FloatProperty = + KFloatProperty(AddDesktopButton::visibilityAlpha) + } } diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java deleted file mode 100644 index 24266974ce..0000000000 --- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java +++ /dev/null @@ -1,333 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.quickstep.views; - -import static com.android.quickstep.util.BorderAnimator.DEFAULT_BORDER_COLOR; - -import android.content.Context; -import android.content.res.Resources; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.Rect; -import android.util.AttributeSet; -import android.util.FloatProperty; -import android.widget.Button; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.android.launcher3.Flags; -import com.android.launcher3.R; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.BorderAnimator; - -import kotlin.Unit; - -public class ClearAllButton extends Button { - - public static final FloatProperty VISIBILITY_ALPHA = - new FloatProperty("visibilityAlpha") { - @Override - public Float get(ClearAllButton view) { - return view.mVisibilityAlpha; - } - - @Override - public void setValue(ClearAllButton view, float v) { - view.setVisibilityAlpha(v); - } - }; - - public static final FloatProperty DISMISS_ALPHA = - new FloatProperty("dismissAlpha") { - @Override - public Float get(ClearAllButton view) { - return view.mDismissAlpha; - } - - @Override - public void setValue(ClearAllButton view, float v) { - view.setDismissAlpha(v); - } - }; - - private float mScrollAlpha = 1; - private float mContentAlpha = 1; - private float mVisibilityAlpha = 1; - private float mDismissAlpha = 1; - private float mFullscreenProgress = 1; - private float mGridProgress = 1; - - private boolean mIsRtl; - private float mNormalTranslationPrimary; - private float mFullscreenTranslationPrimary; - private float mGridTranslationPrimary; - private float mTaskAlignmentTranslationY; - private float mGridScrollOffset; - private float mScrollOffsetPrimary; - - private int mSidePadding; - private int mOutlinePadding; - private boolean mBorderEnabled; - @Nullable - private final BorderAnimator mFocusBorderAnimator; - - public ClearAllButton(Context context, AttributeSet attrs) { - super(context, attrs); - mIsRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL; - - if (Flags.enableFocusOutline()) { - TypedArray styledAttrs = context.obtainStyledAttributes(attrs, - R.styleable.ClearAllButton); - Resources resources = getResources(); - mOutlinePadding = resources.getDimensionPixelSize( - R.dimen.recents_clear_all_outline_padding); - mFocusBorderAnimator = - BorderAnimator.createSimpleBorderAnimator( - /* borderRadiusPx= */ resources.getDimensionPixelSize( - R.dimen.recents_clear_all_outline_radius), - /* borderWidthPx= */ context.getResources().getDimensionPixelSize( - R.dimen.keyboard_quick_switch_border_width), - /* boundsBuilder= */ this::updateBorderBounds, - /* targetView= */ this, - /* borderColor= */ styledAttrs.getColor( - R.styleable.ClearAllButton_focusBorderColor, - DEFAULT_BORDER_COLOR)); - styledAttrs.recycle(); - } else { - mFocusBorderAnimator = null; - } - } - - private Unit updateBorderBounds(@NonNull Rect bounds) { - bounds.set(0, 0, getWidth(), getHeight()); - // Make the value negative to form a padding between button and outline - bounds.inset(-mOutlinePadding, -mOutlinePadding); - return Unit.INSTANCE; - } - - @Override - public void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) { - super.onFocusChanged(gainFocus, direction, previouslyFocusedRect); - if (mFocusBorderAnimator != null && mBorderEnabled) { - mFocusBorderAnimator.setBorderVisibility(gainFocus, /* animated= */ true); - } - } - - /** - * Enable or disable showing border on focus change - */ - public void setBorderEnabled(boolean enabled) { - if (mBorderEnabled == enabled) { - return; - } - - mBorderEnabled = enabled; - if (mFocusBorderAnimator != null) { - mFocusBorderAnimator.setBorderVisibility(/* visible= */ - enabled && isFocused(), /* animated= */true); - } - } - - @Override - public void draw(Canvas canvas) { - if (mFocusBorderAnimator != null) { - mFocusBorderAnimator.drawBorder(canvas); - } - super.draw(canvas); - } - - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - super.onLayout(changed, left, top, right, bottom); - RecentsPagedOrientationHandler orientationHandler = - getRecentsView().getPagedOrientationHandler(); - mSidePadding = orientationHandler.getClearAllSidePadding(getRecentsView(), mIsRtl); - } - - private RecentsView getRecentsView() { - return (RecentsView) getParent(); - } - - @Override - public void onRtlPropertiesChanged(int layoutDirection) { - super.onRtlPropertiesChanged(layoutDirection); - mIsRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL; - } - - @Override - public boolean hasOverlappingRendering() { - return false; - } - - public float getScrollAlpha() { - return mScrollAlpha; - } - - public void setContentAlpha(float alpha) { - if (mContentAlpha != alpha) { - mContentAlpha = alpha; - updateAlpha(); - } - } - - public void setVisibilityAlpha(float alpha) { - if (mVisibilityAlpha != alpha) { - mVisibilityAlpha = alpha; - updateAlpha(); - } - } - - public void setDismissAlpha(float alpha) { - if (mDismissAlpha != alpha) { - mDismissAlpha = alpha; - updateAlpha(); - } - } - - public void onRecentsViewScroll(int scroll, boolean gridEnabled) { - RecentsView recentsView = getRecentsView(); - if (recentsView == null) { - return; - } - - RecentsPagedOrientationHandler orientationHandler = - recentsView.getPagedOrientationHandler(); - float orientationSize = orientationHandler.getPrimaryValue(getWidth(), getHeight()); - if (orientationSize == 0) { - return; - } - - int clearAllScroll = recentsView.getClearAllScroll(); - int adjustedScrollFromEdge = Math.abs(scroll - clearAllScroll); - float shift = Math.min(adjustedScrollFromEdge, orientationSize); - mNormalTranslationPrimary = mIsRtl ? -shift : shift; - if (!gridEnabled) { - mNormalTranslationPrimary += mSidePadding; - } - applyPrimaryTranslation(); - applySecondaryTranslation(); - float clearAllSpacing = - recentsView.getPageSpacing() + recentsView.getClearAllExtraPageSpacing(); - clearAllSpacing = mIsRtl ? -clearAllSpacing : clearAllSpacing; - mScrollAlpha = Math.max((clearAllScroll + clearAllSpacing - scroll) / clearAllSpacing, 0); - updateAlpha(); - } - - private void updateAlpha() { - final float alpha = mScrollAlpha * mContentAlpha * mVisibilityAlpha * mDismissAlpha; - setAlpha(alpha); - setClickable(Math.min(alpha, 1) == 1); - } - - public void setFullscreenTranslationPrimary(float fullscreenTranslationPrimary) { - mFullscreenTranslationPrimary = fullscreenTranslationPrimary; - applyPrimaryTranslation(); - } - - /** - * Sets `mTaskAlignmentTranslationY` to the given `value`. In order to put the button at the - * middle in the secondary coordinate. - */ - public void setTaskAlignmentTranslationY(float value) { - mTaskAlignmentTranslationY = value; - applySecondaryTranslation(); - } - - public void setGridTranslationPrimary(float gridTranslationPrimary) { - mGridTranslationPrimary = gridTranslationPrimary; - applyPrimaryTranslation(); - } - - public void setGridScrollOffset(float gridScrollOffset) { - mGridScrollOffset = gridScrollOffset; - } - - public void setScrollOffsetPrimary(float scrollOffsetPrimary) { - mScrollOffsetPrimary = scrollOffsetPrimary; - } - - public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) { - float scrollAdjustment = 0; - if (fullscreenEnabled) { - scrollAdjustment += mFullscreenTranslationPrimary; - } - if (gridEnabled) { - scrollAdjustment += mGridTranslationPrimary + mGridScrollOffset; - } - scrollAdjustment += mScrollOffsetPrimary; - return scrollAdjustment; - } - - public float getOffsetAdjustment(boolean fullscreenEnabled, boolean gridEnabled) { - return getScrollAdjustment(fullscreenEnabled, gridEnabled); - } - - /** - * Adjust translation when this TaskView is about to be shown fullscreen. - * - * @param progress: 0 = no translation; 1 = translate according to TaskVIew translations. - */ - public void setFullscreenProgress(float progress) { - mFullscreenProgress = progress; - applyPrimaryTranslation(); - } - - /** - * Moves ClearAllButton between carousel and 2 row grid. - * - * @param gridProgress 0 = carousel; 1 = 2 row grid. - */ - public void setGridProgress(float gridProgress) { - mGridProgress = gridProgress; - applyPrimaryTranslation(); - } - - private void applyPrimaryTranslation() { - RecentsView recentsView = getRecentsView(); - if (recentsView == null) { - return; - } - - RecentsPagedOrientationHandler orientationHandler = - recentsView.getPagedOrientationHandler(); - orientationHandler.getPrimaryViewTranslate().set(this, - orientationHandler.getPrimaryValue(0f, mTaskAlignmentTranslationY) - + mNormalTranslationPrimary + getFullscreenTrans( - mFullscreenTranslationPrimary) + getGridTrans(mGridTranslationPrimary)); - } - - private void applySecondaryTranslation() { - RecentsView recentsView = getRecentsView(); - if (recentsView == null) { - return; - } - - RecentsPagedOrientationHandler orientationHandler = - recentsView.getPagedOrientationHandler(); - orientationHandler.getSecondaryViewTranslate().set(this, - orientationHandler.getSecondaryValue(0f, mTaskAlignmentTranslationY)); - } - - private float getFullscreenTrans(float endTranslation) { - return mFullscreenProgress > 0 ? endTranslation : 0; - } - - private float getGridTrans(float endTranslation) { - return mGridProgress > 0 ? endTranslation : 0; - } -} diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.kt b/quickstep/src/com/android/quickstep/views/ClearAllButton.kt new file mode 100644 index 0000000000..69c85eeaeb --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.kt @@ -0,0 +1,249 @@ +/* + * 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.quickstep.views + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Rect +import android.util.AttributeSet +import android.util.FloatProperty +import android.widget.Button +import com.android.launcher3.Flags.enableFocusOutline +import com.android.launcher3.R +import com.android.launcher3.util.KFloatProperty +import com.android.launcher3.util.MultiPropertyDelegate +import com.android.launcher3.util.MultiValueAlpha +import com.android.quickstep.util.BorderAnimator +import com.android.quickstep.util.BorderAnimator.Companion.createSimpleBorderAnimator +import kotlin.math.abs +import kotlin.math.min + +class ClearAllButton @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : + Button(context, attrs) { + + private val clearAllButtonAlpha = + object : MultiValueAlpha(this, Alpha.entries.size) { + override fun apply(value: Float) { + super.apply(value) + isClickable = value >= 1f + } + } + var scrollAlpha by MultiPropertyDelegate(clearAllButtonAlpha, Alpha.SCROLL) + var contentAlpha by MultiPropertyDelegate(clearAllButtonAlpha, Alpha.CONTENT) + var visibilityAlpha by MultiPropertyDelegate(clearAllButtonAlpha, Alpha.VISIBILITY) + var dismissAlpha by MultiPropertyDelegate(clearAllButtonAlpha, Alpha.DISMISS) + + var fullscreenProgress = 1f + set(value) { + if (field == value) { + return + } + field = value + applyPrimaryTranslation() + } + + /** + * Moves ClearAllButton between carousel and 2 row grid. + * + * 0 = carousel; 1 = 2 row grid. + */ + var gridProgress = 1f + set(value) { + if (field == value) { + return + } + field = value + applyPrimaryTranslation() + } + + private var normalTranslationPrimary = 0f + var fullscreenTranslationPrimary = 0f + set(value) { + if (field == value) { + return + } + field = value + applyPrimaryTranslation() + } + + var gridTranslationPrimary = 0f + set(value) { + if (field == value) { + return + } + field = value + applyPrimaryTranslation() + } + + /** Used to put the button at the middle in the secondary coordinate. */ + var taskAlignmentTranslationY = 0f + set(value) { + if (field == value) { + return + } + field = value + applySecondaryTranslation() + } + + var gridScrollOffset = 0f + var scrollOffsetPrimary = 0f + + private var sidePadding = 0 + var borderEnabled = false + set(value) { + if (field == value) { + return + } + field = value + focusBorderAnimator?.setBorderVisibility(visible = field && isFocused, animated = true) + } + + private val focusBorderAnimator: BorderAnimator? = + if (enableFocusOutline()) + createSimpleBorderAnimator( + context.resources.getDimensionPixelSize(R.dimen.recents_clear_all_outline_radius), + context.resources.getDimensionPixelSize(R.dimen.keyboard_quick_switch_border_width), + this::getBorderBounds, + this, + context + .obtainStyledAttributes(attrs, R.styleable.ClearAllButton) + .getColor( + R.styleable.ClearAllButton_focusBorderColor, + BorderAnimator.DEFAULT_BORDER_COLOR, + ), + ) + else null + + private fun getBorderBounds(bounds: Rect) { + bounds.set(0, 0, width, height) + val outlinePadding = + context.resources.getDimensionPixelSize(R.dimen.recents_clear_all_outline_padding) + // Make the value negative to form a padding between button and outline + bounds.inset(-outlinePadding, -outlinePadding) + } + + public override fun onFocusChanged( + gainFocus: Boolean, + direction: Int, + previouslyFocusedRect: Rect?, + ) { + super.onFocusChanged(gainFocus, direction, previouslyFocusedRect) + if (borderEnabled) { + focusBorderAnimator?.setBorderVisibility(gainFocus, /* animated= */ true) + } + } + + override fun draw(canvas: Canvas) { + focusBorderAnimator?.drawBorder(canvas) + super.draw(canvas) + } + + override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { + super.onLayout(changed, left, top, right, bottom) + sidePadding = + recentsView?.let { it.pagedOrientationHandler?.getClearAllSidePadding(it, isLayoutRtl) } + ?: 0 + } + + private val recentsView: RecentsView<*, *>? + get() = parent as? RecentsView<*, *>? + + override fun hasOverlappingRendering() = false + + fun onRecentsViewScroll(scroll: Int, gridEnabled: Boolean) { + val recentsView = recentsView ?: return + + val orientationSize = + recentsView.pagedOrientationHandler.getPrimaryValue(width, height).toFloat() + if (orientationSize == 0f) { + return + } + + val clearAllScroll = recentsView.clearAllScroll + val adjustedScrollFromEdge = abs((scroll - clearAllScroll)).toFloat() + val shift = min(adjustedScrollFromEdge, orientationSize) + normalTranslationPrimary = if (isLayoutRtl) -shift else shift + if (!gridEnabled) { + normalTranslationPrimary += sidePadding.toFloat() + } + applyPrimaryTranslation() + applySecondaryTranslation() + var clearAllSpacing = recentsView.pageSpacing + recentsView.clearAllExtraPageSpacing + clearAllSpacing = if (isLayoutRtl) -clearAllSpacing else clearAllSpacing + scrollAlpha = + ((clearAllScroll + clearAllSpacing - scroll) / clearAllSpacing.toFloat()).coerceAtLeast( + 0f + ) + } + + fun getScrollAdjustment(fullscreenEnabled: Boolean, gridEnabled: Boolean): Float { + var scrollAdjustment = 0f + if (fullscreenEnabled) { + scrollAdjustment += fullscreenTranslationPrimary + } + if (gridEnabled) { + scrollAdjustment += gridTranslationPrimary + gridScrollOffset + } + scrollAdjustment += scrollOffsetPrimary + return scrollAdjustment + } + + fun getOffsetAdjustment(fullscreenEnabled: Boolean, gridEnabled: Boolean) = + getScrollAdjustment(fullscreenEnabled, gridEnabled) + + private fun applyPrimaryTranslation() { + val recentsView = recentsView ?: return + val orientationHandler = recentsView.pagedOrientationHandler + orientationHandler.primaryViewTranslate.set( + this, + (orientationHandler.getPrimaryValue(0f, taskAlignmentTranslationY) + + normalTranslationPrimary + + getFullscreenTrans(fullscreenTranslationPrimary) + + getGridTrans(gridTranslationPrimary)), + ) + } + + private fun applySecondaryTranslation() { + val recentsView = recentsView ?: return + val orientationHandler = recentsView.pagedOrientationHandler + orientationHandler.secondaryViewTranslate.set( + this, + orientationHandler.getSecondaryValue(0f, taskAlignmentTranslationY), + ) + } + + private fun getFullscreenTrans(endTranslation: Float) = + if (fullscreenProgress > 0) endTranslation else 0f + + private fun getGridTrans(endTranslation: Float) = if (gridProgress > 0) endTranslation else 0f + + companion object { + private enum class Alpha { + SCROLL, + CONTENT, + VISIBILITY, + DISMISS, + } + + @JvmField + val VISIBILITY_ALPHA: FloatProperty = + KFloatProperty(ClearAllButton::visibilityAlpha) + + @JvmField + val DISMISS_ALPHA: FloatProperty = + KFloatProperty(ClearAllButton::dismissAlpha) + } +} diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt index fbda3b3d7b..75f3b69140 100644 --- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt +++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt @@ -15,7 +15,6 @@ */ package com.android.quickstep.views -import android.animation.Animator import android.annotation.SuppressLint import android.content.Context import android.graphics.Matrix @@ -36,7 +35,6 @@ import com.android.launcher3.Flags.enableDesktopExplodedView import com.android.launcher3.Flags.enableOverviewIconMenu import com.android.launcher3.Flags.enableRefactorTaskThumbnail import com.android.launcher3.R -import com.android.launcher3.anim.AnimatedFloat import com.android.launcher3.testing.TestLogging import com.android.launcher3.testing.shared.TestProtocol import com.android.launcher3.util.RunnableList @@ -165,9 +163,6 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu ?.inflate() } - fun startWindowExplodeAnimation(): Animator = - AnimatedFloat { progress -> explodeProgress = progress }.animateToValue(0.0f, 1.0f) - private fun positionTaskWindows() { if (taskContainers.isEmpty()) { return @@ -350,14 +345,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu explodeProgress = 0.0f viewModel = null visibility = VISIBLE - taskContainers.forEach { - contentView.removeView(it.snapshotView) - if (enableRefactorTaskThumbnail()) { - taskThumbnailViewPool!!.recycle(it.thumbnailView) - } else { - taskThumbnailViewDeprecatedPool!!.recycle(it.thumbnailViewDeprecated) - } - } + taskContainers.forEach { removeAndRecycleThumbnailView(it) } } @SuppressLint("RtlHardcoded") @@ -365,19 +353,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu super.updateTaskSize(lastComputedTaskSize, lastComputedGridTaskSize) this.lastComputedTaskSize.set(lastComputedTaskSize) - BaseContainerInterface.getTaskDimension(mContext, container.deviceProfile, tempPointF) - val desktopSize = Size(tempPointF.x.toInt(), tempPointF.y.toInt()) - DEFAULT_BOUNDS.set(0, 0, desktopSize.width / 4, desktopSize.height / 4) - - fullscreenTaskPositions = - taskContainers.map { - DesktopTaskBoundsData(it.task.key.id, it.task.appBounds ?: DEFAULT_BOUNDS) - } - - if (enableDesktopExplodedView()) { - viewModel?.organizeDesktopTasks(desktopSize, fullscreenTaskPositions) - } - positionTaskWindows() + updateTaskPositions() } override fun onTaskListVisibilityChanged(visible: Boolean, changes: Int) { @@ -463,6 +439,56 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu ViewUtils.addAccessibleChildToList(backgroundView, outChildren) } + fun removeTaskFromExplodedView(taskId: Int, animate: Boolean) { + if (!enableDesktopExplodedView()) { + Log.e( + TAG, + "removeTaskFromExplodedView called when enableDesktopExplodedView flag is false", + ) + return + } + + // Remove the task's [taskContainer] and its associated Views. + val taskContainer = getTaskContainerById(taskId) ?: return + removeAndRecycleThumbnailView(taskContainer) + taskContainer.destroy() + taskContainers = taskContainers.filterNot { it == taskContainer } + + // Dismiss the current DesktopTaskView if all its windows are closed. + if (taskContainers.isEmpty()) { + recentsView?.dismissTaskView(this, animate, /* removeTask= */ true) + } else { + // Otherwise, re-position the remaining task windows. + // TODO(b/353949276): Implement the re-layout animations. + updateTaskPositions() + } + } + + private fun removeAndRecycleThumbnailView(taskContainer: TaskContainer) { + contentView.removeView(taskContainer.snapshotView) + if (enableRefactorTaskThumbnail()) { + taskThumbnailViewPool!!.recycle(taskContainer.thumbnailView) + } else { + taskThumbnailViewDeprecatedPool!!.recycle(taskContainer.thumbnailViewDeprecated) + } + } + + private fun updateTaskPositions() { + BaseContainerInterface.getTaskDimension(mContext, container.deviceProfile, tempPointF) + val desktopSize = Size(tempPointF.x.toInt(), tempPointF.y.toInt()) + DEFAULT_BOUNDS.set(0, 0, desktopSize.width / 4, desktopSize.height / 4) + + fullscreenTaskPositions = + taskContainers.map { + DesktopTaskBoundsData(it.task.key.id, it.task.appBounds ?: DEFAULT_BOUNDS) + } + + if (enableDesktopExplodedView()) { + viewModel?.organizeDesktopTasks(desktopSize, fullscreenTaskPositions) + } + positionTaskWindows() + } + companion object { private const val TAG = "DesktopTaskView" private const val DEBUG = false diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt index c07b7fbfb1..5c4a35da63 100644 --- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt +++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.kt @@ -189,11 +189,11 @@ constructor( SplitBannerConfig.SPLIT_GRID_BANNER_LARGE // For landscape grid, for 30% width we only show icon, otherwise show icon and time task.key.id == splitBounds.leftTopTaskId -> - if (splitBounds.leftTaskPercent < THRESHOLD_LEFT_ICON_ONLY) + if (splitBounds.leftTopTaskPercent < THRESHOLD_LEFT_ICON_ONLY) SplitBannerConfig.SPLIT_GRID_BANNER_SMALL else SplitBannerConfig.SPLIT_GRID_BANNER_LARGE else -> - if (splitBounds.leftTaskPercent > THRESHOLD_RIGHT_ICON_ONLY) + if (splitBounds.leftTopTaskPercent > THRESHOLD_RIGHT_ICON_ONLY) SplitBannerConfig.SPLIT_GRID_BANNER_SMALL else SplitBannerConfig.SPLIT_GRID_BANNER_LARGE } diff --git a/quickstep/src/com/android/quickstep/views/GroupedTaskView.kt b/quickstep/src/com/android/quickstep/views/GroupedTaskView.kt index 229c8f5ba1..a8eee0a026 100644 --- a/quickstep/src/com/android/quickstep/views/GroupedTaskView.kt +++ b/quickstep/src/com/android/quickstep/views/GroupedTaskView.kt @@ -171,12 +171,10 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu val iconMargins = (iconViewMarginStart + iconViewBackgroundMarginStart) * 2 // setMaxWidth() needs to be called before mIconView.setIconOrientation which is // called in the super below. - (leftTopTaskContainer.iconView as IconAppChipView).setMaxWidth( + (leftTopTaskContainer.iconView as IconAppChipView).maxWidth = groupedTaskViewSizes.first.x - iconMargins - ) - (rightBottomTaskContainer.iconView as IconAppChipView).setMaxWidth( + (rightBottomTaskContainer.iconView as IconAppChipView).maxWidth = groupedTaskViewSizes.second.x - iconMargins - ) } } super.setOrientationState(orientationState) @@ -189,18 +187,30 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu val taskIconHeight = deviceProfile.overviewTaskIconSizePx val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL val inSplitSelection = getThisTaskCurrentlyInSplitSelection() != INVALID_TASK_ID + var oneIconHiddenDueToSmallWidth = false if (enableFlexibleTwoAppSplit()) { - val topLeftTaskPercent = - if (deviceProfile.isLeftRightSplit) splitBoundsConfig.leftTaskPercent - else splitBoundsConfig.topTaskPercent - val bottomRightTaskPercent = 1 - topLeftTaskPercent - leftTopTaskContainer.iconView.setFlexSplitAlpha( - if (topLeftTaskPercent < MINIMUM_RATIO_TO_SHOW_ICON) 0f else 1f - ) - rightBottomTaskContainer.iconView.setFlexSplitAlpha( - if (bottomRightTaskPercent < MINIMUM_RATIO_TO_SHOW_ICON) 0f else 1f - ) + // Update values for both icons' setFlexSplitAlpha. Mainly, we want to hide an icon if + // its app tile is too small. But we also have to set the alphas back if we go to + // split selection. + val hideLeftTopIcon: Boolean + val hideRightBottomIcon: Boolean + if (inSplitSelection) { + hideLeftTopIcon = + getThisTaskCurrentlyInSplitSelection() == splitBoundsConfig.leftTopTaskId + hideRightBottomIcon = + getThisTaskCurrentlyInSplitSelection() == splitBoundsConfig.rightBottomTaskId + } else { + hideLeftTopIcon = splitBoundsConfig.leftTopTaskPercent < MINIMUM_RATIO_TO_SHOW_ICON + hideRightBottomIcon = + splitBoundsConfig.rightBottomTaskPercent < MINIMUM_RATIO_TO_SHOW_ICON + if (hideLeftTopIcon || hideRightBottomIcon) { + oneIconHiddenDueToSmallWidth = true + } + } + + leftTopTaskContainer.iconView.setFlexSplitAlpha(if (hideLeftTopIcon) 0f else 1f) + rightBottomTaskContainer.iconView.setFlexSplitAlpha(if (hideRightBottomIcon) 0f else 1f) } if (enableOverviewIconMenu()) { @@ -223,6 +233,7 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu deviceProfile, splitBoundsConfig, inSplitSelection, + oneIconHiddenDueToSmallWidth, ) } else { pagedOrientationHandler.setSplitIconParams( @@ -237,6 +248,7 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu deviceProfile, splitBoundsConfig, inSplitSelection, + oneIconHiddenDueToSmallWidth, ) } } diff --git a/quickstep/src/com/android/quickstep/views/IconAppChipView.java b/quickstep/src/com/android/quickstep/views/IconAppChipView.java deleted file mode 100644 index 52704772d0..0000000000 --- a/quickstep/src/com/android/quickstep/views/IconAppChipView.java +++ /dev/null @@ -1,471 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.views; - -import static com.android.app.animation.Interpolators.EMPHASIZED; -import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; -import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X; -import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.animation.RectEvaluator; -import android.animation.ValueAnimator; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Outline; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewAnimationUtils; -import android.view.ViewOutlineProvider; -import android.widget.FrameLayout; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.android.launcher3.R; -import com.android.launcher3.Utilities; -import com.android.launcher3.util.MultiPropertyFactory; -import com.android.launcher3.util.MultiValueAlpha; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.RecentsOrientedState; - -/** - * An icon app menu view which can be used in place of an IconView in overview TaskViews. - */ -public class IconAppChipView extends FrameLayout implements TaskViewIcon { - - private static final int MENU_BACKGROUND_REVEAL_DURATION = 417; - private static final int MENU_BACKGROUND_HIDE_DURATION = 333; - - private static final int NUM_ALPHA_CHANNELS = 4; - private static final int INDEX_CONTENT_ALPHA = 0; - private static final int INDEX_COLOR_FILTER_ALPHA = 1; - private static final int INDEX_MODAL_ALPHA = 2; - /** Used to hide the app chip for 90:10 flex split. */ - private static final int INDEX_MINIMUM_RATIO_ALPHA = 3; - - private final MultiValueAlpha mMultiValueAlpha; - - private View mMenuAnchorView; - private IconView mIconView; - // Two textview so we can ellipsize the collapsed view and crossfade on expand to the full name. - private TextView mIconTextCollapsedView; - private TextView mIconTextExpandedView; - private ImageView mIconArrowView; - private final Rect mBackgroundRelativeLtrLocation = new Rect(); - final RectEvaluator mBackgroundAnimationRectEvaluator = - new RectEvaluator(mBackgroundRelativeLtrLocation); - private final int mCollapsedMenuDefaultWidth; - private final int mExpandedMenuDefaultWidth; - private final int mCollapsedMenuDefaultHeight; - private final int mExpandedMenuDefaultHeight; - private final int mIconMenuMarginTopStart; - private final int mMenuToChipGap; - private final int mBackgroundMarginTopStart; - private final int mAppNameHorizontalMargin; - private final int mIconViewMarginStart; - private final int mAppIconSize; - private final int mArrowSize; - private final int mIconViewDrawableExpandedSize; - private final int mArrowMarginEnd; - private AnimatorSet mAnimator; - - private int mMaxWidth = Integer.MAX_VALUE; - - private static final int INDEX_SPLIT_TRANSLATION = 0; - private static final int INDEX_MENU_TRANSLATION = 1; - private static final int INDEX_COUNT_TRANSLATION = 2; - - private final MultiPropertyFactory mViewTranslationX; - private final MultiPropertyFactory mViewTranslationY; - - /** - * Gets the view split x-axis translation - */ - public MultiPropertyFactory.MultiProperty getSplitTranslationX() { - return mViewTranslationX.get(INDEX_SPLIT_TRANSLATION); - } - - /** - * Sets the view split x-axis translation - * @param translationX x-axis translation - */ - public void setSplitTranslationX(float translationX) { - getSplitTranslationX().setValue(translationX); - } - - /** - * Gets the view split y-axis translation - */ - public MultiPropertyFactory.MultiProperty getSplitTranslationY() { - return mViewTranslationY.get(INDEX_SPLIT_TRANSLATION); - } - - /** - * Sets the view split y-axis translation - * @param translationY y-axis translation - */ - public void setSplitTranslationY(float translationY) { - getSplitTranslationY().setValue(translationY); - } - - /** - * Gets the menu x-axis translation for split task - */ - public MultiPropertyFactory.MultiProperty getMenuTranslationX() { - return mViewTranslationX.get(INDEX_MENU_TRANSLATION); - } - - /** - * Gets the menu y-axis translation for split task - */ - public MultiPropertyFactory.MultiProperty getMenuTranslationY() { - return mViewTranslationY.get(INDEX_MENU_TRANSLATION); - } - - public IconAppChipView(Context context) { - this(context, null); - } - - public IconAppChipView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public IconAppChipView(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public IconAppChipView(Context context, @Nullable AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - Resources res = getResources(); - mMultiValueAlpha = new MultiValueAlpha(this, NUM_ALPHA_CHANNELS); - mMultiValueAlpha.setUpdateVisibility(/* updateVisibility= */ true); - - // Menu dimensions - mCollapsedMenuDefaultWidth = - res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_collapsed_width); - mExpandedMenuDefaultWidth = - res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_width); - mCollapsedMenuDefaultHeight = - res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_collapsed_height); - mExpandedMenuDefaultHeight = - res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_height); - mIconMenuMarginTopStart = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_expanded_top_start_margin); - mMenuToChipGap = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_expanded_gap); - - // Background dimensions - mBackgroundMarginTopStart = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_background_margin_top_start); - - // Contents dimensions - mAppNameHorizontalMargin = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_app_name_margin_horizontal_collapsed); - mArrowMarginEnd = res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_arrow_margin); - mIconViewMarginStart = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_view_start_margin); - mAppIconSize = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_app_icon_collapsed_size); - mArrowSize = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_arrow_size); - mIconViewDrawableExpandedSize = res.getDimensionPixelSize( - R.dimen.task_thumbnail_icon_menu_app_icon_expanded_size); - - mViewTranslationX = new MultiPropertyFactory<>(this, VIEW_TRANSLATE_X, - INDEX_COUNT_TRANSLATION, - Float::sum); - mViewTranslationY = new MultiPropertyFactory<>(this, VIEW_TRANSLATE_Y, - INDEX_COUNT_TRANSLATION, - Float::sum); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mIconView = findViewById(R.id.icon_view); - mIconTextCollapsedView = findViewById(R.id.icon_text_collapsed); - mIconTextExpandedView = findViewById(R.id.icon_text_expanded); - mIconArrowView = findViewById(R.id.icon_arrow); - mMenuAnchorView = findViewById(R.id.icon_view_menu_anchor); - } - - protected IconView getIconView() { - return mIconView; - } - - @Override - public void setText(CharSequence text) { - if (mIconTextCollapsedView != null) { - mIconTextCollapsedView.setText(text); - } - if (mIconTextExpandedView != null) { - mIconTextExpandedView.setText(text); - } - } - - @Override - public Drawable getDrawable() { - return mIconView == null ? null : mIconView.getDrawable(); - } - - @Override - public void setDrawable(Drawable icon) { - if (mIconView != null) { - mIconView.setDrawable(icon); - } - } - - @Override - public void setDrawableSize(int iconWidth, int iconHeight) { - if (mIconView != null) { - mIconView.setDrawableSize(iconWidth, iconHeight); - } - } - - /** - * Sets the maximum width of this Icon Menu. This is usually used when space is limited for - * split screen. - */ - public void setMaxWidth(int maxWidth) { - // Width showing only the app icon and arrow. Max width should not be set to less than this. - int minimumMaxWidth = mIconViewMarginStart + mAppIconSize + mArrowSize + mArrowMarginEnd; - mMaxWidth = Math.max(maxWidth, minimumMaxWidth); - } - - @Override - public void setIconOrientation(RecentsOrientedState orientationState, boolean isGridTask) { - RecentsPagedOrientationHandler orientationHandler = - orientationState.getOrientationHandler(); - // Layout params for anchor view - LayoutParams anchorLayoutParams = (LayoutParams) mMenuAnchorView.getLayoutParams(); - anchorLayoutParams.topMargin = mExpandedMenuDefaultHeight + mMenuToChipGap; - mMenuAnchorView.setLayoutParams(anchorLayoutParams); - - // Layout Params for the Menu View (this) - LayoutParams iconMenuParams = (LayoutParams) getLayoutParams(); - iconMenuParams.width = mExpandedMenuDefaultWidth; - iconMenuParams.height = mExpandedMenuDefaultHeight; - orientationHandler.setIconAppChipMenuParams(this, iconMenuParams, mIconMenuMarginTopStart, - mIconMenuMarginTopStart); - setLayoutParams(iconMenuParams); - - // Layout params for the background - Rect collapsedBackgroundBounds = getCollapsedBackgroundLtrBounds(); - mBackgroundRelativeLtrLocation.set(collapsedBackgroundBounds); - setOutlineProvider(new ViewOutlineProvider() { - final Rect mRtlAppliedOutlineBounds = new Rect(); - @Override - public void getOutline(View view, Outline outline) { - mRtlAppliedOutlineBounds.set(mBackgroundRelativeLtrLocation); - if (isLayoutRtl()) { - int width = getWidth(); - mRtlAppliedOutlineBounds.left = width - mBackgroundRelativeLtrLocation.right; - mRtlAppliedOutlineBounds.right = width - mBackgroundRelativeLtrLocation.left; - } - outline.setRoundRect( - mRtlAppliedOutlineBounds, mRtlAppliedOutlineBounds.height() / 2f); - } - }); - - // Layout Params for the Icon View - LayoutParams iconParams = (LayoutParams) mIconView.getLayoutParams(); - int iconMarginStartRelativeToParent = mIconViewMarginStart + mBackgroundMarginTopStart; - orientationHandler.setIconAppChipChildrenParams( - iconParams, iconMarginStartRelativeToParent); - - mIconView.setLayoutParams(iconParams); - mIconView.setDrawableSize(mAppIconSize, mAppIconSize); - - // Layout Params for the collapsed Icon Text View - int textMarginStart = - iconMarginStartRelativeToParent + mAppIconSize + mAppNameHorizontalMargin; - LayoutParams iconTextCollapsedParams = - (LayoutParams) mIconTextCollapsedView.getLayoutParams(); - orientationHandler.setIconAppChipChildrenParams(iconTextCollapsedParams, textMarginStart); - int collapsedTextWidth = collapsedBackgroundBounds.width() - mIconViewMarginStart - - mAppIconSize - mArrowSize - mAppNameHorizontalMargin - mArrowMarginEnd; - iconTextCollapsedParams.width = collapsedTextWidth; - mIconTextCollapsedView.setLayoutParams(iconTextCollapsedParams); - mIconTextCollapsedView.setAlpha(1f); - - // Layout Params for the expanded Icon Text View - LayoutParams iconTextExpandedParams = - (LayoutParams) mIconTextExpandedView.getLayoutParams(); - orientationHandler.setIconAppChipChildrenParams(iconTextExpandedParams, textMarginStart); - mIconTextExpandedView.setLayoutParams(iconTextExpandedParams); - mIconTextExpandedView.setAlpha(0f); - mIconTextExpandedView.setRevealClip(true, 0, mAppIconSize / 2f, collapsedTextWidth); - - // Layout Params for the Icon Arrow View - LayoutParams iconArrowParams = (LayoutParams) mIconArrowView.getLayoutParams(); - int arrowMarginStart = collapsedBackgroundBounds.right - mArrowMarginEnd - mArrowSize; - orientationHandler.setIconAppChipChildrenParams(iconArrowParams, arrowMarginStart); - mIconArrowView.setPivotY(iconArrowParams.height / 2f); - mIconArrowView.setLayoutParams(iconArrowParams); - - // This method is called twice sometimes (like when rotating split tasks). It is called - // once before onMeasure and onLayout, and again after onMeasure but before onLayout with - // a new width. This happens because we update widths on rotation and on measure of - // grouped task views. Calling requestLayout() does not guarantee a call to onMeasure if - // it has just measured, so we explicitly call it here. - measure(MeasureSpec.makeMeasureSpec(getLayoutParams().width, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(getLayoutParams().height, MeasureSpec.EXACTLY)); - } - - @Override - public void setIconColorTint(int color, float amount) { - // RecentsView's COLOR_TINT animates between 0 and 0.5f, we want to hide the app chip menu. - float colorTintAlpha = Utilities.mapToRange(amount, 0f, 0.5f, 1f, 0f, LINEAR); - mMultiValueAlpha.get(INDEX_COLOR_FILTER_ALPHA).setValue(colorTintAlpha); - } - - @Override - public void setContentAlpha(float alpha) { - mMultiValueAlpha.get(INDEX_CONTENT_ALPHA).setValue(alpha); - } - - @Override - public void setModalAlpha(float alpha) { - mMultiValueAlpha.get(INDEX_MODAL_ALPHA).setValue(alpha); - } - - @Override - public void setFlexSplitAlpha(float alpha) { - mMultiValueAlpha.get(INDEX_MINIMUM_RATIO_ALPHA).setValue(alpha); - } - - @Override - public int getDrawableWidth() { - return mIconView == null ? 0 : mIconView.getDrawableWidth(); - } - - @Override - public int getDrawableHeight() { - return mIconView == null ? 0 : mIconView.getDrawableHeight(); - } - - protected void revealAnim(boolean isRevealing) { - cancelInProgressAnimations(); - final Rect collapsedBackgroundBounds = getCollapsedBackgroundLtrBounds(); - final Rect expandedBackgroundBounds = getExpandedBackgroundLtrBounds(); - final Rect initialBackground = new Rect(mBackgroundRelativeLtrLocation); - mAnimator = new AnimatorSet(); - - if (isRevealing) { - boolean isRtl = isLayoutRtl(); - bringToFront(); - // Clip expanded text with reveal animation so it doesn't go beyond the edge of the menu - Animator expandedTextRevealAnim = ViewAnimationUtils.createCircularReveal( - mIconTextExpandedView, 0, mIconTextExpandedView.getHeight() / 2, - mIconTextCollapsedView.getWidth(), mIconTextExpandedView.getWidth()); - // Animate background clipping - ValueAnimator backgroundAnimator = ValueAnimator.ofObject( - mBackgroundAnimationRectEvaluator, - initialBackground, - expandedBackgroundBounds); - backgroundAnimator.addUpdateListener(valueAnimator -> invalidateOutline()); - - float iconViewScaling = mIconViewDrawableExpandedSize / (float) mAppIconSize; - float arrowTranslationX = - expandedBackgroundBounds.right - collapsedBackgroundBounds.right; - float iconCenterToTextCollapsed = mAppIconSize / 2f + mAppNameHorizontalMargin; - float iconCenterToTextExpanded = - mIconViewDrawableExpandedSize / 2f + mAppNameHorizontalMargin; - float textTranslationX = iconCenterToTextExpanded - iconCenterToTextCollapsed; - - float textTranslationXWithRtl = isRtl ? -textTranslationX : textTranslationX; - float arrowTranslationWithRtl = isRtl ? -arrowTranslationX : arrowTranslationX; - - mAnimator.playTogether( - expandedTextRevealAnim, - backgroundAnimator, - ObjectAnimator.ofFloat(mIconView, SCALE_X, iconViewScaling), - ObjectAnimator.ofFloat(mIconView, SCALE_Y, iconViewScaling), - ObjectAnimator.ofFloat(mIconTextCollapsedView, TRANSLATION_X, - textTranslationXWithRtl), - ObjectAnimator.ofFloat(mIconTextExpandedView, TRANSLATION_X, - textTranslationXWithRtl), - ObjectAnimator.ofFloat(mIconTextCollapsedView, ALPHA, 0), - ObjectAnimator.ofFloat(mIconTextExpandedView, ALPHA, 1), - ObjectAnimator.ofFloat(mIconArrowView, TRANSLATION_X, arrowTranslationWithRtl), - ObjectAnimator.ofFloat(mIconArrowView, SCALE_Y, -1)); - mAnimator.setDuration(MENU_BACKGROUND_REVEAL_DURATION); - } else { - // Clip expanded text with reveal animation so it doesn't go beyond the edge of the menu - Animator expandedTextClipAnim = ViewAnimationUtils.createCircularReveal( - mIconTextExpandedView, 0, mIconTextExpandedView.getHeight() / 2, - mIconTextExpandedView.getWidth(), mIconTextCollapsedView.getWidth()); - - // Animate background clipping - ValueAnimator backgroundAnimator = ValueAnimator.ofObject( - mBackgroundAnimationRectEvaluator, - initialBackground, - collapsedBackgroundBounds); - backgroundAnimator.addUpdateListener(valueAnimator -> invalidateOutline()); - - mAnimator.playTogether( - expandedTextClipAnim, - backgroundAnimator, - ObjectAnimator.ofFloat(mIconView, SCALE_PROPERTY, 1), - ObjectAnimator.ofFloat(mIconTextCollapsedView, TRANSLATION_X, 0), - ObjectAnimator.ofFloat(mIconTextExpandedView, TRANSLATION_X, 0), - ObjectAnimator.ofFloat(mIconTextCollapsedView, ALPHA, 1), - ObjectAnimator.ofFloat(mIconTextExpandedView, ALPHA, 0), - ObjectAnimator.ofFloat(mIconArrowView, TRANSLATION_X, 0), - ObjectAnimator.ofFloat(mIconArrowView, SCALE_Y, 1)); - mAnimator.setDuration(MENU_BACKGROUND_HIDE_DURATION); - } - - mAnimator.setInterpolator(EMPHASIZED); - mAnimator.start(); - } - - private Rect getCollapsedBackgroundLtrBounds() { - Rect bounds = new Rect( - 0, - 0, - Math.min(mMaxWidth, mCollapsedMenuDefaultWidth), - mCollapsedMenuDefaultHeight); - bounds.offset(mBackgroundMarginTopStart, mBackgroundMarginTopStart); - return bounds; - } - - private Rect getExpandedBackgroundLtrBounds() { - return new Rect(0, 0, mExpandedMenuDefaultWidth, mExpandedMenuDefaultHeight); - } - - private void cancelInProgressAnimations() { - // We null the `AnimatorSet` because it holds references to the `Animators` which aren't - // expecting to be mutable and will cause a crash if they are re-used. - if (mAnimator != null && mAnimator.isStarted()) { - mAnimator.cancel(); - mAnimator = null; - } - } - - @Override - public View asView() { - return this; - } -} diff --git a/quickstep/src/com/android/quickstep/views/IconAppChipView.kt b/quickstep/src/com/android/quickstep/views/IconAppChipView.kt new file mode 100644 index 0000000000..8d535524f5 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/IconAppChipView.kt @@ -0,0 +1,439 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.views + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.animation.RectEvaluator +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Outline +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.util.AttributeSet +import android.view.View +import android.view.ViewAnimationUtils +import android.view.ViewOutlineProvider +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.TextView +import com.android.app.animation.Interpolators +import com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY +import com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X +import com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y +import com.android.launcher3.R +import com.android.launcher3.Utilities +import com.android.launcher3.util.MultiPropertyFactory +import com.android.launcher3.util.MultiPropertyFactory.FloatBiFunction +import com.android.launcher3.util.MultiValueAlpha +import com.android.quickstep.util.RecentsOrientedState +import kotlin.math.max +import kotlin.math.min + +/** An icon app menu view which can be used in place of an IconView in overview TaskViews. */ +class IconAppChipView +@JvmOverloads +constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, + defStyleRes: Int = 0, +) : FrameLayout(context, attrs, defStyleAttr, defStyleRes), TaskViewIcon { + + private var iconView: IconView? = null + private var iconArrowView: ImageView? = null + private var menuAnchorView: View? = null + // Two textview so we can ellipsize the collapsed view and crossfade on expand to the full name. + private var iconTextCollapsedView: TextView? = null + private var iconTextExpandedView: TextView? = null + + private val backgroundRelativeLtrLocation = Rect() + private val backgroundAnimationRectEvaluator = RectEvaluator(backgroundRelativeLtrLocation) + + // Menu dimensions + private val collapsedMenuDefaultWidth: Int = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_collapsed_width) + private val expandedMenuDefaultWidth: Int = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_width) + private val collapsedMenuDefaultHeight = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_collapsed_height) + private val expandedMenuDefaultHeight = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_height) + private val iconMenuMarginTopStart = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_top_start_margin) + private val menuToChipGap: Int = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_expanded_gap) + + // Background dimensions + private val backgroundMarginTopStart: Int = + resources.getDimensionPixelSize( + R.dimen.task_thumbnail_icon_menu_background_margin_top_start + ) + + // Contents dimensions + private val appNameHorizontalMargin = + resources.getDimensionPixelSize( + R.dimen.task_thumbnail_icon_menu_app_name_margin_horizontal_collapsed + ) + private val arrowMarginEnd = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_arrow_margin) + private val iconViewMarginStart = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_view_start_margin) + private val appIconSize = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_app_icon_collapsed_size) + private val arrowSize = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_arrow_size) + private val iconViewDrawableExpandedSize = + resources.getDimensionPixelSize(R.dimen.task_thumbnail_icon_menu_app_icon_expanded_size) + + private var animator: AnimatorSet? = null + + private val multiValueAlpha: MultiValueAlpha = + MultiValueAlpha(this, NUM_ALPHA_CHANNELS).apply { setUpdateVisibility(true) } + + private val viewTranslationX: MultiPropertyFactory = + MultiPropertyFactory(this, VIEW_TRANSLATE_X, INDEX_COUNT_TRANSLATION, SUM_AGGREGATOR) + + private val viewTranslationY: MultiPropertyFactory = + MultiPropertyFactory(this, VIEW_TRANSLATE_Y, INDEX_COUNT_TRANSLATION, SUM_AGGREGATOR) + + var maxWidth = Int.MAX_VALUE + /** + * Sets the maximum width of this Icon Menu. This is usually used when space is limited for + * split screen. + */ + set(value) { + // Width showing only the app icon and arrow. Max width should not be set to less than + // this. + val minMaxWidth = iconViewMarginStart + appIconSize + arrowSize + arrowMarginEnd + field = max(value, minMaxWidth) + } + + override fun onFinishInflate() { + super.onFinishInflate() + iconView = findViewById(R.id.icon_view) + iconTextCollapsedView = findViewById(R.id.icon_text_collapsed) + iconTextExpandedView = findViewById(R.id.icon_text_expanded) + iconArrowView = findViewById(R.id.icon_arrow) + menuAnchorView = findViewById(R.id.icon_view_menu_anchor) + } + + override fun setText(text: CharSequence?) { + iconTextCollapsedView?.text = text + iconTextExpandedView?.text = text + } + + override fun getDrawable(): Drawable? = iconView?.drawable + + override fun setDrawable(icon: Drawable?) { + iconView?.drawable = icon + } + + override fun setDrawableSize(iconWidth: Int, iconHeight: Int) { + iconView?.setDrawableSize(iconWidth, iconHeight) + } + + override fun setIconOrientation(orientationState: RecentsOrientedState, isGridTask: Boolean) { + val orientationHandler = orientationState.orientationHandler + // Layout params for anchor view + val anchorLayoutParams = menuAnchorView!!.layoutParams as LayoutParams + anchorLayoutParams.topMargin = expandedMenuDefaultHeight + menuToChipGap + menuAnchorView!!.layoutParams = anchorLayoutParams + + // Layout Params for the Menu View (this) + val iconMenuParams = layoutParams as LayoutParams + iconMenuParams.width = expandedMenuDefaultWidth + iconMenuParams.height = expandedMenuDefaultHeight + orientationHandler.setIconAppChipMenuParams( + this, + iconMenuParams, + iconMenuMarginTopStart, + iconMenuMarginTopStart, + ) + layoutParams = iconMenuParams + + // Layout params for the background + val collapsedBackgroundBounds = getCollapsedBackgroundLtrBounds() + backgroundRelativeLtrLocation.set(collapsedBackgroundBounds) + outlineProvider = + object : ViewOutlineProvider() { + val mRtlAppliedOutlineBounds: Rect = Rect() + + override fun getOutline(view: View, outline: Outline) { + mRtlAppliedOutlineBounds.set(backgroundRelativeLtrLocation) + if (isLayoutRtl) { + val width = width + mRtlAppliedOutlineBounds.left = width - backgroundRelativeLtrLocation.right + mRtlAppliedOutlineBounds.right = width - backgroundRelativeLtrLocation.left + } + outline.setRoundRect( + mRtlAppliedOutlineBounds, + mRtlAppliedOutlineBounds.height() / 2f, + ) + } + } + + // Layout Params for the Icon View + val iconParams = iconView!!.layoutParams as LayoutParams + val iconMarginStartRelativeToParent = iconViewMarginStart + backgroundMarginTopStart + orientationHandler.setIconAppChipChildrenParams(iconParams, iconMarginStartRelativeToParent) + + iconView!!.layoutParams = iconParams + iconView!!.setDrawableSize(appIconSize, appIconSize) + + // Layout Params for the collapsed Icon Text View + val textMarginStart = + iconMarginStartRelativeToParent + appIconSize + appNameHorizontalMargin + val iconTextCollapsedParams = iconTextCollapsedView!!.layoutParams as LayoutParams + orientationHandler.setIconAppChipChildrenParams(iconTextCollapsedParams, textMarginStart) + val collapsedTextWidth = + (collapsedBackgroundBounds.width() - + iconViewMarginStart - + appIconSize - + arrowSize - + appNameHorizontalMargin - + arrowMarginEnd) + iconTextCollapsedParams.width = collapsedTextWidth + iconTextCollapsedView!!.layoutParams = iconTextCollapsedParams + iconTextCollapsedView!!.alpha = 1f + + // Layout Params for the expanded Icon Text View + val iconTextExpandedParams = iconTextExpandedView!!.layoutParams as LayoutParams + orientationHandler.setIconAppChipChildrenParams(iconTextExpandedParams, textMarginStart) + iconTextExpandedView!!.layoutParams = iconTextExpandedParams + iconTextExpandedView!!.alpha = 0f + iconTextExpandedView!!.setRevealClip( + true, + 0f, + appIconSize / 2f, + collapsedTextWidth.toFloat(), + ) + + // Layout Params for the Icon Arrow View + val iconArrowParams = iconArrowView!!.layoutParams as LayoutParams + val arrowMarginStart = collapsedBackgroundBounds.right - arrowMarginEnd - arrowSize + orientationHandler.setIconAppChipChildrenParams(iconArrowParams, arrowMarginStart) + iconArrowView!!.pivotY = iconArrowParams.height / 2f + iconArrowView!!.layoutParams = iconArrowParams + + // This method is called twice sometimes (like when rotating split tasks). It is called + // once before onMeasure and onLayout, and again after onMeasure but before onLayout with + // a new width. This happens because we update widths on rotation and on measure of + // grouped task views. Calling requestLayout() does not guarantee a call to onMeasure if + // it has just measured, so we explicitly call it here. + measure( + MeasureSpec.makeMeasureSpec(layoutParams.width, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(layoutParams.height, MeasureSpec.EXACTLY), + ) + } + + override fun setIconColorTint(color: Int, amount: Float) { + // RecentsView's COLOR_TINT animates between 0 and 0.5f, we want to hide the app chip menu. + val colorTintAlpha = Utilities.mapToRange(amount, 0f, 0.5f, 1f, 0f, Interpolators.LINEAR) + multiValueAlpha[INDEX_COLOR_FILTER_ALPHA].value = colorTintAlpha + } + + override fun setContentAlpha(alpha: Float) { + multiValueAlpha[INDEX_CONTENT_ALPHA].value = alpha + } + + override fun setModalAlpha(alpha: Float) { + multiValueAlpha[INDEX_MODAL_ALPHA].value = alpha + } + + override fun setFlexSplitAlpha(alpha: Float) { + multiValueAlpha[INDEX_MINIMUM_RATIO_ALPHA].value = alpha + } + + override fun getDrawableWidth(): Int = iconView?.drawableWidth ?: 0 + + override fun getDrawableHeight(): Int = iconView?.drawableHeight ?: 0 + + /** Gets the view split x-axis translation */ + fun getSplitTranslationX(): MultiPropertyFactory.MultiProperty = + viewTranslationX.get(INDEX_SPLIT_TRANSLATION) + + /** + * Sets the view split x-axis translation + * + * @param value x-axis translation + */ + fun setSplitTranslationX(value: Float) { + getSplitTranslationX().value = value + } + + /** Gets the view split y-axis translation */ + fun getSplitTranslationY(): MultiPropertyFactory.MultiProperty = + viewTranslationY[INDEX_SPLIT_TRANSLATION] + + /** + * Sets the view split y-axis translation + * + * @param value y-axis translation + */ + fun setSplitTranslationY(value: Float) { + getSplitTranslationY().value = value + } + + /** Gets the menu x-axis translation for split task */ + fun getMenuTranslationX(): MultiPropertyFactory.MultiProperty = + viewTranslationX[INDEX_MENU_TRANSLATION] + + /** Gets the menu y-axis translation for split task */ + fun getMenuTranslationY(): MultiPropertyFactory.MultiProperty = + viewTranslationY[INDEX_MENU_TRANSLATION] + + internal fun revealAnim(isRevealing: Boolean, animated: Boolean = true) { + cancelInProgressAnimations() + val collapsedBackgroundBounds = getCollapsedBackgroundLtrBounds() + val expandedBackgroundBounds = getExpandedBackgroundLtrBounds() + val initialBackground = Rect(backgroundRelativeLtrLocation) + animator = AnimatorSet() + + if (isRevealing) { + val isRtl = isLayoutRtl + bringToFront() + // Clip expanded text with reveal animation so it doesn't go beyond the edge of the menu + val expandedTextRevealAnim = + ViewAnimationUtils.createCircularReveal( + iconTextExpandedView, + 0, + iconTextExpandedView!!.height / 2, + iconTextCollapsedView!!.width.toFloat(), + iconTextExpandedView!!.width.toFloat(), + ) + // Animate background clipping + val backgroundAnimator = + ValueAnimator.ofObject( + backgroundAnimationRectEvaluator, + initialBackground, + expandedBackgroundBounds, + ) + backgroundAnimator.addUpdateListener { invalidateOutline() } + + val iconViewScaling = iconViewDrawableExpandedSize / appIconSize.toFloat() + val arrowTranslationX = + (expandedBackgroundBounds.right - collapsedBackgroundBounds.right).toFloat() + val iconCenterToTextCollapsed = appIconSize / 2f + appNameHorizontalMargin + val iconCenterToTextExpanded = + iconViewDrawableExpandedSize / 2f + appNameHorizontalMargin + val textTranslationX = iconCenterToTextExpanded - iconCenterToTextCollapsed + + val textTranslationXWithRtl = if (isRtl) -textTranslationX else textTranslationX + val arrowTranslationWithRtl = if (isRtl) -arrowTranslationX else arrowTranslationX + + animator!!.playTogether( + expandedTextRevealAnim, + backgroundAnimator, + ObjectAnimator.ofFloat(iconView, SCALE_X, iconViewScaling), + ObjectAnimator.ofFloat(iconView, SCALE_Y, iconViewScaling), + ObjectAnimator.ofFloat( + iconTextCollapsedView, + TRANSLATION_X, + textTranslationXWithRtl, + ), + ObjectAnimator.ofFloat( + iconTextExpandedView, + TRANSLATION_X, + textTranslationXWithRtl, + ), + ObjectAnimator.ofFloat(iconTextCollapsedView, ALPHA, 0f), + ObjectAnimator.ofFloat(iconTextExpandedView, ALPHA, 1f), + ObjectAnimator.ofFloat(iconArrowView, TRANSLATION_X, arrowTranslationWithRtl), + ObjectAnimator.ofFloat(iconArrowView, SCALE_Y, -1f), + ) + animator!!.setDuration(MENU_BACKGROUND_REVEAL_DURATION.toLong()) + } else { + // Clip expanded text with reveal animation so it doesn't go beyond the edge of the menu + val expandedTextClipAnim = + ViewAnimationUtils.createCircularReveal( + iconTextExpandedView, + 0, + iconTextExpandedView!!.height / 2, + iconTextExpandedView!!.width.toFloat(), + iconTextCollapsedView!!.width.toFloat(), + ) + + // Animate background clipping + val backgroundAnimator = + ValueAnimator.ofObject( + backgroundAnimationRectEvaluator, + initialBackground, + collapsedBackgroundBounds, + ) + backgroundAnimator.addUpdateListener { valueAnimator: ValueAnimator? -> + invalidateOutline() + } + + animator!!.playTogether( + expandedTextClipAnim, + backgroundAnimator, + ObjectAnimator.ofFloat(iconView, SCALE_PROPERTY, 1f), + ObjectAnimator.ofFloat(iconTextCollapsedView, TRANSLATION_X, 0f), + ObjectAnimator.ofFloat(iconTextExpandedView, TRANSLATION_X, 0f), + ObjectAnimator.ofFloat(iconTextCollapsedView, ALPHA, 1f), + ObjectAnimator.ofFloat(iconTextExpandedView, ALPHA, 0f), + ObjectAnimator.ofFloat(iconArrowView, TRANSLATION_X, 0f), + ObjectAnimator.ofFloat(iconArrowView, SCALE_Y, 1f), + ) + animator!!.setDuration(MENU_BACKGROUND_HIDE_DURATION.toLong()) + } + + if (!animated) animator!!.duration = 0 + animator!!.interpolator = Interpolators.EMPHASIZED + animator!!.start() + } + + private fun getCollapsedBackgroundLtrBounds(): Rect { + val bounds = + Rect(0, 0, min(maxWidth, collapsedMenuDefaultWidth), collapsedMenuDefaultHeight) + bounds.offset(backgroundMarginTopStart, backgroundMarginTopStart) + return bounds + } + + private fun getExpandedBackgroundLtrBounds() = + Rect(0, 0, expandedMenuDefaultWidth, expandedMenuDefaultHeight) + + private fun cancelInProgressAnimations() { + // We null the `AnimatorSet` because it holds references to the `Animators` which aren't + // expecting to be mutable and will cause a crash if they are re-used. + if (animator != null && animator!!.isStarted) { + animator!!.cancel() + animator = null + } + } + + override fun asView(): View = this + + private companion object { + private val SUM_AGGREGATOR = FloatBiFunction { a: Float, b: Float -> a + b } + + private const val MENU_BACKGROUND_REVEAL_DURATION = 417 + private const val MENU_BACKGROUND_HIDE_DURATION = 333 + + private const val NUM_ALPHA_CHANNELS = 4 + private const val INDEX_CONTENT_ALPHA = 0 + private const val INDEX_COLOR_FILTER_ALPHA = 1 + private const val INDEX_MODAL_ALPHA = 2 + + /** Used to hide the app chip for 90:10 flex split. */ + private const val INDEX_MINIMUM_RATIO_ALPHA = 3 + + private const val INDEX_SPLIT_TRANSLATION = 0 + private const val INDEX_MENU_TRANSLATION = 1 + private const val INDEX_COUNT_TRANSLATION = 2 + } +} diff --git a/quickstep/src/com/android/quickstep/views/IconView.kt b/quickstep/src/com/android/quickstep/views/IconView.kt index 6da52d666c..cb69b22de0 100644 --- a/quickstep/src/com/android/quickstep/views/IconView.kt +++ b/quickstep/src/com/android/quickstep/views/IconView.kt @@ -78,7 +78,8 @@ class IconView : View, TaskViewIcon { override fun setDrawable(d: Drawable?) { drawable?.callback = null - drawable = d + // Copy drawable so that mutations below do not affect other users of the drawable + drawable = d?.constantState?.newDrawable()?.mutate() drawable?.let { it.callback = this setDrawableSizeInternal(width, height) diff --git a/quickstep/src/com/android/quickstep/views/RecentsDismissUtils.kt b/quickstep/src/com/android/quickstep/views/RecentsDismissUtils.kt new file mode 100644 index 0000000000..3430b39ac1 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/RecentsDismissUtils.kt @@ -0,0 +1,294 @@ +/* + * 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.quickstep.views + +import android.os.VibrationAttributes +import androidx.dynamicanimation.animation.FloatPropertyCompat +import androidx.dynamicanimation.animation.FloatValueHolder +import androidx.dynamicanimation.animation.SpringAnimation +import androidx.dynamicanimation.animation.SpringForce +import com.android.launcher3.R +import com.android.launcher3.Utilities.boundToRange +import com.android.launcher3.touch.SingleAxisSwipeDetector +import com.android.launcher3.util.DynamicResource +import com.android.launcher3.util.MSDLPlayerWrapper +import com.android.quickstep.util.TaskGridNavHelper +import com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY +import com.google.android.msdl.data.model.MSDLToken +import com.google.android.msdl.domain.InteractionProperties +import kotlin.math.abs + +/** + * Helper class for [RecentsView]. This util class contains refactored and extracted functions from + * RecentsView related to TaskView dismissal. + */ +class RecentsDismissUtils(private val recentsView: RecentsView<*, *>) { + + /** + * Creates the spring animations which run when a dragged task view in overview is released. + * + *

When a task dismiss is cancelled, the task will return to its original position via a + * spring animation. As it passes the threshold of its settling state, its neighbors will spring + * in response to the perceived impact of the settling task. + */ + fun createTaskDismissSettlingSpringAnimation( + draggedTaskView: TaskView?, + velocity: Float, + isDismissing: Boolean, + detector: SingleAxisSwipeDetector, + dismissLength: Int, + onEndRunnable: () -> Unit, + ): SpringAnimation? { + draggedTaskView ?: return null + val taskDismissFloatProperty = + FloatPropertyCompat.createFloatPropertyCompat( + draggedTaskView.secondaryDismissTranslationProperty + ) + // Animate dragged task towards dismissal or rest state. + val draggedTaskViewSpringAnimation = + SpringAnimation(draggedTaskView, taskDismissFloatProperty) + .setSpring(createExpressiveDismissSpringForce()) + .setStartVelocity(if (detector.isFling(velocity)) velocity else 0f) + .addUpdateListener { animation, value, _ -> + if (isDismissing && abs(value) >= abs(dismissLength)) { + animation.cancel() + } else if (draggedTaskView.isRunningTask && recentsView.enableDrawingLiveTile) { + recentsView.runActionOnRemoteHandles { remoteTargetHandle -> + remoteTargetHandle.taskViewSimulator.taskSecondaryTranslation.value = + taskDismissFloatProperty.getValue(draggedTaskView) + } + recentsView.redrawLiveTile() + } + } + .addEndListener { _, _, _, _ -> + if (isDismissing) { + recentsView.dismissTaskView( + draggedTaskView, + /* animateTaskView = */ false, + /* removeTask = */ true, + ) + } else { + recentsView.onDismissAnimationEnds() + } + onEndRunnable() + } + if (!isDismissing) { + addNeighboringSpringAnimationsForDismissCancel( + draggedTaskView, + draggedTaskViewSpringAnimation, + ) + } + return draggedTaskViewSpringAnimation + } + + private fun addNeighboringSpringAnimationsForDismissCancel( + draggedTaskView: TaskView, + draggedTaskViewSpringAnimation: SpringAnimation, + ) { + // Empty spring animation exists for conditional start, and to drive neighboring springs. + val neighborsToSettle = + SpringAnimation(FloatValueHolder()).setSpring(createExpressiveDismissSpringForce()) + var lastPosition = 0f + var startSettling = false + draggedTaskViewSpringAnimation.addUpdateListener { _, value, velocity -> + // Start the settling animation the first time the dragged task passes the origin (from + // negative displacement to positive displacement). We do not check for an exact value + // to compare to, as the update listener does not necessarily hit every value (e.g. a + // value of zero). Do not check again once it has started settling, as a spring can + // bounce past the origin multiple times depending on the stiffness and damping ratio. + if (startSettling) return@addUpdateListener + if (lastPosition < 0 && value >= 0) { + startSettling = true + } + lastPosition = value + if (startSettling) { + neighborsToSettle.setStartVelocity(velocity).animateToFinalPosition(0f) + playDismissSettlingHaptic(velocity) + } + } + + // Add tasks before dragged index, fanning out from the dragged task. + // The order they are added matters, as each spring drives the next. + var previousNeighbor = neighborsToSettle + getTasksOffsetPairAdjacentToDraggedTask(draggedTaskView, towardsStart = true).forEach { + (taskView, offset) -> + previousNeighbor = + createNeighboringTaskViewSpringAnimation( + taskView, + offset * ADDITIONAL_DISMISS_DAMPING_RATIO, + previousNeighbor, + ) + } + // Add tasks after dragged index, fanning out from the dragged task. + // The order they are added matters, as each spring drives the next. + previousNeighbor = neighborsToSettle + getTasksOffsetPairAdjacentToDraggedTask(draggedTaskView, towardsStart = false).forEach { + (taskView, offset) -> + previousNeighbor = + createNeighboringTaskViewSpringAnimation( + taskView, + offset * ADDITIONAL_DISMISS_DAMPING_RATIO, + previousNeighbor, + ) + } + } + + /** + * Gets pairs of (TaskView, offset) adjacent the dragged task in visual order. + * + *

Gets tasks either before or after the dragged task along with their offset from it. The + * offset is the distance between indices for carousels, or distance between columns for grids. + */ + private fun getTasksOffsetPairAdjacentToDraggedTask( + draggedTaskView: TaskView, + towardsStart: Boolean, + ): Sequence> { + if (recentsView.showAsGrid()) { + val taskGridNavHelper = + TaskGridNavHelper( + recentsView.topRowIdArray, + recentsView.bottomRowIdArray, + recentsView.mUtils.getLargeTaskViewIds(), + hasAddDesktopButton = false, + ) + return taskGridNavHelper + .gridTaskViewIdOffsetPairInTabOrderSequence( + draggedTaskView.taskViewId, + towardsStart, + ) + .mapNotNull { (taskViewId, columnOffset) -> + recentsView.getTaskViewFromTaskViewId(taskViewId)?.let { taskView -> + Pair(taskView, columnOffset) + } + } + } else { + val taskViewList = recentsView.mUtils.taskViews.toList() + val draggedTaskViewIndex = taskViewList.indexOf(draggedTaskView) + + return if (towardsStart) { + taskViewList + .take(draggedTaskViewIndex) + .reversed() + .mapIndexed { index, taskView -> Pair(taskView, index + 1) } + .asSequence() + } else { + taskViewList + .takeLast(taskViewList.size - draggedTaskViewIndex - 1) + .mapIndexed { index, taskView -> Pair(taskView, index + 1) } + .asSequence() + } + } + } + + /** Creates a neighboring task view spring, driven by the spring of its neighbor. */ + private fun createNeighboringTaskViewSpringAnimation( + taskView: TaskView, + dampingOffsetRatio: Float, + previousNeighborSpringAnimation: SpringAnimation, + ): SpringAnimation { + val neighboringTaskViewSpringAnimation = + SpringAnimation( + taskView, + FloatPropertyCompat.createFloatPropertyCompat( + taskView.secondaryDismissTranslationProperty + ), + ) + .setSpring(createExpressiveDismissSpringForce(dampingOffsetRatio)) + // Update live tile on spring animation. + if (taskView.isRunningTask && recentsView.enableDrawingLiveTile) { + neighboringTaskViewSpringAnimation.addUpdateListener { _, _, _ -> + recentsView.runActionOnRemoteHandles { remoteTargetHandle -> + remoteTargetHandle.taskViewSimulator.taskSecondaryTranslation.value = + taskView.secondaryDismissTranslationProperty.get(taskView) + } + recentsView.redrawLiveTile() + } + } + // Drive current neighbor's spring with the previous neighbor's. + previousNeighborSpringAnimation.addUpdateListener { _, value, _ -> + neighboringTaskViewSpringAnimation.animateToFinalPosition(value) + } + return neighboringTaskViewSpringAnimation + } + + private fun createExpressiveDismissSpringForce(dampingRatioOffset: Float = 0f): SpringForce { + val resourceProvider = DynamicResource.provider(recentsView.mContainer) + return SpringForce() + .setDampingRatio( + resourceProvider.getFloat(R.dimen.expressive_dismiss_task_trans_y_damping_ratio) + + dampingRatioOffset + ) + .setStiffness( + resourceProvider.getFloat(R.dimen.expressive_dismiss_task_trans_y_stiffness) + ) + } + + /** + * Plays a haptic as the dragged task view settles back into its rest state. + * + *

Haptic intensity is proportional to velocity. + */ + private fun playDismissSettlingHaptic(velocity: Float) { + val maxDismissSettlingVelocity = + recentsView.pagedOrientationHandler.getSecondaryDimension(recentsView) + MSDLPlayerWrapper.INSTANCE.get(recentsView.context) + .playToken( + MSDLToken.CANCEL, + InteractionProperties.DynamicVibrationScale( + boundToRange(velocity / maxDismissSettlingVelocity, 0f, 1f), + VibrationAttributes.Builder() + .setUsage(VibrationAttributes.USAGE_TOUCH) + .setFlags(VibrationAttributes.FLAG_PIPELINED_EFFECT) + .build(), + ), + ) + } + + /** Animates RecentsView's scale to the provided value, using spring animations. */ + fun animateRecentsScale(scale: Float): SpringAnimation { + val resourceProvider = DynamicResource.provider(recentsView.mContainer) + val dampingRatio = resourceProvider.getFloat(R.dimen.swipe_up_rect_scale_damping_ratio) + val stiffness = resourceProvider.getFloat(R.dimen.swipe_up_rect_scale_stiffness) + + // Spring which sets the Recents scale on update. This is needed, as the SpringAnimation + // struggles to animate small values like changing recents scale from 0.9 to 1. So + // we animate over a larger range (e.g. 900 to 1000) and convert back to the required value. + // (This is instead of converting RECENTS_SCALE_PROPERTY to a FloatPropertyCompat and + // animating it directly via springs.) + val initialRecentsScaleSpringValue = + RECENTS_SCALE_SPRING_MULTIPLIER * RECENTS_SCALE_PROPERTY.get(recentsView) + return SpringAnimation(FloatValueHolder(initialRecentsScaleSpringValue)) + .setSpring( + SpringForce(initialRecentsScaleSpringValue) + .setDampingRatio(dampingRatio) + .setStiffness(stiffness) + ) + .addUpdateListener { _, value, _ -> + RECENTS_SCALE_PROPERTY.setValue( + recentsView, + value / RECENTS_SCALE_SPRING_MULTIPLIER, + ) + } + .apply { animateToFinalPosition(RECENTS_SCALE_SPRING_MULTIPLIER * scale) } + } + + private companion object { + // The additional damping to apply to tasks further from the dismissed task. + private const val ADDITIONAL_DISMISS_DAMPING_RATIO = 0.15f + private const val RECENTS_SCALE_SPRING_MULTIPLIER = 1000f + } +} diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 5bfcf43c18..44bf82c7b8 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -38,6 +38,7 @@ import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAG import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; import static com.android.launcher3.Flags.enableDesktopExplodedView; import static com.android.launcher3.Flags.enableDesktopTaskAlphaAnimation; +import static com.android.launcher3.Flags.enableExpressiveDismissTaskMotion; import static com.android.launcher3.Flags.enableGridOnlyOverview; import static com.android.launcher3.Flags.enableLargeDesktopWindowingTile; import static com.android.launcher3.Flags.enableRefactorTaskThumbnail; @@ -72,6 +73,8 @@ import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_RO import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_SPLIT_SELECT_ACTIVE; +import static com.android.quickstep.views.RecentsViewUtils.DESK_EXPLODE_PROGRESS; +import static com.android.quickstep.views.TaskView.SPLIT_ALPHA; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -157,6 +160,7 @@ import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.statehandlers.DepthController; +import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StateManager; import com.android.launcher3.statemanager.StatefulContainer; @@ -179,6 +183,7 @@ import com.android.launcher3.util.TranslateEdgeEffect; import com.android.launcher3.util.VibratorWrapper; import com.android.launcher3.util.ViewPool; import com.android.launcher3.util.coroutines.DispatcherProvider; +import com.android.launcher3.util.window.WindowManagerProxy.DesktopVisibilityListener; import com.android.quickstep.BaseContainerInterface; import com.android.quickstep.GestureState; import com.android.quickstep.HighResLoadingState; @@ -265,7 +270,7 @@ public abstract class RecentsView< CONTAINER_TYPE extends Context & RecentsViewContainer & StatefulContainer, STATE_TYPE extends BaseState> extends PagedView implements Insettable, HighResLoadingState.HighResLoadingStateChangedCallback, - TaskVisualsChangeListener { + TaskVisualsChangeListener, DesktopVisibilityListener { private static final String TAG = "RecentsView"; private static final boolean DEBUG = false; @@ -556,6 +561,10 @@ public abstract class RecentsView< private final Rect mTaskViewDeadZoneRect = new Rect(); private final Rect mTopRowDeadZoneRect = new Rect(); private final Rect mBottomRowDeadZoneRect = new Rect(); + + @Nullable + private DesktopVisibilityController mDesktopVisibilityController = null; + /** * Reflects if Recents is currently in the middle of a gesture, and if so, which tasks are * running. If a gesture is not in progress, this will be null. @@ -668,11 +677,11 @@ public abstract class RecentsView< MAIN_EXECUTOR, apkRemoved -> { if (apkRemoved) { - dismissTask(taskId); + dismissTask(taskId, /*animate=*/true, /*removeTask=*/false); } else { mModel.isTaskRemoved(taskKey.id, taskRemoved -> { if (taskRemoved) { - dismissTask(taskId); + dismissTask(taskId, /*animate=*/true, /*removeTask=*/false); } }, RecentsFilterState.getFilter(mFilterState.getPackageNameToFilter())); } @@ -851,6 +860,7 @@ public abstract class RecentsView< private final RecentsViewModel mRecentsViewModel; private final RecentsViewModelHelper mHelper; protected final RecentsViewUtils mUtils = new RecentsViewUtils(this); + protected final RecentsDismissUtils mDismissUtils = new RecentsDismissUtils(this); private final Matrix mTmpMatrix = new Matrix(); @@ -912,14 +922,18 @@ public abstract class RecentsView< mAddDesktopButton = (AddDesktopButton) LayoutInflater.from(context).inflate( R.layout.overview_add_desktop_button, this, false); mAddDesktopButton.setOnClickListener(this::createDesk); + + mDesktopVisibilityController = DesktopVisibilityController.INSTANCE.get(mContext); } mTaskViewPool = new ViewPool<>(context, this, R.layout.task, 20 /* max size */, 10 /* initial size */); + int groupedViewPoolInitialSize = enableRefactorTaskThumbnail() ? 2 : 10; mGroupedTaskViewPool = new ViewPool<>(context, this, - R.layout.task_grouped, 20 /* max size */, 10 /* initial size */); + R.layout.task_grouped, 20 /* max size */, groupedViewPoolInitialSize); + int desktopViewPoolInitialSize = DesktopModeStatus.canEnterDesktopMode(mContext) ? 1 : 0; mDesktopTaskViewPool = new ViewPool<>(context, this, R.layout.task_desktop, - 5 /* max size */, 1 /* initial size */); + 5 /* max size */, desktopViewPoolInitialSize); setOrientationHandler(mOrientationState.getOrientationHandler()); mIsRtl = getPagedOrientationHandler().getRecentsRtlSetting(getResources()); @@ -1224,13 +1238,16 @@ public abstract class RecentsView< mSyncTransactionApplier = new SurfaceTransactionApplier(this); runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTransformParams() .setSyncTransactionApplier(mSyncTransactionApplier)); - RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this); + RecentsModel.INSTANCE.get(mContext).addThumbnailChangeListener(this); mIPipAnimationListener.setActivityAndRecentsView(mContainer, this); - SystemUiProxy.INSTANCE.get(getContext()).setPipAnimationListener( + SystemUiProxy.INSTANCE.get(mContext).setPipAnimationListener( mIPipAnimationListener); mOrientationState.initListeners(); mTaskOverlayFactory.initListeners(); mSplitSelectStateController.registerSplitListener(mSplitSelectionListener); + if (mDesktopVisibilityController != null) { + mDesktopVisibilityController.registerDesktopVisibilityListener(this); + } } @Override @@ -1245,12 +1262,15 @@ public abstract class RecentsView< runActionOnRemoteHandles(remoteTargetHandle -> remoteTargetHandle.getTransformParams() .setSyncTransactionApplier(null)); executeSideTaskLaunchCallback(); - RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this); - SystemUiProxy.INSTANCE.get(getContext()).setPipAnimationListener(null); + RecentsModel.INSTANCE.get(mContext).removeThumbnailChangeListener(this); + SystemUiProxy.INSTANCE.get(mContext).setPipAnimationListener(null); mIPipAnimationListener.setActivityAndRecentsView(null, null); mOrientationState.destroyListeners(); mTaskOverlayFactory.removeListeners(); mSplitSelectStateController.unregisterSplitListener(mSplitSelectionListener); + if (mDesktopVisibilityController != null) { + mDesktopVisibilityController.unregisterDesktopVisibilityListener(this); + } reset(); } @@ -1443,7 +1463,8 @@ public abstract class RecentsView< anim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - finishRecentsAnimation(false /* toRecents */, null); + finishRecentsAnimation(false /* toRecents */, true /*shouldPip*/, + allAppsAreTranslucent(apps), null); } }); } else { @@ -1454,6 +1475,18 @@ public abstract class RecentsView< anim.start(); } + private boolean allAppsAreTranslucent(RemoteAnimationTarget[] apps) { + if (apps == null) { + return false; + } + for (int i = apps.length - 1; i >= 0; --i) { + if (!apps[i].isTranslucent) { + return false; + } + } + return true; + } + public boolean isTaskViewVisible(TaskView tv) { if (showAsGrid()) { int screenStart = getPagedOrientationHandler().getPrimaryScroll(this); @@ -2010,7 +2043,7 @@ public abstract class RecentsView< } // If the list changed, maybe the focused task doesn't exist anymore. if (newFocusedTaskView == null) { - newFocusedTaskView = mUtils.getExpectedFocusedTask(); + newFocusedTaskView = mUtils.getFirstNonDesktopTaskView(); } } setFocusedTaskViewId( @@ -2116,15 +2149,6 @@ public abstract class RecentsView< return mTaskViewCount; } - /** - * Transverse RecentsView children to calculate the amount of DesktopTaskViews. - * - * @return Number of children that are instances of DesktopTaskView - */ - private int getDesktopTaskViewCount() { - return mUtils.getDesktopTaskViewCount(); - } - /** Counts {@link TaskView}s that are not {@link DesktopTaskView} instances. */ public int getNonDesktopTaskViewCount() { return mUtils.getNonDesktopTaskViewCount(); @@ -2902,13 +2926,15 @@ public abstract class RecentsView< } if (enableDesktopExplodedView()) { + if (animatorSet == null) { + mUtils.setDeskExplodeProgress(1); + } else { + animatorSet.play( + ObjectAnimator.ofFloat(this, DESK_EXPLODE_PROGRESS, 1)); + } + for (TaskView taskView : getTaskViews()) { if (taskView instanceof DesktopTaskView desktopTaskView) { - if (animatorSet == null) { - desktopTaskView.setExplodeProgress(1.0f); - } else { - animatorSet.play(desktopTaskView.startWindowExplodeAnimation()); - } desktopTaskView.setRemoteTargetHandles(remoteTargetHandles); } } @@ -2917,28 +2943,40 @@ public abstract class RecentsView< BaseState endState = mSizeStrategy.stateFromGestureEndTarget(endTarget); if (endState.displayOverviewTasksAsGrid(mContainer.getDeviceProfile())) { TaskView runningTaskView = getRunningTaskView(); - float runningTaskPrimaryGridTranslation = 0; - float runningTaskSecondaryGridTranslation = 0; + float runningTaskGridTranslationX = 0; + float runningTaskGridTranslationY = 0; if (runningTaskView != null) { // Apply the grid translation to running task unless it's being snapped to // and removes the current translation applied to the running task. - runningTaskPrimaryGridTranslation = runningTaskView.getGridTranslationX() + runningTaskGridTranslationX = runningTaskView.getGridTranslationX() - runningTaskView.getNonGridTranslationX(); - runningTaskSecondaryGridTranslation = runningTaskView.getGridTranslationY(); + runningTaskGridTranslationY = runningTaskView.getGridTranslationY(); } for (RemoteTargetHandle remoteTargetHandle : remoteTargetHandles) { TaskViewSimulator tvs = remoteTargetHandle.getTaskViewSimulator(); if (animatorSet == null) { setGridProgress(1); - tvs.taskPrimaryTranslation.value = runningTaskPrimaryGridTranslation; - tvs.taskSecondaryTranslation.value = runningTaskSecondaryGridTranslation; + if (enableGridOnlyOverview()) { + tvs.taskGridTranslationX.value = runningTaskGridTranslationX; + tvs.taskGridTranslationY.value = runningTaskGridTranslationY; + } else { + tvs.taskPrimaryTranslation.value = runningTaskGridTranslationX; + tvs.taskSecondaryTranslation.value = runningTaskGridTranslationY; + } } else { animatorSet.play(ObjectAnimator.ofFloat(this, RECENTS_GRID_PROGRESS, 1)); - animatorSet.play(tvs.carouselScale.animateToValue(1)); - animatorSet.play(tvs.taskPrimaryTranslation.animateToValue( - runningTaskPrimaryGridTranslation)); - animatorSet.play(tvs.taskSecondaryTranslation.animateToValue( - runningTaskSecondaryGridTranslation)); + if (enableGridOnlyOverview()) { + animatorSet.play(tvs.carouselScale.animateToValue(1)); + animatorSet.play(tvs.taskGridTranslationX.animateToValue( + runningTaskGridTranslationX)); + animatorSet.play(tvs.taskGridTranslationY.animateToValue( + runningTaskGridTranslationY)); + } else { + animatorSet.play(tvs.taskPrimaryTranslation.animateToValue( + runningTaskGridTranslationX)); + animatorSet.play(tvs.taskSecondaryTranslation.animateToValue( + runningTaskGridTranslationY)); + } } } } @@ -3024,8 +3062,12 @@ public abstract class RecentsView< // Add an empty view for now until the task plan is loaded and applied final TaskView taskView; if (needDesktopTask) { + final int activeDeskId = + DesktopVisibilityController.INSTANCE.get(mContext).getActiveDeskId( + mContainer.getDisplay().getDisplayId()); taskView = getTaskViewFromPool(TaskViewType.DESKTOP); - ((DesktopTaskView) taskView).bind(new DesktopTask(Arrays.asList(runningTasks)), + ((DesktopTaskView) taskView).bind( + new DesktopTask(activeDeskId, Arrays.asList(runningTasks)), mOrientationState, mTaskOverlayFactory); } else if (needGroupTaskView) { taskView = getTaskViewFromPool(TaskViewType.GROUPED); @@ -3064,7 +3106,7 @@ public abstract class RecentsView< focusedTaskViewId = INVALID_TASK_ID; } else if (enableLargeDesktopWindowingTile() && getRunningTaskView() instanceof DesktopTaskView) { - TaskView focusedTaskView = getTaskViewAt(getDesktopTaskViewCount()); + TaskView focusedTaskView = mUtils.getFirstNonDesktopTaskView(); focusedTaskViewId = focusedTaskView != null ? focusedTaskView.getTaskViewId() : INVALID_TASK_ID; } else { @@ -3491,8 +3533,13 @@ public abstract class RecentsView< final TaskView runningTask = getRunningTaskView(); if (showAsGrid() && enableGridOnlyOverview() && runningTask != null) { runActionOnRemoteHandles( - remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() - .taskSecondaryTranslation.value = runningTask.getGridTranslationY() + remoteTargetHandle -> { + remoteTargetHandle.getTaskViewSimulator().taskGridTranslationX.value = + runningTask.getGridTranslationX() + - runningTask.getNonGridTranslationX(); + remoteTargetHandle.getTaskViewSimulator().taskGridTranslationY.value = + runningTask.getGridTranslationY(); + } ); } @@ -3606,12 +3653,9 @@ public abstract class RecentsView< if (taskView.isRunningTask()) { anim.addOnFrameCallback(() -> { if (!mEnableDrawingLiveTile) return; - runActionOnRemoteHandles( - remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() - .taskSecondaryTranslation.value = getPagedOrientationHandler() - .getSecondaryValue(taskView.getTranslationX(), - taskView.getTranslationY() - )); + runActionOnRemoteHandles(remoteTargetHandle -> + remoteTargetHandle.getTaskViewSimulator().taskSecondaryTranslation.value = + taskView.getSecondaryDismissTranslationProperty().get(taskView)); redrawLiveTile(); }); } @@ -3832,7 +3876,8 @@ public abstract class RecentsView< newClearAllShortTotalWidthTranslation = expectedFirstTaskStart - firstTaskStart; } } - if (lastGridTaskView != null && lastGridTaskView.isVisibleToUser()) { + if (lastGridTaskView != null && (lastGridTaskView.isVisibleToUser() || ( + enableExpressiveDismissTaskMotion() && lastGridTaskView == dismissedTaskView))) { // After dismissal, animate translation of the remaining tasks to fill any gap left // between the end of the grid and the clear all button. Only animate if the clear // all button is visible or would become visible after dismissal. @@ -3877,6 +3922,22 @@ public abstract class RecentsView< // the only invariant point in landscape split screen. snapToLastTask = true; } + if (mUtils.getGridTaskCount() == 1 && dismissedTaskView.isGridTask()) { + TaskView lastLargeTile = mUtils.getLastLargeTaskView(); + if (lastLargeTile != null) { + // Calculate the distance to put last large tile back to middle of the screen. + int primaryScroll = getPagedOrientationHandler().getPrimaryScroll(this); + int lastLargeTileScroll = getScrollForPage(indexOfChild(lastLargeTile)); + longGridRowWidthDiff = primaryScroll - lastLargeTileScroll; + + if (!isClearAllHidden) { + // If ClearAllButton is visible, reduce the distance by scroll difference + // between ClearAllButton and the last task. + longGridRowWidthDiff += getLastTaskScroll(/*clearAllScroll=*/0, + getPagedOrientationHandler().getPrimarySize(mClearAllButton)); + } + } + } // If we need to animate the grid to compensate the clear all gap, we split the second // half of the dismiss pending animation (in which the non-dismissed tasks slide into @@ -3933,9 +3994,9 @@ public abstract class RecentsView< int distanceFromDismissedTask = 1; int slidingTranslation = 0; if (isSlidingTasks) { - int nextSnappedPage = isStagingFocusedTask - ? indexOfChild(mUtils.getFirstSmallTaskView()) - : mUtils.getDesktopTaskViewCount(); + int nextSnappedPage = indexOfChild(isStagingFocusedTask + ? mUtils.getFirstSmallTaskView() + : mUtils.getFirstNonDesktopTaskView()); slidingTranslation = getPagedOrientationHandler().getPrimaryScroll(this) - getScrollForPage(nextSnappedPage); slidingTranslation += mIsRtl ? newClearAllShortTotalWidthTranslation @@ -3961,7 +4022,7 @@ public abstract class RecentsView< Math.abs(i - dismissedIndex), scrollDiff, anim, - splitTimings, i); + splitTimings); needsCurveUpdates = true; } } else if (child instanceof TaskView taskView) { @@ -4337,8 +4398,12 @@ public abstract class RecentsView< int indexDiff, int scrollDiffPerPage, PendingAnimation pendingAnimation, - SplitAnimationTimings splitTimings, - int index) { + SplitAnimationTimings splitTimings) { + // No need to translate the AddDesktopButton on dismissing a TaskView, which should be + // always at the right most position, even when dismissing the last TaskView. + if (view instanceof AddDesktopButton) { + return; + } FloatProperty translationProperty = view instanceof TaskView ? ((TaskView) view).getPrimaryDismissTranslationProperty() : getPagedOrientationHandler().getPrimaryViewTranslate(); @@ -4596,17 +4661,27 @@ public abstract class RecentsView< } @UiThread - private void dismissTask(int taskId) { + public void dismissTask(int taskId, boolean animate, boolean removeTask) { TaskView taskView = getTaskViewByTaskId(taskId); if (taskView == null) { Log.d(TAG, "dismissTask: " + taskId + ", no associated TaskView"); return; } Log.d(TAG, "dismissTask: " + taskId); - dismissTask(taskView, true /* animate */, false /* removeTask */); + + if (enableDesktopExplodedView() && taskView instanceof DesktopTaskView desktopTaskView) { + desktopTaskView.removeTaskFromExplodedView(taskId, animate); + + if (removeTask) { + ActivityManagerWrapper.getInstance().removeTask(taskId); + } + } else { + dismissTaskView(taskView, animate, removeTask); + } } - public void dismissTask(TaskView taskView, boolean animateTaskView, boolean removeTask) { + /** Dismisses the entire [taskView]. */ + public void dismissTaskView(TaskView taskView, boolean animateTaskView, boolean removeTask) { PendingAnimation pa = new PendingAnimation(DISMISS_TASK_DURATION); createTaskDismissAnimation(pa, taskView, animateTaskView, removeTask, DISMISS_TASK_DURATION, false /* dismissingForSplitSelection*/); @@ -4622,7 +4697,7 @@ public abstract class RecentsView< private void dismissCurrentTask() { TaskView taskView = getNextPageTaskView(); if (taskView != null) { - dismissTask(taskView, true /*animateTaskView*/, true /*removeTask*/); + dismissTaskView(taskView, true /*animateTaskView*/, true /*removeTask*/); } } @@ -4701,9 +4776,8 @@ public abstract class RecentsView< } mClearAllButton.setContentAlpha(mContentAlpha); - // TODO(b/389209338): Handle the visibility of the `mAddDesktopButton`. if (mAddDesktopButton != null) { - mAddDesktopButton.setAlpha(mContentAlpha); + mAddDesktopButton.setContentAlpha(mContentAlpha); } int alphaInt = Math.round(alpha * 255); mEmptyMessagePaint.setAlpha(alphaInt); @@ -5281,8 +5355,7 @@ public abstract class RecentsView< clampToProgress(timings.getDesktopTaskScaleInterpolator(), 0f, timings.getDesktopFadeSplitAnimationEndOffset())); } - builder.addFloat(taskView.getSplitAlphaProperty(), - MULTI_PROPERTY_VALUE, 1f, 0f, + builder.addFloat(taskView, SPLIT_ALPHA, 1f, 0f, clampToProgress(deskTopFadeInterPolator, 0f, timings.getDesktopFadeSplitAnimationEndOffset())); } @@ -5655,7 +5728,7 @@ public abstract class RecentsView< anim.play(ObjectAnimator.ofFloat(this, FULLSCREEN_PROGRESS, 1)); anim.addListener(new AnimatorListenerAdapter() { @Override - public void onAnimationStart(@NonNull Animator animation, boolean isReverse) { + public void onAnimationStart(@NonNull Animator animation) { taskView.getThumbnailBounds(mTempRect, /*relativeToDragLayer=*/true); getTaskDimension(mContext, mContainer.getDeviceProfile(), mTempPointF); Rect fullscreenBounds = new Rect(0, 0, (int) mTempPointF.x, @@ -5677,6 +5750,18 @@ public abstract class RecentsView< }); } } + + @Override + public void onAnimationEnd(Animator animation) { + // If live tile is not launching, reset the pivot applied above. + if (!taskView.isRunningTask()) { + runActionOnRemoteHandles( + remoteTargetHandle -> { + remoteTargetHandle.getTaskViewSimulator().setPivotOverride( + null); + }); + } + } }); } else if (!showAsGrid) { // We are launching an adjacent task, so parallax the center and other adjacent task. @@ -5785,10 +5870,12 @@ public abstract class RecentsView< mPendingAnimation = new PendingAnimation(duration); mPendingAnimation.add(anim); - runActionOnRemoteHandles( - remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() - .addOverviewToAppAnim(mPendingAnimation, interpolator)); - mPendingAnimation.addOnFrameCallback(this::redrawLiveTile); + if (taskView.isRunningTask()) { + runActionOnRemoteHandles( + remoteTargetHandle -> remoteTargetHandle.getTaskViewSimulator() + .addOverviewToAppAnim(mPendingAnimation, interpolator)); + mPendingAnimation.addOnFrameCallback(this::redrawLiveTile); + } mPendingAnimation.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { @@ -6203,8 +6290,8 @@ public abstract class RecentsView< int addDesktopButtonIndex = indexOfChild(mAddDesktopButton); if (addDesktopButtonIndex != -1 && addDesktopButtonIndex < outPageScrolls.length) { outPageScrolls[addDesktopButtonIndex] = - newPageScrolls[addDesktopButtonIndex] + Math.round( - mAddDesktopButton.getGridTranslationX()); + newPageScrolls[addDesktopButtonIndex] + mAddDesktopButton.getScrollAdjustment( + showAsGrid); } int lastTaskScroll = getLastTaskScroll(clearAllScroll, clearAllWidth); @@ -6241,12 +6328,12 @@ public abstract class RecentsView< } @Override - protected int getChildVisibleSize(int index) { - final TaskView taskView = getTaskViewAt(index); + protected int getChildVisibleSize(int childIndex) { + final TaskView taskView = getTaskViewAt(childIndex); if (taskView == null) { - return super.getChildVisibleSize(index); + return super.getChildVisibleSize(childIndex); } - return (int) (super.getChildVisibleSize(index) * taskView.getSizeAdjustment( + return (int) (super.getChildVisibleSize(childIndex) * taskView.getSizeAdjustment( showAsFullscreen())); } @@ -6254,6 +6341,11 @@ public abstract class RecentsView< return mClearAllButton; } + @Nullable + public AddDesktopButton getAddDeskButton() { + return mAddDesktopButton; + } + /** * @return How many pixels the running task is offset on the currently laid out dominant axis. */ @@ -6305,7 +6397,7 @@ public abstract class RecentsView< * Returns how many pixels the page is offset on the currently laid out dominant axis. */ private int getUnclampedScrollOffset(int pageIndex) { - if (pageIndex == -1) { + if (pageIndex == INVALID_PAGE) { return 0; } // Don't dampen the scroll (due to overscroll) if the adjacent tasks are offscreen, so that @@ -6833,6 +6925,11 @@ public abstract class RecentsView< } } + @Override + public void onCanCreateDesksChanged(boolean canCreateDesks) { + // TODO: b/389209338 - update the AddDesktopButton's visibility on this. + } + /** Get the color used for foreground scrimming the RecentsView for sharing. */ public static int getForegroundScrimDimColor(Context context) { return context.getColor(R.color.overview_foreground_scrim_color); @@ -6943,10 +7040,17 @@ public abstract class RecentsView< public SpringAnimation createTaskDismissSettlingSpringAnimation(TaskView draggedTaskView, float velocity, boolean isDismissing, SingleAxisSwipeDetector detector, int dismissLength, Function0 onEndRunnable) { - return mUtils.createTaskDismissSettlingSpringAnimation(draggedTaskView, velocity, + return mDismissUtils.createTaskDismissSettlingSpringAnimation(draggedTaskView, velocity, isDismissing, detector, dismissLength, onEndRunnable); } + /** + * Animates RecentsView's scale to the provided value, using spring animations. + */ + public SpringAnimation animateRecentsScale(float scale) { + return mDismissUtils.animateRecentsScale(scale); + } + public interface TaskLaunchListener { void onTaskLaunched(); } diff --git a/quickstep/src/com/android/quickstep/views/RecentsViewUtils.kt b/quickstep/src/com/android/quickstep/views/RecentsViewUtils.kt index d3549fbc68..31ae890d97 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsViewUtils.kt +++ b/quickstep/src/com/android/quickstep/views/RecentsViewUtils.kt @@ -17,30 +17,18 @@ package com.android.quickstep.views import android.graphics.Rect -import android.os.VibrationAttributes +import android.util.FloatProperty import android.view.View import androidx.core.view.children -import androidx.dynamicanimation.animation.FloatPropertyCompat -import androidx.dynamicanimation.animation.FloatValueHolder -import androidx.dynamicanimation.animation.SpringAnimation -import androidx.dynamicanimation.animation.SpringForce import com.android.launcher3.Flags.enableLargeDesktopWindowingTile import com.android.launcher3.Flags.enableSeparateExternalDisplayTasks -import com.android.launcher3.R -import com.android.launcher3.Utilities.boundToRange -import com.android.launcher3.touch.SingleAxisSwipeDetector -import com.android.launcher3.util.DynamicResource import com.android.launcher3.util.IntArray -import com.android.launcher3.util.MSDLPlayerWrapper import com.android.quickstep.util.GroupTask -import com.android.quickstep.util.TaskGridNavHelper import com.android.quickstep.util.isExternalDisplay import com.android.quickstep.views.RecentsView.RUNNING_TASK_ATTACH_ALPHA import com.android.systemui.shared.recents.model.ThumbnailData -import com.google.android.msdl.data.model.MSDLToken -import com.google.android.msdl.domain.InteractionProperties import java.util.function.BiConsumer -import kotlin.math.abs +import kotlin.reflect.KMutableProperty1 /** * Helper class for [RecentsView]. This util class contains refactored and extracted functions from @@ -87,7 +75,7 @@ class RecentsViewUtils(private val recentsView: RecentsView<*, *>) { } /** Counts [TaskView]s that are [DesktopTaskView] instances. */ - fun getDesktopTaskViewCount(): Int = taskViews.count { it is DesktopTaskView } + private fun getDesktopTaskViewCount(): Int = taskViews.count { it is DesktopTaskView } /** Counts [TaskView]s that are not [DesktopTaskView] instances. */ fun getNonDesktopTaskViewCount(): Int = taskViews.count { it !is DesktopTaskView } @@ -98,6 +86,9 @@ class RecentsViewUtils(private val recentsView: RecentsView<*, *>) { /** Counts [TaskView]s that are large tiles. */ fun getLargeTileCount(): Int = taskViews.count { it.isLargeTile } + /** Counts [TaskView]s that are grid tasks. */ + fun getGridTaskCount(): Int = taskViews.count { it.isGridTask } + /** Returns the first TaskView that should be displayed as a large tile. */ fun getFirstLargeTaskView(): TaskView? = taskViews.firstOrNull { @@ -105,7 +96,7 @@ class RecentsViewUtils(private val recentsView: RecentsView<*, *>) { } /** Returns the expected focus task. */ - fun getExpectedFocusedTask(): TaskView? = + fun getFirstNonDesktopTaskView(): TaskView? = if (enableLargeDesktopWindowingTile()) taskViews.firstOrNull { it !is DesktopTaskView } else taskViews.firstOrNull() @@ -308,234 +299,27 @@ class RecentsViewUtils(private val recentsView: RecentsView<*, *>) { } } - /** - * Creates the spring animations which run when a dragged task view in overview is released. - * - *

When a task dismiss is cancelled, the task will return to its original position via a - * spring animation. As it passes the threshold of its settling state, its neighbors will spring - * in response to the perceived impact of the settling task. - */ - fun createTaskDismissSettlingSpringAnimation( - draggedTaskView: TaskView?, - velocity: Float, - isDismissing: Boolean, - detector: SingleAxisSwipeDetector, - dismissLength: Int, - onEndRunnable: () -> Unit, - ): SpringAnimation? { - draggedTaskView ?: return null - val taskDismissFloatProperty = - FloatPropertyCompat.createFloatPropertyCompat( - draggedTaskView.secondaryDismissTranslationProperty - ) - // Animate dragged task towards dismissal or rest state. - val draggedTaskViewSpringAnimation = - SpringAnimation(draggedTaskView, taskDismissFloatProperty) - .setSpring(createExpressiveDismissSpringForce()) - .setStartVelocity(if (detector.isFling(velocity)) velocity else 0f) - .addUpdateListener { animation, value, _ -> - if (isDismissing && abs(value) >= abs(dismissLength)) { - // TODO(b/393553524): Remove 0 alpha, instead animate task fully off screen. - draggedTaskView.alpha = 0f - animation.cancel() - } else if (draggedTaskView.isRunningTask && recentsView.enableDrawingLiveTile) { - recentsView.runActionOnRemoteHandles { remoteTargetHandle -> - remoteTargetHandle.taskViewSimulator.taskSecondaryTranslation.value = - taskDismissFloatProperty.getValue(draggedTaskView) - } - recentsView.redrawLiveTile() - } - } - .addEndListener { _, _, _, _ -> - if (isDismissing) { - recentsView.dismissTask( - draggedTaskView, - /* animateTaskView = */ false, - /* removeTask = */ true, - ) - } else { - recentsView.onDismissAnimationEnds() - } - onEndRunnable() - } - if (!isDismissing) { - addNeighboringSpringAnimationsForDismissCancel( - draggedTaskView, - draggedTaskViewSpringAnimation, - recentsView.pageCount, - ) + var deskExplodeProgress: Float = 0f + set(value) { + field = value + taskViews.filterIsInstance().forEach { it.explodeProgress = field } } - return draggedTaskViewSpringAnimation - } - - private fun addNeighboringSpringAnimationsForDismissCancel( - draggedTaskView: TaskView, - draggedTaskViewSpringAnimation: SpringAnimation, - taskCount: Int, - ) { - // Empty spring animation exists for conditional start, and to drive neighboring springs. - val neighborsToSettle = - SpringAnimation(FloatValueHolder()).setSpring(createExpressiveDismissSpringForce()) - var lastPosition = 0f - var startSettling = false - draggedTaskViewSpringAnimation.addUpdateListener { _, value, velocity -> - // Start the settling animation the first time the dragged task passes the origin (from - // negative displacement to positive displacement). We do not check for an exact value - // to compare to, as the update listener does not necessarily hit every value (e.g. a - // value of zero). Do not check again once it has started settling, as a spring can - // bounce past the origin multiple times depending on the stiffness and damping ratio. - if (startSettling) return@addUpdateListener - if (lastPosition < 0 && value >= 0) { - startSettling = true - } - lastPosition = value - if (startSettling) { - neighborsToSettle.setStartVelocity(velocity).animateToFinalPosition(0f) - playDismissSettlingHaptic(velocity) - } - } - - // Add tasks before dragged index, fanning out from the dragged task. - // The order they are added matters, as each spring drives the next. - var previousNeighbor = neighborsToSettle - getTasksOffsetPairAdjacentToDraggedTask(draggedTaskView, towardsStart = true).forEach { - (taskView, offset) -> - previousNeighbor = - createNeighboringTaskViewSpringAnimation( - taskView, - offset * ADDITIONAL_DISMISS_DAMPING_RATIO, - previousNeighbor, - ) - } - // Add tasks after dragged index, fanning out from the dragged task. - // The order they are added matters, as each spring drives the next. - previousNeighbor = neighborsToSettle - getTasksOffsetPairAdjacentToDraggedTask(draggedTaskView, towardsStart = false).forEach { - (taskView, offset) -> - previousNeighbor = - createNeighboringTaskViewSpringAnimation( - taskView, - offset * ADDITIONAL_DISMISS_DAMPING_RATIO, - previousNeighbor, - ) - } - } - - /** - * Gets pairs of (TaskView, offset) adjacent the dragged task in visual order. - * - *

Gets tasks either before or after the dragged task along with their offset from it. The - * offset is the distance between indices for carousels, or distance between columns for grids. - */ - private fun getTasksOffsetPairAdjacentToDraggedTask( - draggedTaskView: TaskView, - towardsStart: Boolean, - ): Sequence> { - if (recentsView.showAsGrid()) { - val taskGridNavHelper = - TaskGridNavHelper( - recentsView.topRowIdArray, - recentsView.bottomRowIdArray, - getLargeTaskViewIds(), - hasAddDesktopButton = false, - ) - return taskGridNavHelper - .gridTaskViewIdOffsetPairInTabOrderSequence( - draggedTaskView.taskViewId, - towardsStart, - ) - .mapNotNull { (taskViewId, columnOffset) -> - recentsView.getTaskViewFromTaskViewId(taskViewId)?.let { taskView -> - Pair(taskView, columnOffset) - } - } - } else { - val taskViewList = taskViews.toList() - val draggedTaskViewIndex = taskViewList.indexOf(draggedTaskView) - - return if (towardsStart) { - taskViewList - .take(draggedTaskViewIndex) - .reversed() - .mapIndexed { index, taskView -> Pair(taskView, index + 1) } - .asSequence() - } else { - taskViewList - .takeLast(taskViewList.size - draggedTaskViewIndex - 1) - .mapIndexed { index, taskView -> Pair(taskView, index + 1) } - .asSequence() - } - } - } - - /** Creates a neighboring task view spring, driven by the spring of its neighbor. */ - private fun createNeighboringTaskViewSpringAnimation( - taskView: TaskView, - dampingOffsetRatio: Float, - previousNeighborSpringAnimation: SpringAnimation, - ): SpringAnimation { - val neighboringTaskViewSpringAnimation = - SpringAnimation( - taskView, - FloatPropertyCompat.createFloatPropertyCompat( - taskView.secondaryDismissTranslationProperty - ), - ) - .setSpring(createExpressiveDismissSpringForce(dampingOffsetRatio)) - // Update live tile on spring animation. - if (taskView.isRunningTask && recentsView.enableDrawingLiveTile) { - neighboringTaskViewSpringAnimation.addUpdateListener { _, _, _ -> - recentsView.runActionOnRemoteHandles { remoteTargetHandle -> - remoteTargetHandle.taskViewSimulator.taskSecondaryTranslation.value = - taskView.secondaryDismissTranslationProperty.get(taskView) - } - recentsView.redrawLiveTile() - } - } - // Drive current neighbor's spring with the previous neighbor's. - previousNeighborSpringAnimation.addUpdateListener { _, value, _ -> - neighboringTaskViewSpringAnimation.animateToFinalPosition(value) - } - return neighboringTaskViewSpringAnimation - } - - private fun createExpressiveDismissSpringForce(dampingRatioOffset: Float = 0f): SpringForce { - val resourceProvider = DynamicResource.provider(recentsView.mContainer) - return SpringForce() - .setDampingRatio( - resourceProvider.getFloat(R.dimen.expressive_dismiss_task_trans_y_damping_ratio) + - dampingRatioOffset - ) - .setStiffness( - resourceProvider.getFloat(R.dimen.expressive_dismiss_task_trans_y_stiffness) - ) - } - - /** - * Plays a haptic as the dragged task view settles back into its rest state. - * - *

Haptic intensity is proportional to velocity. - */ - private fun playDismissSettlingHaptic(velocity: Float) { - val maxDismissSettlingVelocity = - recentsView.pagedOrientationHandler.getSecondaryDimension(recentsView) - MSDLPlayerWrapper.INSTANCE.get(recentsView.context) - .playToken( - MSDLToken.CANCEL, - InteractionProperties.DynamicVibrationScale( - boundToRange(velocity / maxDismissSettlingVelocity, 0f, 1f), - VibrationAttributes.Builder() - .setUsage(VibrationAttributes.USAGE_TOUCH) - .setFlags(VibrationAttributes.FLAG_PIPELINED_EFFECT) - .build(), - ), - ) - } companion object { - val TEMP_RECT = Rect() + class RecentsViewFloatProperty( + private val utilsProperty: KMutableProperty1 + ) : FloatProperty>(utilsProperty.name) { + override fun get(recentsView: RecentsView<*, *>): Float = + utilsProperty.get(recentsView.mUtils) - // The additional damping to apply to tasks further from the dismissed task. - const val ADDITIONAL_DISMISS_DAMPING_RATIO = 0.15f + override fun setValue(recentsView: RecentsView<*, *>, value: Float) { + utilsProperty.set(recentsView.mUtils, value) + } + } + + @JvmField + val DESK_EXPLODE_PROGRESS = RecentsViewFloatProperty(RecentsViewUtils::deskExplodeProgress) + + val TEMP_RECT = Rect() } } diff --git a/quickstep/src/com/android/quickstep/views/TaskContainer.kt b/quickstep/src/com/android/quickstep/views/TaskContainer.kt index ce20bf9b9b..2b9d0365a9 100644 --- a/quickstep/src/com/android/quickstep/views/TaskContainer.kt +++ b/quickstep/src/com/android/quickstep/views/TaskContainer.kt @@ -19,14 +19,13 @@ package com.android.quickstep.views import android.graphics.Bitmap import android.graphics.Matrix import android.view.View +import android.view.View.OnClickListener import com.android.launcher3.Flags.enableRefactorTaskThumbnail import com.android.launcher3.model.data.TaskViewItemInfo import com.android.launcher3.util.SplitConfigurationOptions import com.android.launcher3.util.TransformingTouchDelegate import com.android.quickstep.TaskOverlayFactory import com.android.quickstep.ViewUtils.addAccessibleChildToList -import com.android.quickstep.recents.di.RecentsDependencies -import com.android.quickstep.recents.di.getScope import com.android.quickstep.recents.ui.mapper.TaskUiStateMapper import com.android.quickstep.recents.ui.viewmodel.TaskData import com.android.quickstep.task.thumbnail.TaskThumbnailView @@ -57,13 +56,6 @@ class TaskContainer( init { if (enableRefactorTaskThumbnail()) { require(snapshotView is TaskThumbnailView) - RecentsDependencies.getScope(snapshotView).apply { - val taskViewScope = RecentsDependencies.getScope(taskView) - linkTo(taskViewScope) - - val taskContainerScope = RecentsDependencies.getScope(this@TaskContainer) - linkTo(taskContainerScope) - } } else { require(snapshotView is TaskThumbnailViewDeprecated) } @@ -116,9 +108,9 @@ class TaskContainer( snapshotView.scaleY = 1f overlay.destroy() if (enableRefactorTaskThumbnail()) { - RecentsDependencies.getInstance().removeScope(snapshotView) - RecentsDependencies.getInstance().removeScope(this) isThumbnailValid = false + thumbnailData = null + thumbnailView.onRecycle() } else { thumbnailViewDeprecated.setShowSplashForSplitSelection(false) } @@ -138,9 +130,19 @@ class TaskContainer( overlay.addChildForAccessibility(outChildren) } - fun setState(state: TaskData?, liveTile: Boolean, hasHeader: Boolean) { + fun setState( + state: TaskData?, + liveTile: Boolean, + hasHeader: Boolean, + clickCloseListener: OnClickListener?, + ) { thumbnailView.setState( - TaskUiStateMapper.toTaskThumbnailUiState(state, liveTile, hasHeader), + TaskUiStateMapper.toTaskThumbnailUiState( + state, + liveTile, + hasHeader, + clickCloseListener, + ), state?.taskId, ) thumbnailData = if (state is TaskData.Data) state.thumbnailData else null diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java deleted file mode 100644 index 0b3eb7530f..0000000000 --- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java +++ /dev/null @@ -1,429 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.quickstep.views; - -import static com.android.app.animation.Interpolators.EMPHASIZED; -import static com.android.launcher3.Flags.enableOverviewIconMenu; -import static com.android.launcher3.Flags.enableRefactorTaskThumbnail; -import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; -import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; -import static com.android.quickstep.views.TaskThumbnailViewDeprecated.DIM_ALPHA; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; -import android.content.Context; -import android.graphics.Outline; -import android.graphics.Rect; -import android.graphics.drawable.GradientDrawable; -import android.graphics.drawable.ShapeDrawable; -import android.graphics.drawable.shapes.RectShape; -import android.util.AttributeSet; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewOutlineProvider; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.android.app.animation.Interpolators; -import com.android.launcher3.AbstractFloatingView; -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.R; -import com.android.launcher3.anim.AnimationSuccessListener; -import com.android.launcher3.anim.RoundedRectRevealOutlineProvider; -import com.android.launcher3.popup.SystemShortcut; -import com.android.launcher3.views.BaseDragLayer; -import com.android.quickstep.TaskOverlayFactory; -import com.android.quickstep.TaskUtils; -import com.android.quickstep.orientation.RecentsPagedOrientationHandler; -import com.android.quickstep.util.TaskCornerRadius; - -/** - * Contains options for a recent task when long-pressing its icon. - */ -public class TaskMenuView extends AbstractFloatingView { - - private static final Rect sTempRect = new Rect(); - - private static final int REVEAL_OPEN_DURATION = enableOverviewIconMenu() ? 417 : 150; - private static final int REVEAL_CLOSE_DURATION = enableOverviewIconMenu() ? 333 : 100; - - private RecentsViewContainer mContainer; - private TextView mTaskName; - @Nullable - private AnimatorSet mOpenCloseAnimator; - @Nullable - private ValueAnimator mRevealAnimator; - @Nullable private Runnable mOnClosingStartCallback; - private TaskView mTaskView; - private TaskContainer mTaskContainer; - private LinearLayout mOptionLayout; - private float mMenuTranslationYBeforeOpen; - private float mMenuTranslationXBeforeOpen; - - public TaskMenuView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public TaskMenuView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - - mContainer = RecentsViewContainer.containerFromContext(context); - setClipToOutline(true); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mTaskName = findViewById(R.id.task_name); - mOptionLayout = findViewById(R.id.menu_option_layout); - } - - @Override - public boolean onControllerInterceptTouchEvent(MotionEvent ev) { - if (ev.getAction() == MotionEvent.ACTION_DOWN) { - BaseDragLayer dl = mContainer.getDragLayer(); - if (!dl.isEventOverView(this, ev)) { - // TODO: log this once we have a new container type for it? - close(true); - return true; - } - } - return false; - } - - @Override - protected void handleClose(boolean animate) { - animateClose(); - } - - @Override - protected boolean isOfType(int type) { - return (type & TYPE_TASK_MENU) != 0; - } - - @Override - public ViewOutlineProvider getOutlineProvider() { - return new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), - TaskCornerRadius.get(view.getContext())); - } - }; - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - if (!(enableOverviewIconMenu() - && ((RecentsView) mContainer.getOverviewPanel()).isOnGridBottomRow(mTaskView))) { - // TODO(b/326952853): Cap menu height for grid bottom row in a way that doesn't break - // additionalTranslationY. - int maxMenuHeight = calculateMaxHeight(); - if (MeasureSpec.getSize(heightMeasureSpec) > maxMenuHeight) { - heightMeasureSpec = MeasureSpec.makeMeasureSpec(maxMenuHeight, MeasureSpec.AT_MOST); - } - } - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - } - - public void onRotationChanged() { - if (mOpenCloseAnimator != null && mOpenCloseAnimator.isRunning()) { - mOpenCloseAnimator.end(); - } - if (mIsOpen) { - mOptionLayout.removeAllViews(); - if (enableOverviewIconMenu() || !populateAndLayoutMenu()) { - close(false); - } - } - } - - /** - * Show a task menu for the given taskContainer. - */ - public static boolean showForTask(TaskContainer taskContainer, - @Nullable Runnable onClosingStartCallback) { - RecentsViewContainer container = RecentsViewContainer.containerFromContext( - taskContainer.getTaskView().getContext()); - final TaskMenuView taskMenuView = (TaskMenuView) container.getLayoutInflater().inflate( - R.layout.task_menu, container.getDragLayer(), false); - taskMenuView.setOnClosingStartCallback(onClosingStartCallback); - return taskMenuView.populateAndShowForTask(taskContainer); - } - - /** - * Show a task menu for the given taskContainer. - */ - public static boolean showForTask(TaskContainer taskContainer) { - return showForTask(taskContainer, null); - } - - private boolean populateAndShowForTask(TaskContainer taskContainer) { - if (isAttachedToWindow()) { - return false; - } - mContainer.getDragLayer().addView(this); - mTaskView = taskContainer.getTaskView(); - mTaskContainer = taskContainer; - if (!populateAndLayoutMenu()) { - return false; - } - post(this::animateOpen); - return true; - } - - /** @return true if successfully able to populate task view menu, false otherwise */ - private boolean populateAndLayoutMenu() { - addMenuOptions(mTaskContainer); - orientAroundTaskView(mTaskContainer); - return true; - } - - private void addMenuOptions(TaskContainer taskContainer) { - if (enableOverviewIconMenu()) { - removeView(mTaskName); - } else { - mTaskName.setText(TaskUtils.getTitle(getContext(), taskContainer.getTask())); - mTaskName.setOnClickListener(v -> close(true)); - } - TaskOverlayFactory.getEnabledShortcuts(mTaskView, taskContainer) - .forEach(this::addMenuOption); - } - - private void addMenuOption(SystemShortcut menuOption) { - LinearLayout menuOptionView = (LinearLayout) mContainer.getLayoutInflater().inflate( - R.layout.task_view_menu_option, this, false); - if (enableOverviewIconMenu()) { - ((GradientDrawable) menuOptionView.getBackground()).setCornerRadius(0); - } - menuOption.setIconAndLabelFor( - menuOptionView.findViewById(R.id.icon), menuOptionView.findViewById(R.id.text)); - LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams(); - mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp, - menuOptionView, mContainer.getDeviceProfile()); - // Set an onClick listener on each menu option. The onClick method is responsible for - // ending LiveTile mode on the thumbnail if needed. - menuOptionView.setOnClickListener(menuOption::onClick); - mOptionLayout.addView(menuOptionView); - } - - private void orientAroundTaskView(TaskContainer taskContainer) { - RecentsView recentsView = mContainer.getOverviewPanel(); - RecentsPagedOrientationHandler orientationHandler = - recentsView.getPagedOrientationHandler(); - measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED); - - // Get Position - DeviceProfile deviceProfile = mContainer.getDeviceProfile(); - mContainer.getDragLayer().getDescendantRectRelativeToSelf( - enableOverviewIconMenu() - ? getIconView().findViewById(R.id.icon_view_menu_anchor) - : taskContainer.getSnapshotView(), - sTempRect); - Rect insets = mContainer.getDragLayer().getInsets(); - BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams(); - params.width = orientationHandler.getTaskMenuWidth( - taskContainer.getSnapshotView(), deviceProfile, - taskContainer.getStagePosition()); - // Gravity set to Left instead of Start as sTempRect.left measures Left distance not Start - params.gravity = Gravity.LEFT; - setLayoutParams(params); - setScaleX(mTaskView.getScaleX()); - setScaleY(mTaskView.getScaleY()); - - // Set divider spacing - ShapeDrawable divider = new ShapeDrawable(new RectShape()); - divider.getPaint().setColor(getResources().getColor(android.R.color.transparent)); - int dividerSpacing = (int) getResources().getDimension(R.dimen.task_menu_spacing); - mOptionLayout.setShowDividers( - enableOverviewIconMenu() ? SHOW_DIVIDER_NONE : SHOW_DIVIDER_MIDDLE); - - orientationHandler.setTaskOptionsMenuLayoutOrientation( - deviceProfile, mOptionLayout, dividerSpacing, divider); - float thumbnailAlignedX = sTempRect.left - insets.left; - float thumbnailAlignedY = sTempRect.top - insets.top; - - // Changing pivot to make computations easier - // NOTE: Changing the pivots means the rotated view gets rotated about the new pivots set, - // which would render the X and Y position set here incorrect - setPivotX(0); - setPivotY(0); - setRotation(orientationHandler.getDegreesRotated()); - - if (enableOverviewIconMenu()) { - setTranslationX(thumbnailAlignedX); - setTranslationY(thumbnailAlignedY); - } else { - // Margin that insets the menuView inside the taskView - float taskInsetMargin = getResources().getDimension(R.dimen.task_card_margin); - setTranslationX(orientationHandler.getTaskMenuX(thumbnailAlignedX, - mTaskContainer.getSnapshotView(), deviceProfile, taskInsetMargin, - getIconView())); - setTranslationY(orientationHandler.getTaskMenuY( - thumbnailAlignedY, mTaskContainer.getSnapshotView(), - mTaskContainer.getStagePosition(), this, taskInsetMargin, - getIconView())); - } - } - - private void animateOpen() { - mMenuTranslationYBeforeOpen = getTranslationY(); - mMenuTranslationXBeforeOpen = getTranslationX(); - animateOpenOrClosed(false); - mIsOpen = true; - } - - private View getIconView() { - return mTaskContainer.getIconView().asView(); - } - - private void animateClose() { - animateOpenOrClosed(true); - } - - private void animateOpenOrClosed(boolean closing) { - if (mOpenCloseAnimator != null && mOpenCloseAnimator.isRunning()) { - mOpenCloseAnimator.cancel(); - } - mOpenCloseAnimator = new AnimatorSet(); - // If we're opening, we just start from the beginning as a new `TaskMenuView` is created - // each time we do the open animation so there will never be a partial value here. - float revealAnimationStartProgress = 0f; - if (closing && mRevealAnimator != null) { - revealAnimationStartProgress = 1f - mRevealAnimator.getAnimatedFraction(); - } - mRevealAnimator = createOpenCloseOutlineProvider() - .createRevealAnimator(this, closing, revealAnimationStartProgress); - mRevealAnimator.setInterpolator(enableOverviewIconMenu() ? Interpolators.EMPHASIZED - : Interpolators.DECELERATE); - AnimatorSet.Builder openCloseAnimatorBuilder = mOpenCloseAnimator.play(mRevealAnimator); - if (enableOverviewIconMenu()) { - IconAppChipView iconAppChip = (IconAppChipView) mTaskContainer.getIconView().asView(); - - float additionalTranslationY = 0; - if (((RecentsView) mContainer.getOverviewPanel()).isOnGridBottomRow(mTaskView)) { - // Animate menu up for enough room to display full menu when task on bottom row. - float menuBottom = getHeight() + mMenuTranslationYBeforeOpen; - float taskBottom = mTaskView.getHeight() + mTaskView.getPersistentTranslationY(); - float taskbarTop = mContainer.getDeviceProfile().heightPx - - mContainer.getDeviceProfile().getOverviewActionsClaimedSpaceBelow(); - float midpoint = (taskBottom + taskbarTop) / 2f; - additionalTranslationY = -Math.max(menuBottom - midpoint, 0); - } - ObjectAnimator translationYAnim = ObjectAnimator.ofFloat(this, TRANSLATION_Y, - closing ? mMenuTranslationYBeforeOpen - : mMenuTranslationYBeforeOpen + additionalTranslationY); - translationYAnim.setInterpolator(EMPHASIZED); - openCloseAnimatorBuilder.with(translationYAnim); - - ObjectAnimator menuTranslationYAnim = ObjectAnimator.ofFloat( - iconAppChip.getMenuTranslationY(), - MULTI_PROPERTY_VALUE, closing ? 0 : additionalTranslationY); - menuTranslationYAnim.setInterpolator(EMPHASIZED); - openCloseAnimatorBuilder.with(menuTranslationYAnim); - - float additionalTranslationX = 0; - if (mContainer.getDeviceProfile().isLandscape - && mTaskContainer.getStagePosition() == STAGE_POSITION_BOTTOM_OR_RIGHT) { - // Animate menu and icon when split task would display off the side of the screen. - additionalTranslationX = Math.max( - getTranslationX() + getWidth() - (mContainer.getDeviceProfile().widthPx - - getResources().getDimensionPixelSize( - R.dimen.task_menu_edge_padding) * 2), 0); - } - - ObjectAnimator translationXAnim = ObjectAnimator.ofFloat(this, TRANSLATION_X, - closing ? mMenuTranslationXBeforeOpen - : mMenuTranslationXBeforeOpen - additionalTranslationX); - translationXAnim.setInterpolator(EMPHASIZED); - openCloseAnimatorBuilder.with(translationXAnim); - - ObjectAnimator menuTranslationXAnim = ObjectAnimator.ofFloat( - iconAppChip.getMenuTranslationX(), - MULTI_PROPERTY_VALUE, closing ? 0 : -additionalTranslationX); - menuTranslationXAnim.setInterpolator(EMPHASIZED); - openCloseAnimatorBuilder.with(menuTranslationXAnim); - } - openCloseAnimatorBuilder.with(ObjectAnimator.ofFloat(this, ALPHA, closing ? 0 : 1)); - if (enableRefactorTaskThumbnail()) { - mRevealAnimator.addUpdateListener(animation -> { - float animatedFraction = animation.getAnimatedFraction(); - float openProgress = closing ? (1 - animatedFraction) : animatedFraction; - mTaskContainer.updateMenuOpenProgress(openProgress); - }); - } else { - openCloseAnimatorBuilder.with(ObjectAnimator.ofFloat( - mTaskContainer.getThumbnailViewDeprecated(), DIM_ALPHA, - closing ? 0 : TaskView.MAX_PAGE_SCRIM_ALPHA)); - } - mOpenCloseAnimator.addListener(new AnimationSuccessListener() { - @Override - public void onAnimationStart(Animator animation) { - setVisibility(VISIBLE); - if (closing && mOnClosingStartCallback != null) { - mOnClosingStartCallback.run(); - } - } - - @Override - public void onAnimationSuccess(Animator animator) { - if (closing) { - closeComplete(); - } - } - }); - mOpenCloseAnimator.setDuration(closing ? REVEAL_CLOSE_DURATION: REVEAL_OPEN_DURATION); - mOpenCloseAnimator.start(); - } - - private void closeComplete() { - mIsOpen = false; - mContainer.getDragLayer().removeView(this); - mRevealAnimator = null; - } - - private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() { - float radius = TaskCornerRadius.get(mContext); - Rect fromRect = new Rect( - enableOverviewIconMenu() && isLayoutRtl() ? getWidth() : 0, - 0, - enableOverviewIconMenu() && !isLayoutRtl() ? 0 : getWidth(), - 0); - Rect toRect = new Rect(0, 0, getWidth(), getHeight()); - return new RoundedRectRevealOutlineProvider(radius, radius, fromRect, toRect); - } - - /** - * Calculates max height based on how much space we have available. - * If not enough space then the view will scroll. The maximum menu size will sit inside the task - * with a margin on the top and bottom. - */ - private int calculateMaxHeight() { - float taskInsetMargin = getResources().getDimension(R.dimen.task_card_margin); - return mTaskView.getPagedOrientationHandler().getTaskMenuHeight(taskInsetMargin, - mContainer.getDeviceProfile(), getTranslationX(), getTranslationY()); - } - - private void setOnClosingStartCallback(Runnable onClosingStartCallback) { - mOnClosingStartCallback = onClosingStartCallback; - } -} diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.kt b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt new file mode 100644 index 0000000000..4777f4f140 --- /dev/null +++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.kt @@ -0,0 +1,456 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep.views + +import android.animation.Animator +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Outline +import android.graphics.Rect +import android.graphics.drawable.GradientDrawable +import android.graphics.drawable.ShapeDrawable +import android.graphics.drawable.shapes.RectShape +import android.util.AttributeSet +import android.view.Gravity +import android.view.MotionEvent +import android.view.View +import android.view.ViewOutlineProvider +import android.widget.LinearLayout +import android.widget.TextView +import com.android.app.animation.Interpolators +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.Flags.enableOverviewIconMenu +import com.android.launcher3.Flags.enableRefactorTaskThumbnail +import com.android.launcher3.R +import com.android.launcher3.anim.AnimationSuccessListener +import com.android.launcher3.anim.RoundedRectRevealOutlineProvider +import com.android.launcher3.popup.SystemShortcut +import com.android.launcher3.util.MultiPropertyFactory +import com.android.launcher3.util.SplitConfigurationOptions +import com.android.launcher3.views.BaseDragLayer +import com.android.quickstep.TaskOverlayFactory +import com.android.quickstep.TaskUtils +import com.android.quickstep.util.TaskCornerRadius +import java.util.function.Consumer +import kotlin.math.max + +/** Contains options for a recent task when long-pressing its icon. */ +class TaskMenuView +@JvmOverloads +constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int = 0) : + AbstractFloatingView(context, attrs, defStyleAttr) { + private val recentsViewContainer: RecentsViewContainer = + RecentsViewContainer.containerFromContext(context) + private val tempRect = Rect() + private val taskName: TextView by lazy { findViewById(R.id.task_name) } + private val optionLayout: LinearLayout by lazy { findViewById(R.id.menu_option_layout) } + private var openCloseAnimator: AnimatorSet? = null + private var revealAnimator: ValueAnimator? = null + private var onClosingStartCallback: Runnable? = null + private lateinit var taskView: TaskView + private lateinit var taskContainer: TaskContainer + private var menuTranslationXBeforeOpen = 0f + private var menuTranslationYBeforeOpen = 0f + + init { + clipToOutline = true + } + + override fun onControllerInterceptTouchEvent(ev: MotionEvent): Boolean { + if (ev.action == MotionEvent.ACTION_DOWN) { + if (!recentsViewContainer.dragLayer.isEventOverView(this, ev)) { + // TODO: log this once we have a new container type for it? + animateOpenOrClosed(true) + return true + } + } + return false + } + + override fun handleClose(animate: Boolean) { + animateOpenOrClosed(true, animated = false) + } + + override fun isOfType(type: Int): Boolean = (type and TYPE_TASK_MENU) != 0 + + override fun getOutlineProvider(): ViewOutlineProvider = + object : ViewOutlineProvider() { + override fun getOutline(view: View, outline: Outline) { + outline.setRoundRect( + 0, + 0, + view.width, + view.height, + TaskCornerRadius.get(view.context), + ) + } + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + var heightMeasure = heightMeasureSpec + if (!(enableOverviewIconMenu() && taskView.isOnGridBottomRow())) { + // TODO(b/326952853): Cap menu height for grid bottom row in a way that doesn't break + // additionalTranslationY. + val maxMenuHeight = calculateMaxHeight() + if (MeasureSpec.getSize(heightMeasure) > maxMenuHeight) { + heightMeasure = MeasureSpec.makeMeasureSpec(maxMenuHeight, MeasureSpec.AT_MOST) + } + } + super.onMeasure(widthMeasureSpec, heightMeasure) + } + + fun onRotationChanged() { + openCloseAnimator?.let { if (it.isRunning) it.end() } + if (mIsOpen) { + optionLayout.removeAllViews() + if (enableOverviewIconMenu() || !populateAndLayoutMenu()) { + close(false) + } + } + } + + private fun populateAndShowForTask(taskContainer: TaskContainer): Boolean { + if (isAttachedToWindow) return false + recentsViewContainer.dragLayer.addView(this) + taskView = taskContainer.taskView + this.taskContainer = taskContainer + if (!populateAndLayoutMenu()) return false + post { this.animateOpen() } + return true + } + + /** @return true if successfully able to populate task view menu, false otherwise */ + private fun populateAndLayoutMenu(): Boolean { + addMenuOptions(taskContainer) + orientAroundTaskView(taskContainer) + return true + } + + private fun addMenuOptions(taskContainer: TaskContainer) { + if (enableOverviewIconMenu()) { + removeView(taskName) + } else { + taskName.text = TaskUtils.getTitle(context, taskContainer.task) + taskName.setOnClickListener { close(true) } + } + TaskOverlayFactory.getEnabledShortcuts(taskView, taskContainer) + .forEach(Consumer { menuOption: SystemShortcut<*> -> this.addMenuOption(menuOption) }) + } + + private fun addMenuOption(menuOption: SystemShortcut<*>) { + val menuOptionView = + recentsViewContainer.layoutInflater.inflate(R.layout.task_view_menu_option, this, false) + as LinearLayout + if (enableOverviewIconMenu()) { + (menuOptionView.background as GradientDrawable).cornerRadius = 0f + } + menuOption.setIconAndLabelFor( + menuOptionView.findViewById(R.id.icon), + menuOptionView.findViewById(R.id.text), + ) + val lp = menuOptionView.layoutParams as LayoutParams + taskView.pagedOrientationHandler.setLayoutParamsForTaskMenuOptionItem( + lp, + menuOptionView, + recentsViewContainer.deviceProfile, + ) + // Set an onClick listener on each menu option. The onClick method is responsible for + // ending LiveTile mode on the thumbnail if needed. + menuOptionView.setOnClickListener { v: View? -> menuOption.onClick(v) } + optionLayout.addView(menuOptionView) + } + + private fun orientAroundTaskView(taskContainer: TaskContainer) { + val recentsView = recentsViewContainer.getOverviewPanel>() + val orientationHandler = recentsView.pagedOrientationHandler + measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED) + + // Get Position + val deviceProfile = recentsViewContainer.deviceProfile + recentsViewContainer.dragLayer.getDescendantRectRelativeToSelf( + if (enableOverviewIconMenu()) iconView.findViewById(R.id.icon_view_menu_anchor) + else taskContainer.snapshotView, + tempRect, + ) + val insets = recentsViewContainer.dragLayer.getInsets() + val params = layoutParams as BaseDragLayer.LayoutParams + params.width = + orientationHandler.getTaskMenuWidth( + taskContainer.snapshotView, + deviceProfile, + taskContainer.stagePosition, + ) + // Gravity set to Left instead of Start as sTempRect.left measures Left distance not Start + params.gravity = Gravity.START + layoutParams = params + scaleX = taskView.scaleX + scaleY = taskView.scaleY + + // Set divider spacing + val divider = ShapeDrawable(RectShape()) + divider.paint.color = resources.getColor(android.R.color.transparent) + val dividerSpacing = resources.getDimension(R.dimen.task_menu_spacing).toInt() + optionLayout.showDividers = + if (enableOverviewIconMenu()) SHOW_DIVIDER_NONE else SHOW_DIVIDER_MIDDLE + + orientationHandler.setTaskOptionsMenuLayoutOrientation( + deviceProfile, + optionLayout, + dividerSpacing, + divider, + ) + val thumbnailAlignedX = (tempRect.left - insets.left).toFloat() + val thumbnailAlignedY = (tempRect.top - insets.top).toFloat() + + // Changing pivot to make computations easier + // NOTE: Changing the pivots means the rotated view gets rotated about the new pivots set, + // which would render the X and Y position set here incorrect + pivotX = 0f + pivotY = 0f + rotation = orientationHandler.degreesRotated + + if (enableOverviewIconMenu()) { + translationX = thumbnailAlignedX + translationY = thumbnailAlignedY + } else { + // Margin that insets the menuView inside the taskView + val taskInsetMargin = resources.getDimension(R.dimen.task_card_margin) + translationX = + orientationHandler.getTaskMenuX( + thumbnailAlignedX, + this.taskContainer.snapshotView, + deviceProfile, + taskInsetMargin, + iconView, + ) + translationY = + orientationHandler.getTaskMenuY( + thumbnailAlignedY, + this.taskContainer.snapshotView, + this.taskContainer.stagePosition, + this, + taskInsetMargin, + iconView, + ) + } + } + + private fun animateOpen() { + menuTranslationYBeforeOpen = translationY + menuTranslationXBeforeOpen = translationX + animateOpenOrClosed(false) + mIsOpen = true + } + + private val iconView: View + get() = taskContainer.iconView.asView() + + private fun animateOpenOrClosed(closing: Boolean, animated: Boolean = true) { + openCloseAnimator?.let { if (it.isRunning) it.cancel() } + openCloseAnimator = AnimatorSet() + // If we're opening, we just start from the beginning as a new `TaskMenuView` is created + // each time we do the open animation so there will never be a partial value here. + var revealAnimationStartProgress = 0f + if (closing && revealAnimator != null) { + revealAnimationStartProgress = 1f - revealAnimator!!.animatedFraction + } + revealAnimator = + createOpenCloseOutlineProvider() + .createRevealAnimator(this, closing, revealAnimationStartProgress) + revealAnimator!!.interpolator = + if (enableOverviewIconMenu()) Interpolators.EMPHASIZED else Interpolators.DECELERATE + val openCloseAnimatorBuilder = openCloseAnimator!!.play(revealAnimator) + if (enableOverviewIconMenu()) { + animateOpenOrCloseAppChip(closing, openCloseAnimatorBuilder) + } + openCloseAnimatorBuilder.with( + ObjectAnimator.ofFloat(this, ALPHA, (if (closing) 0 else 1).toFloat()) + ) + if (enableRefactorTaskThumbnail()) { + revealAnimator?.addUpdateListener { animation: ValueAnimator -> + val animatedFraction = animation.animatedFraction + val openProgress = if (closing) (1 - animatedFraction) else animatedFraction + taskContainer.updateMenuOpenProgress(openProgress) + } + } else { + openCloseAnimatorBuilder.with( + ObjectAnimator.ofFloat( + taskContainer.thumbnailViewDeprecated, + TaskThumbnailViewDeprecated.DIM_ALPHA, + if (closing) 0f else TaskView.MAX_PAGE_SCRIM_ALPHA, + ) + ) + } + openCloseAnimator!!.addListener( + object : AnimationSuccessListener() { + override fun onAnimationStart(animation: Animator) { + visibility = VISIBLE + if (closing) onClosingStartCallback?.run() + } + + override fun onAnimationSuccess(animator: Animator) { + if (closing) closeComplete() + } + } + ) + val animationDuration = + when { + animated && closing -> REVEAL_CLOSE_DURATION + animated && !closing -> REVEAL_OPEN_DURATION + else -> 0L + } + openCloseAnimator!!.setDuration(animationDuration) + openCloseAnimator!!.start() + } + + private fun TaskView.isOnGridBottomRow(): Boolean = + (recentsViewContainer.getOverviewPanel() as RecentsView<*, *>).isOnGridBottomRow(this) + + private fun closeComplete() { + mIsOpen = false + recentsViewContainer.dragLayer.removeView(this) + revealAnimator = null + } + + private fun createOpenCloseOutlineProvider(): RoundedRectRevealOutlineProvider { + val radius = TaskCornerRadius.get(mContext) + val fromRect = + Rect( + if (enableOverviewIconMenu() && isLayoutRtl) width else 0, + 0, + if (enableOverviewIconMenu() && !isLayoutRtl) 0 else width, + 0, + ) + val toRect = Rect(0, 0, width, height) + return RoundedRectRevealOutlineProvider(radius, radius, fromRect, toRect) + } + + /** + * Calculates max height based on how much space we have available. If not enough space then the + * view will scroll. The maximum menu size will sit inside the task with a margin on the top and + * bottom. + */ + private fun calculateMaxHeight(): Int { + val taskInsetMargin = resources.getDimension(R.dimen.task_card_margin) + return taskView.pagedOrientationHandler.getTaskMenuHeight( + taskInsetMargin, + recentsViewContainer.deviceProfile, + translationX, + translationY, + ) + } + + private fun setOnClosingStartCallback(onClosingStartCallback: Runnable?) { + this.onClosingStartCallback = onClosingStartCallback + } + + private fun animateOpenOrCloseAppChip(closing: Boolean, animatorBuilder: AnimatorSet.Builder) { + val iconAppChip = taskContainer.iconView.asView() as IconAppChipView + + var additionalTranslationY = 0f + if (taskView.isOnGridBottomRow()) { + // Animate menu up for enough room to display full menu when task on bottom row. + val menuBottom = height + menuTranslationYBeforeOpen + val taskBottom = taskView.height + taskView.persistentTranslationY + val taskbarTop = + (recentsViewContainer.deviceProfile.heightPx - + recentsViewContainer.deviceProfile.overviewActionsClaimedSpaceBelow) + .toFloat() + val midpoint = (taskBottom + taskbarTop) / 2f + additionalTranslationY = (-max((menuBottom - midpoint).toDouble(), 0.0)).toFloat() + } + val translationYAnim = + ObjectAnimator.ofFloat( + this, + TRANSLATION_Y, + if (closing) menuTranslationYBeforeOpen + else menuTranslationYBeforeOpen + additionalTranslationY, + ) + translationYAnim.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(translationYAnim) + + val menuTranslationYAnim: ObjectAnimator = + ObjectAnimator.ofFloat( + iconAppChip.getMenuTranslationY(), + MultiPropertyFactory.MULTI_PROPERTY_VALUE, + if (closing) 0f else additionalTranslationY, + ) + menuTranslationYAnim.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(menuTranslationYAnim) + + var additionalTranslationX = 0f + if ( + recentsViewContainer.deviceProfile.isLandscape && + taskContainer.stagePosition == + SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT + ) { + // Animate menu and icon when split task would display off the side of the screen. + additionalTranslationX = + max( + (translationX + width - + (recentsViewContainer.deviceProfile.widthPx - + resources.getDimensionPixelSize( + R.dimen.task_menu_edge_padding + ) * 2)) + .toDouble(), + 0.0, + ) + .toFloat() + } + + val translationXAnim = + ObjectAnimator.ofFloat( + this, + TRANSLATION_X, + if (closing) menuTranslationXBeforeOpen + else menuTranslationXBeforeOpen - additionalTranslationX, + ) + translationXAnim.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(translationXAnim) + + val menuTranslationXAnim: ObjectAnimator = + ObjectAnimator.ofFloat( + iconAppChip.getMenuTranslationX(), + MultiPropertyFactory.MULTI_PROPERTY_VALUE, + if (closing) 0f else -additionalTranslationX, + ) + menuTranslationXAnim.interpolator = Interpolators.EMPHASIZED + animatorBuilder.with(menuTranslationXAnim) + } + + companion object { + private val REVEAL_OPEN_DURATION = if (enableOverviewIconMenu()) 417L else 150L + private val REVEAL_CLOSE_DURATION = if (enableOverviewIconMenu()) 333L else 100L + + /** Show a task menu for the given taskContainer. */ + /** Show a task menu for the given taskContainer. */ + @JvmOverloads + fun showForTask( + taskContainer: TaskContainer, + onClosingStartCallback: Runnable? = null, + ): Boolean { + val container: RecentsViewContainer = + RecentsViewContainer.containerFromContext(taskContainer.taskView.context) + val taskMenuView = + container.layoutInflater.inflate(R.layout.task_menu, container.dragLayer, false) + as TaskMenuView + taskMenuView.setOnClosingStartCallback(onClosingStartCallback) + return taskMenuView.populateAndShowForTask(taskContainer) + } + } +} diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailViewHeader.kt b/quickstep/src/com/android/quickstep/views/TaskThumbnailViewHeader.kt index 9eb294ac76..9a8805bf0f 100644 --- a/quickstep/src/com/android/quickstep/views/TaskThumbnailViewHeader.kt +++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailViewHeader.kt @@ -19,6 +19,7 @@ package com.android.quickstep.views import android.content.Context import android.util.AttributeSet import android.widget.FrameLayout +import android.widget.ImageButton import android.widget.ImageView import android.widget.TextView import com.android.launcher3.R @@ -30,9 +31,11 @@ constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context private val headerTitleView: TextView by lazy { findViewById(R.id.header_app_title) } private val headerIconView: ImageView by lazy { findViewById(R.id.header_app_icon) } + private val headerCloseButton: ImageButton by lazy { findViewById(R.id.header_close_button) } fun setHeader(header: ThumbnailHeader) { headerTitleView.setText(header.title) headerIconView.setImageDrawable(header.icon) + headerCloseButton.setOnClickListener(header.clickCloseListener) } } diff --git a/quickstep/src/com/android/quickstep/views/TaskView.kt b/quickstep/src/com/android/quickstep/views/TaskView.kt index 49ec31dbab..276318c2db 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.kt +++ b/quickstep/src/com/android/quickstep/views/TaskView.kt @@ -44,6 +44,7 @@ import androidx.annotation.VisibleForTesting import androidx.core.view.updateLayoutParams import com.android.app.animation.Interpolators import com.android.launcher3.Flags.enableCursorHoverStates +import com.android.launcher3.Flags.enableDesktopExplodedView import com.android.launcher3.Flags.enableGridOnlyOverview import com.android.launcher3.Flags.enableHoverOfChildElementsInTaskview import com.android.launcher3.Flags.enableLargeDesktopWindowingTile @@ -60,8 +61,9 @@ import com.android.launcher3.testing.TestLogging import com.android.launcher3.testing.shared.TestProtocol import com.android.launcher3.util.CancellableTask import com.android.launcher3.util.Executors +import com.android.launcher3.util.KFloatProperty +import com.android.launcher3.util.MultiPropertyDelegate import com.android.launcher3.util.MultiPropertyFactory -import com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE import com.android.launcher3.util.MultiValueAlpha import com.android.launcher3.util.RunnableList import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED @@ -198,7 +200,7 @@ constructor( */ get() = (getNonGridTrans(nonGridTranslationX) + getGridTrans(this.gridTranslationX)) - protected val persistentTranslationY: Float + val persistentTranslationY: Float /** * Returns addition of translationY that is persistent (e.g. fullscreen and grid), and does * not change according to a temporary state (e.g. task offset). @@ -300,7 +302,7 @@ constructor( var sysUiStatusNavFlags: Int = 0 get() = if (enableRefactorTaskThumbnail()) field - else taskContainers.first().thumbnailViewDeprecated.sysUiStatusNavFlags + else firstTaskContainer?.thumbnailViewDeprecated?.sysUiStatusNavFlags ?: 0 private set // Various animation progress variables. @@ -439,28 +441,10 @@ constructor( applyTranslationX() } - private val taskViewAlpha = MultiValueAlpha(this, NUM_ALPHA_CHANNELS) - - protected var stableAlpha - set(value) { - taskViewAlpha.get(ALPHA_INDEX_STABLE).value = value - } - get() = taskViewAlpha.get(ALPHA_INDEX_STABLE).value - - var attachAlpha - set(value) { - taskViewAlpha.get(ALPHA_INDEX_ATTACH).value = value - } - get() = taskViewAlpha.get(ALPHA_INDEX_ATTACH).value - - var splitAlpha - set(value) { - splitAlphaProperty.value = value - } - get() = splitAlphaProperty.value - - val splitAlphaProperty: MultiPropertyFactory.MultiProperty - get() = taskViewAlpha.get(ALPHA_INDEX_SPLIT) + private val taskViewAlpha = MultiValueAlpha(this, Alpha.entries.size) + protected var stableAlpha by MultiPropertyDelegate(taskViewAlpha, Alpha.STABLE) + var attachAlpha by MultiPropertyDelegate(taskViewAlpha, Alpha.ATTACH) + var splitAlpha by MultiPropertyDelegate(taskViewAlpha, Alpha.SPLIT) protected var shouldShowScreenshot = false get() = !isRunningTask || field @@ -514,16 +498,16 @@ constructor( MultiPropertyFactory( this, SETTLED_PROGRESS, - SETTLED_PROGRESS_INDEX_COUNT, + SettledProgress.entries.size, { x: Float, y: Float -> x * y }, 1f, ) - private val settledProgressFullscreen = - settledProgressPropertyFactory.get(SETTLED_PROGRESS_INDEX_FULLSCREEN) - private val settledProgressGesture = - settledProgressPropertyFactory.get(SETTLED_PROGRESS_INDEX_GESTURE) - private val settledProgressDismiss = - settledProgressPropertyFactory.get(SETTLED_PROGRESS_INDEX_DISMISS) + private var settledProgressFullscreen by + MultiPropertyDelegate(settledProgressPropertyFactory, SettledProgress.Fullscreen) + private var settledProgressGesture by + MultiPropertyDelegate(settledProgressPropertyFactory, SettledProgress.Gesture) + private var settledProgressDismiss by + MultiPropertyDelegate(settledProgressPropertyFactory, SettledProgress.Dismiss) private var viewModel: TaskViewModel? = null private val dispatcherProvider: DispatcherProvider by RecentsDependencies.inject() @@ -535,7 +519,7 @@ constructor( * interpolator. */ fun getDismissIconFadeInAnimator(): ObjectAnimator = - ObjectAnimator.ofFloat(settledProgressDismiss, MULTI_PROPERTY_VALUE, 1f).apply { + ObjectAnimator.ofFloat(this, SETTLED_PROGRESS_DISMISS, 1f).apply { duration = FADE_IN_ICON_DURATION interpolator = FADE_IN_ICON_INTERPOLATOR } @@ -547,8 +531,7 @@ constructor( */ fun getDismissIconFadeOutAnimator(): ObjectAnimator = AnimatedFloat { v -> - settledProgressDismiss.value = - SETTLED_PROGRESS_FAST_OUT_INTERPOLATOR.getInterpolation(v) + settledProgressDismiss = SETTLED_PROGRESS_FAST_OUT_INTERPOLATOR.getInterpolation(v) } .animateToValue(1f, 0f) @@ -768,11 +751,27 @@ constructor( // Updating containers val mapOfTasks = state.tasks.associateBy { it.taskId } taskContainers.forEach { container -> - val containerState = mapOfTasks[container.task.key.id] + val taskId = container.task.key.id + val containerState = mapOfTasks[taskId] + val shouldHaveHeader = (type == TaskViewType.DESKTOP) && enableDesktopExplodedView() container.setState( state = containerState, liveTile = state.isLiveTile, - hasHeader = state.hasHeader, + hasHeader = shouldHaveHeader, + clickCloseListener = + if (shouldHaveHeader) { + { + // Update the layout UI to remove this task from the layout grid, and + // remove the task from ActivityManager afterwards. + recentsView?.dismissTask( + taskId, + /* animate= */ true, + /* removeTask= */ true, + ) + } + } else { + null + }, ) updateThumbnailValidity(container) updateThumbnailMatrix( @@ -789,11 +788,11 @@ constructor( private fun updateThumbnailValidity(container: TaskContainer) { container.isThumbnailValid = - viewModel!!.isThumbnailValid( + viewModel?.isThumbnailValid( thumbnail = container.thumbnailData, width = container.thumbnailView.width, height = container.thumbnailView.height, - ) + ) ?: return applyThumbnailSplashAlpha() } @@ -810,7 +809,8 @@ constructor( */ private fun updateThumbnailMatrix(container: TaskContainer, width: Int, height: Int) { val thumbnailPosition = - viewModel!!.getThumbnailPosition(container.thumbnailData, width, height, isLayoutRtl) + viewModel?.getThumbnailPosition(container.thumbnailData, width, height, isLayoutRtl) + ?: return container.updateThumbnailMatrix(thumbnailPosition.matrix) } @@ -1458,7 +1458,8 @@ constructor( return if (enableOverviewIconMenu() && menuContainer.iconView is IconAppChipView) { menuContainer.iconView.revealAnim(/* isRevealing= */ true) TaskMenuView.showForTask(menuContainer) { - menuContainer.iconView.revealAnim(/* isRevealing= */ false) + val isAnimated = !recentsView.isSplitSelectionActive + menuContainer.iconView.revealAnim(/* isRevealing= */ false, isAnimated) if (enableHoverOfChildElementsInTaskview()) { recentsView.setTaskBorderEnabled(true) } @@ -1584,7 +1585,7 @@ constructor( fun startIconFadeInOnGestureComplete() { iconFadeInOnGestureCompleteAnimator?.cancel() iconFadeInOnGestureCompleteAnimator = - ObjectAnimator.ofFloat(settledProgressGesture, MULTI_PROPERTY_VALUE, 1f).apply { + ObjectAnimator.ofFloat(this, SETTLED_PROGRESS_GESTURE, 1f).apply { duration = FADE_IN_ICON_DURATION interpolator = Interpolators.LINEAR addListener( @@ -1600,7 +1601,7 @@ constructor( fun setIconVisibleForGesture(isVisible: Boolean) { iconFadeInOnGestureCompleteAnimator?.cancel() - settledProgressGesture.value = if (isVisible) 1f else 0f + settledProgressGesture = if (isVisible) 1f else 0f } /** Set a color tint on the snapshot and supporting views. */ @@ -1689,7 +1690,7 @@ constructor( it.iconView.setVisibility(if (fullscreenProgress < 1) VISIBLE else INVISIBLE) it.overlay.setFullscreenProgress(fullscreenProgress) } - settledProgressFullscreen.value = + settledProgressFullscreen = SETTLED_PROGRESS_FAST_OUT_INTERPOLATOR.getInterpolation(1 - fullscreenProgress) updateFullscreenParams() } @@ -1747,7 +1748,7 @@ constructor( dismissScale = 1f translationZ = 0f setIconVisibleForGesture(true) - settledProgressDismiss.value = 1f + settledProgressDismiss = 1f setColorTint(0f, 0) } @@ -1769,23 +1770,25 @@ constructor( companion object { private const val TAG = "TaskView" + + private enum class Alpha { + STABLE, + ATTACH, + SPLIT, + } + + private enum class SettledProgress { + Fullscreen, + Gesture, + Dismiss, + } + const val FLAG_UPDATE_ICON = 1 const val FLAG_UPDATE_THUMBNAIL = FLAG_UPDATE_ICON shl 1 const val FLAG_UPDATE_CORNER_RADIUS = FLAG_UPDATE_THUMBNAIL shl 1 const val FLAG_UPDATE_ALL = (FLAG_UPDATE_ICON or FLAG_UPDATE_THUMBNAIL or FLAG_UPDATE_CORNER_RADIUS) - const val SETTLED_PROGRESS_INDEX_FULLSCREEN = 0 - const val SETTLED_PROGRESS_INDEX_GESTURE = 1 - const val SETTLED_PROGRESS_INDEX_DISMISS = 2 - const val SETTLED_PROGRESS_INDEX_COUNT = 3 - - private const val ALPHA_INDEX_STABLE = 0 - private const val ALPHA_INDEX_ATTACH = 1 - private const val ALPHA_INDEX_SPLIT = 2 - - private const val NUM_ALPHA_CHANNELS = 3 - /** The maximum amount that a task view can be scrimmed, dimmed or tinted. */ const val MAX_PAGE_SCRIM_ALPHA = 0.4f const val FADE_IN_ICON_DURATION: Long = 120 @@ -1802,104 +1805,45 @@ constructor( private val SYSTEM_GESTURE_EXCLUSION_RECT = listOf(Rect()) private val SETTLED_PROGRESS: FloatProperty = - object : FloatProperty("settleTransition") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.settledProgress = v - } + KFloatProperty(TaskView::settledProgress) - override fun get(taskView: TaskView) = taskView.settledProgress - } + private val SETTLED_PROGRESS_GESTURE: FloatProperty = + KFloatProperty(TaskView::settledProgressGesture) + + private val SETTLED_PROGRESS_DISMISS: FloatProperty = + KFloatProperty(TaskView::settledProgressDismiss) private val SPLIT_SELECT_TRANSLATION_X: FloatProperty = - object : FloatProperty("splitSelectTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.splitSelectTranslationX = v - } - - override fun get(taskView: TaskView) = taskView.splitSelectTranslationX - } + KFloatProperty(TaskView::splitSelectTranslationX) private val SPLIT_SELECT_TRANSLATION_Y: FloatProperty = - object : FloatProperty("splitSelectTranslationY") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.splitSelectTranslationY = v - } - - override fun get(taskView: TaskView) = taskView.splitSelectTranslationY - } + KFloatProperty(TaskView::splitSelectTranslationY) private val DISMISS_TRANSLATION_X: FloatProperty = - object : FloatProperty("dismissTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.dismissTranslationX = v - } - - override fun get(taskView: TaskView) = taskView.dismissTranslationX - } + KFloatProperty(TaskView::dismissTranslationX) private val DISMISS_TRANSLATION_Y: FloatProperty = - object : FloatProperty("dismissTranslationY") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.dismissTranslationY = v - } - - override fun get(taskView: TaskView) = taskView.dismissTranslationY - } + KFloatProperty(TaskView::dismissTranslationY) private val TASK_OFFSET_TRANSLATION_X: FloatProperty = - object : FloatProperty("taskOffsetTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.taskOffsetTranslationX = v - } - - override fun get(taskView: TaskView) = taskView.taskOffsetTranslationX - } + KFloatProperty(TaskView::taskOffsetTranslationX) private val TASK_OFFSET_TRANSLATION_Y: FloatProperty = - object : FloatProperty("taskOffsetTranslationY") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.taskOffsetTranslationY = v - } - - override fun get(taskView: TaskView) = taskView.taskOffsetTranslationY - } + KFloatProperty(TaskView::taskOffsetTranslationY) private val TASK_RESISTANCE_TRANSLATION_X: FloatProperty = - object : FloatProperty("taskResistanceTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.taskResistanceTranslationX = v - } - - override fun get(taskView: TaskView) = taskView.taskResistanceTranslationX - } + KFloatProperty(TaskView::taskResistanceTranslationX) private val TASK_RESISTANCE_TRANSLATION_Y: FloatProperty = - object : FloatProperty("taskResistanceTranslationY") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.taskResistanceTranslationY = v - } - - override fun get(taskView: TaskView) = taskView.taskResistanceTranslationY - } + KFloatProperty(TaskView::taskResistanceTranslationY) @JvmField val GRID_END_TRANSLATION_X: FloatProperty = - object : FloatProperty("gridEndTranslationX") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.gridEndTranslationX = v - } - - override fun get(taskView: TaskView) = taskView.gridEndTranslationX - } + KFloatProperty(TaskView::gridEndTranslationX) @JvmField - val DISMISS_SCALE: FloatProperty = - object : FloatProperty("dismissScale") { - override fun setValue(taskView: TaskView, v: Float) { - taskView.dismissScale = v - } + val DISMISS_SCALE: FloatProperty = KFloatProperty(TaskView::dismissScale) - override fun get(taskView: TaskView) = taskView.dismissScale - } + @JvmField val SPLIT_ALPHA: FloatProperty = KFloatProperty(TaskView::splitAlpha) } } diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewScreenshotTest.kt index b9d2fed9c7..80b2c16e10 100644 --- a/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewScreenshotTest.kt +++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/quickstep/task/thumbnail/TaskThumbnailViewScreenshotTest.kt @@ -16,10 +16,19 @@ package com.android.quickstep.task.thumbnail import android.content.Context +import android.graphics.Bitmap +import android.graphics.Canvas import android.graphics.Color +import android.graphics.Matrix +import android.graphics.Paint +import android.graphics.drawable.BitmapDrawable import android.view.LayoutInflater +import android.view.Surface.ROTATION_0 +import androidx.core.graphics.set import com.android.launcher3.R import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.BackgroundOnly +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Snapshot +import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.SnapshotSplash import com.android.quickstep.task.thumbnail.TaskThumbnailUiState.Uninitialized import com.google.android.apps.nexuslauncher.imagecomparison.goldenpathmanager.ViewScreenshotGoldenPathManager import org.junit.Rule @@ -80,6 +89,96 @@ class TaskThumbnailViewScreenshotTest(emulationSpec: DeviceEmulationSpec) { } } + @Test + fun taskThumbnailView_liveTile_withoutHeader() { + screenshotRule.screenshotTest("taskThumbnailView_liveTile") { activity -> + activity.actionBar?.hide() + createTaskThumbnailView(activity).apply { + setState(TaskThumbnailUiState.LiveTile.WithoutHeader) + } + } + } + + @Test + fun taskThumbnailView_image_withoutHeader() { + screenshotRule.screenshotTest("taskThumbnailView_image") { activity -> + activity.actionBar?.hide() + createTaskThumbnailView(activity).apply { + setState( + SnapshotSplash( + Snapshot.WithoutHeader(createBitmap(), ROTATION_0, Color.DKGRAY), + null, + ) + ) + } + } + } + + @Test + fun taskThumbnailView_image_withoutHeader_withImageMatrix() { + screenshotRule.screenshotTest("taskThumbnailView_image_withMatrix") { activity -> + activity.actionBar?.hide() + createTaskThumbnailView(activity).apply { + val lessThanHeightMatchingAspectRatio = (VIEW_ENV_HEIGHT / 2) - 200 + setState( + SnapshotSplash( + Snapshot.WithoutHeader( + createBitmap( + width = VIEW_ENV_WIDTH / 2, + height = lessThanHeightMatchingAspectRatio, + ), + ROTATION_0, + Color.DKGRAY, + ), + null, + ) + ) + setImageMatrix(Matrix().apply { postScale(2f, 2f) }) + } + } + } + + @Test + fun taskThumbnailView_splash_withoutHeader() { + screenshotRule.screenshotTest("taskThumbnailView_partial_splash") { activity -> + activity.actionBar?.hide() + createTaskThumbnailView(activity).apply { + setState( + SnapshotSplash( + Snapshot.WithoutHeader(createBitmap(), ROTATION_0, Color.DKGRAY), + BitmapDrawable(activity.resources, createSplash()), + ) + ) + updateSplashAlpha(0.5f) + } + } + } + + @Test + fun taskThumbnailView_splash_withoutHeader_withImageMatrix() { + screenshotRule.screenshotTest("taskThumbnailView_partial_splash_withMatrix") { activity -> + activity.actionBar?.hide() + createTaskThumbnailView(activity).apply { + val lessThanHeightMatchingAspectRatio = (VIEW_ENV_HEIGHT / 2) - 200 + setState( + SnapshotSplash( + Snapshot.WithoutHeader( + createBitmap( + width = VIEW_ENV_WIDTH / 2, + height = lessThanHeightMatchingAspectRatio, + ), + ROTATION_0, + Color.DKGRAY, + ), + BitmapDrawable(activity.resources, createSplash()), + ) + ) + setImageMatrix(Matrix().apply { postScale(2f, 2f) }) + updateSplashAlpha(0.5f) + } + } + } + @Test fun taskThumbnailView_dimmed_tintAmount() { screenshotRule.screenshotTest("taskThumbnailView_dimmed_40") { activity -> @@ -114,6 +213,18 @@ class TaskThumbnailViewScreenshotTest(emulationSpec: DeviceEmulationSpec) { } } + @Test + fun taskThumbnailView_scaled_roundRoundedCorners() { + screenshotRule.screenshotTest("taskThumbnailView_scaledRoundedCorners") { activity -> + activity.actionBar?.hide() + createTaskThumbnailView(activity).apply { + scaleX = 0.75f + scaleY = 0.3f + setState(BackgroundOnly(Color.YELLOW)) + } + } + } + private fun createTaskThumbnailView(context: Context): TaskThumbnailView { val taskThumbnailView = LayoutInflater.from(context).inflate(R.layout.task_thumbnail, null, false) @@ -122,6 +233,27 @@ class TaskThumbnailViewScreenshotTest(emulationSpec: DeviceEmulationSpec) { return taskThumbnailView } + private fun createSplash() = createBitmap(width = 20, height = 20, rectColorRotation = 1) + + private fun createBitmap( + width: Int = VIEW_ENV_WIDTH, + height: Int = VIEW_ENV_HEIGHT, + rectColorRotation: Int = 0, + ) = + Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888).apply { + Canvas(this).apply { + val paint = Paint() + paint.color = BITMAP_RECT_COLORS[rectColorRotation % 4] + drawRect(0f, 0f, width / 2f, height / 2f, paint) + paint.color = BITMAP_RECT_COLORS[(1 + rectColorRotation) % 4] + drawRect(width / 2f, 0f, width.toFloat(), height / 2f, paint) + paint.color = BITMAP_RECT_COLORS[(2 + rectColorRotation) % 4] + drawRect(0f, height / 2f, width / 2f, height.toFloat(), paint) + paint.color = BITMAP_RECT_COLORS[(3 + rectColorRotation) % 4] + drawRect(width / 2f, height / 2f, width.toFloat(), height.toFloat(), paint) + } + } + companion object { @Parameters(name = "{0}") @JvmStatic @@ -133,5 +265,8 @@ class TaskThumbnailViewScreenshotTest(emulationSpec: DeviceEmulationSpec) { ) const val CORNER_RADIUS = 56f + val BITMAP_RECT_COLORS = listOf(Color.GREEN, Color.RED, Color.BLUE, Color.CYAN) + const val VIEW_ENV_WIDTH = 1440 + const val VIEW_ENV_HEIGHT = 3120 } } diff --git a/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchTransitionManagerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt similarity index 90% rename from quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchTransitionManagerTest.kt rename to quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt index 9ca9fe4df5..7ebef45d27 100644 --- a/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchTransitionManagerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt @@ -27,12 +27,10 @@ import android.view.WindowManager.TRANSIT_TO_FRONT import android.window.TransitionFilter import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession import com.android.quickstep.SystemUiProxy import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.google.common.truth.Truth.assertThat -import org.junit.After import org.junit.Before import org.junit.Rule import org.junit.Test @@ -43,7 +41,6 @@ import org.mockito.kotlin.mock import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever -import org.mockito.quality.Strictness @SmallTest @RunWith(AndroidJUnit4::class) @@ -51,12 +48,6 @@ class DesktopAppLaunchTransitionManagerTest { @get:Rule val mSetFlagsRule = SetFlagsRule() - private val mockitoSession = - mockitoSession() - .strictness(Strictness.LENIENT) - .mockStatic(DesktopModeStatus::class.java) - .startMocking() - private val context = mock() private val systemUiProxy = mock() private lateinit var transitionManager: DesktopAppLaunchTransitionManager @@ -68,11 +59,6 @@ class DesktopAppLaunchTransitionManagerTest { transitionManager = DesktopAppLaunchTransitionManager(context, systemUiProxy) } - @After - fun tearDown() { - mockitoSession.finishMocking() - } - @Test @EnableFlags(FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX) fun registerTransitions_appLaunchFlagEnabled_registersTransition() { diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/AppEventProducerTest.java b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/AppEventProducerTest.java index 06a939a06d..91f9e53eaa 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/AppEventProducerTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/AppEventProducerTest.java @@ -41,7 +41,7 @@ import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.pm.UserCache; import com.android.launcher3.util.AllModulesForTest; -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext; +import com.android.launcher3.util.SandboxContext; import com.android.launcher3.util.UserIconInfo; import com.android.systemui.shared.system.SysUiStatsLog; diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt index 0005df6a6e..09c62aae1a 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt @@ -19,7 +19,6 @@ import android.app.prediction.AppPredictor import android.app.prediction.AppTarget import android.app.prediction.AppTargetEvent import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.android.launcher3.LauncherAppState import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WALLPAPERS @@ -54,11 +53,17 @@ class QuickstepModelDelegateTest { fun setUp() { MockitoAnnotations.initMocks(this) modelHelper = LauncherModelHelper() - underTest = QuickstepModelDelegate(modelHelper.sandboxContext) + underTest = + QuickstepModelDelegate( + modelHelper.sandboxContext, + modelHelper.sandboxContext.appComponent.idp, + modelHelper.sandboxContext.appComponent.packageManagerHelper, + "", /* dbFileName */ + ) underTest.mAllAppsState.predictor = allAppsPredictor underTest.mHotseatState.predictor = hotseatPredictor underTest.mWidgetsRecommendationState.predictor = widgetRecommendationPredictor - underTest.mApp = LauncherAppState.getInstance(modelHelper.sandboxContext) + underTest.mModel = modelHelper.model underTest.mDataModel = BgDataModel() } diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/data/TaskViewItemInfoTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/data/TaskViewItemInfoTest.kt index adfbca567d..8d20ba8e7f 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/data/TaskViewItemInfoTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/data/TaskViewItemInfoTest.kt @@ -28,7 +28,7 @@ import com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_NOT_PINNABLE import com.android.launcher3.model.data.TaskViewItemInfo.Companion.createTaskViewAtom import com.android.launcher3.pm.UserCache import com.android.launcher3.util.AllModulesForTest -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext +import com.android.launcher3.util.SandboxContext import com.android.launcher3.util.SplitConfigurationOptions import com.android.launcher3.util.TransformingTouchDelegate import com.android.launcher3.util.UserIconInfo diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt index bfd53ef480..37610444b5 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt @@ -19,6 +19,7 @@ package com.android.launcher3.taskbar import android.animation.AnimatorTestRule import android.content.ComponentName import android.content.Intent +import android.os.Process import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags import android.platform.test.flag.junit.SetFlagsRule @@ -27,6 +28,7 @@ import com.android.launcher3.Flags.FLAG_ENABLE_MULTI_INSTANCE_MENU_TASKBAR import com.android.launcher3.Flags.FLAG_TASKBAR_OVERFLOW import com.android.launcher3.R import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync import com.android.launcher3.taskbar.TaskbarViewTestUtil.createHotseatItems import com.android.launcher3.taskbar.bubbles.BubbleBarViewController @@ -111,6 +113,7 @@ class TaskbarOverflowTest { @InjectController lateinit var recentAppsController: TaskbarRecentAppsController @InjectController lateinit var bubbleBarViewController: BubbleBarViewController @InjectController lateinit var bubbleStashController: BubbleStashController + @InjectController lateinit var keyboardQuickSwitchController: KeyboardQuickSwitchController private var desktopTaskListener: IDesktopTaskListener? = null @@ -209,8 +212,10 @@ class TaskbarOverflowTest { runOnMainSync { val taskbarView: TaskbarView = taskbarUnitTestRule.activityContext.dragLayer.findViewById(R.id.taskbar_view) + val hotseatItems = createHotseatItems(maxNumberOfTaskbarIcons - initialIconCount) + taskbarView.updateItems( - createHotseatItems(maxNumberOfTaskbarIcons - initialIconCount), + recentAppsController.updateHotseatItemInfos(hotseatItems as Array), recentAppsController.shownTasks, ) } @@ -327,16 +332,127 @@ class TaskbarOverflowTest { assertThat(taskbarIconsCentered).isTrue() } - private fun createDesktopTask(tasksToAdd: Int) { - val tasks = - (0..), + recentAppsController.shownTasks, + ) + } + + assertThat(maxNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(currentNumberOfTaskbarIcons).isEqualTo(maxNumIconViews) + assertThat(taskbarOverflowIconIndex).isEqualTo(initialIconCount + hotseatItems.size) + assertThat(overflowItems) + .containsExactlyElementsIn(listOf(0) + (2..targetOverflowSize + 1).toList()) + } + + @Test + @TaskbarMode(PINNED) + fun testHotseatItemTasksNotShownInKQS() { + val maxNumIconViews = maxNumberOfTaskbarIcons + // Assume there are at least all apps and divider icon, as they would appear once running + // apps are added, even if not present initially. + val initialIconCount = currentNumberOfTaskbarIcons.coerceAtLeast(2) + val hotseatItems = createHotseatItems(1) + + val targetOverflowSize = 5 + val createdTasks = maxNumIconViews - initialIconCount + targetOverflowSize + createDesktopTaskWithTasksFromPackages( + listOf("fake") + + listOf(hotseatItems[0]?.targetPackage ?: "") + + List(createdTasks - 2) { "fake" } + ) + + runOnMainSync { + val taskbarView: TaskbarView = + taskbarUnitTestRule.activityContext.dragLayer.findViewById(R.id.taskbar_view) + taskbarView.updateItems( + recentAppsController.updateHotseatItemInfos(hotseatItems as Array), + recentAppsController.shownTasks, + ) + } + + tapOverflowIcon() + // Keyboard quick switch view is shown only after list of recent task is asynchronously + // retrieved from the recents model. + runOnMainSync { recentsModel.resolvePendingTaskRequests() } + + assertThat(getOnUiThread { keyboardQuickSwitchController.isShownFromTaskbar }).isTrue() + assertThat(getOnUiThread { keyboardQuickSwitchController.shownTaskIds() }) + .containsExactlyElementsIn(listOf(0) + (2..) { + val tasks = + packages.mapIndexed({ index, p -> + Task( + Task.TaskKey( + index, + 0, + Intent().apply { `package` = p }, + ComponentName(p, ""), + Process.myUserHandle().identifier, + 2000, + ) + ) + }) + + recentsModel.updateRecentTasks(listOf(DesktopTask(deskId = 0, tasks))) + for (task in 1..tasks.size) { + desktopTaskListener?.onTasksVisibilityChanged( + context.virtualDisplay.display.displayId, + task, + ) + } runOnMainSync { recentsModel.resolvePendingTaskRequests() } } @@ -392,6 +508,14 @@ class TaskbarOverflowTest { } } + private fun tapOverflowIcon() { + runOnMainSync { + val overflowIcon = + taskbarViewController.iconViews.firstOrNull { it is TaskbarOverflowView } + assertThat(overflowIcon?.callOnClick()).isTrue() + } + } + /** * Adds enough running apps for taskbar to enter overflow of `targetOverflowSize`, and verifies * * max number of icons in the taskbar remains unchanged diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt index c792783657..8376bc183c 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt @@ -877,7 +877,7 @@ class TaskbarRecentAppsControllerTest : TaskbarBaseTestCase() { val allTasks = ArrayList().apply { if (!runningTasks.isEmpty()) { - add(DesktopTask(ArrayList(runningTasks))) + add(DesktopTask(deskId = 0, ArrayList(runningTasks))) } addAll(recentTasks) } @@ -959,6 +959,8 @@ class TaskbarRecentAppsControllerTest : TaskbarBaseTestCase() { private fun setInDesktopMode(inDesktopMode: Boolean) { whenever(taskbarControllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar()) .thenReturn(inDesktopMode) + whenever(taskbarControllers.taskbarDesktopModeController.isInDesktopMode) + .thenReturn(inDesktopMode) } private fun createItemInfo( diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt index 46b5659ce9..a456fb9c73 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt @@ -60,6 +60,7 @@ import org.mockito.kotlin.any import org.mockito.kotlin.atLeastOnce import org.mockito.kotlin.eq import org.mockito.kotlin.mock +import org.mockito.kotlin.never import org.mockito.kotlin.verify import org.mockito.kotlin.whenever @@ -572,6 +573,71 @@ class BubbleBarViewAnimatorTest { verify(bubbleStashController).stashBubbleBarImmediate() } + @Test + fun animateToInitialState_whileDragging_inApp() { + setUpBubbleBar() + setUpBubbleStashController() + whenever(bubbleStashController.bubbleBarTranslationY) + .thenReturn(BAR_TRANSLATION_Y_FOR_TASKBAR) + + val handle = View(context) + val handleAnimator = PhysicsAnimator.getInstance(handle) + whenever(bubbleStashController.getStashedHandlePhysicsAnimator()).thenReturn(handleAnimator) + + val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) + + var notifiedBubbleBarVisible = false + val onBubbleBarVisible = Runnable { notifiedBubbleBarVisible = true } + val animator = + BubbleBarViewAnimator( + bubbleBarView, + bubbleStashController, + flyoutController, + bubbleBarParentViewController, + onExpanded = emptyRunnable, + onBubbleBarVisible = onBubbleBarVisible, + animatorScheduler, + ) + + InstrumentationRegistry.getInstrumentation().runOnMainSync { + bubbleBarView.visibility = INVISIBLE + animator.animateToInitialState( + bubble, + isInApp = true, + isExpanding = false, + isDragging = true, + ) + } + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + barAnimator.assertIsNotRunning() + assertThat(animator.isAnimating).isTrue() + assertThat(bubbleBarView.alpha).isEqualTo(1) + assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_TASKBAR) + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1) + waitForFlyoutToShow() + + assertThat(animatorScheduler.delayedBlock).isNotNull() + InstrumentationRegistry.getInstrumentation().runOnMainSync(animatorScheduler.delayedBlock!!) + + waitForFlyoutToHide() + + InstrumentationRegistry.getInstrumentation().runOnMainSync {} + PhysicsAnimatorTestUtils.blockUntilAnimationsEnd(DynamicAnimation.TRANSLATION_Y) + + InstrumentationRegistry.getInstrumentation().waitForIdleSync() + assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(2) + assertThat(animator.isAnimating).isFalse() + assertThat(bubbleBarView.alpha).isEqualTo(1) + assertThat(handle.translationY).isEqualTo(0) + assertThat(bubbleBarView.visibility).isEqualTo(VISIBLE) + assertThat(notifiedBubbleBarVisible).isTrue() + + verify(bubbleStashController, never()).stashBubbleBarImmediate() + } + @Test fun animateToInitialState_inApp_autoExpanding() { setUpBubbleBar() diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelHelper.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelHelper.kt index a7bfa9a5b0..5f7b360bdf 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelHelper.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/MockedRecentsModelHelper.kt @@ -19,6 +19,7 @@ package com.android.launcher3.taskbar.rules import com.android.quickstep.RecentsModel import com.android.quickstep.RecentsModel.RecentTasksChangedListener import com.android.quickstep.TaskIconCache +import com.android.quickstep.TaskThumbnailCache import com.android.quickstep.util.GroupTask import java.util.function.Consumer import org.mockito.kotlin.any @@ -27,9 +28,11 @@ import org.mockito.kotlin.doAnswer import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock -/** Helper class to mock the {@link RecentsModel} object in test */ +/** Helper class to mock the [RecentsModel] object in test */ class MockedRecentsModelHelper { private val mockIconCache: TaskIconCache = mock() + private val mockThumbnailCache: TaskThumbnailCache = mock() + var taskListId = 0 var recentTasksChangedListener: RecentTasksChangedListener? = null var taskRequests: MutableList<(List) -> Unit> = mutableListOf() @@ -37,6 +40,8 @@ class MockedRecentsModelHelper { val mockRecentsModel: RecentsModel = mock { on { iconCache } doReturn mockIconCache + on { thumbnailCache } doReturn mockThumbnailCache + on { unregisterRecentTasksChangedListener() } doAnswer { recentTasksChangedListener = null } on { registerRecentTasksChangedListener(any()) } doAnswer diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRule.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRule.kt index 3cf912c8e3..f22580719f 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRule.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRule.kt @@ -20,7 +20,6 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode import com.android.launcher3.util.DisplayController -import com.android.launcher3.util.MainThreadInitializedObject import com.android.launcher3.util.NavigationMode import org.junit.rules.TestRule import org.junit.runner.Description @@ -31,8 +30,8 @@ import org.mockito.kotlin.spy /** * Allows tests to specify which Taskbar [Mode] to run under. * - * [context] should match the test's target context, so that [MainThreadInitializedObject] instances - * are properly sandboxed. + * [context] should match the test's target context, so that Dagger singleton instances are properly + * sandboxed. * * Annotate tests with [TaskbarMode] to set a mode. If the annotation is omitted for any tests, this * rule is a no-op. diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt index 0204b2de21..2dacf69590 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarUnitTestRule.kt @@ -113,8 +113,8 @@ class TaskbarUnitTestRule( object : TaskbarNavButtonCallbacks {}, RecentsDisplayModel.INSTANCE.get(context), ) { - override fun recreateTaskbar() { - super.recreateTaskbar() + override fun recreateTaskbars() { + super.recreateTaskbars() if (currentActivityContext != null) { injectControllers() controllerInjectionCallback.invoke() @@ -146,7 +146,7 @@ class TaskbarUnitTestRule( } /** Simulates Taskbar recreation lifecycle. */ - fun recreateTaskbar() = instrumentation.runOnMainSync { taskbarManager.recreateTaskbar() } + fun recreateTaskbar() = instrumentation.runOnMainSync { taskbarManager.recreateTaskbars() } private fun injectControllers() { val bubbleControllerTypes = diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContext.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContext.kt index 95e8980cdb..6d53e8e312 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContext.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarWindowSandboxContext.kt @@ -26,11 +26,10 @@ import com.android.launcher3.LauncherPrefs import com.android.launcher3.dagger.ApplicationContext import com.android.launcher3.dagger.LauncherAppComponent import com.android.launcher3.dagger.LauncherAppSingleton -import com.android.launcher3.util.AllModulesForTest +import com.android.launcher3.util.AllModulesMinusWMProxy import com.android.launcher3.util.DaggerSingletonTracker import com.android.launcher3.util.DisplayController import com.android.launcher3.util.FakePrefsModule -import com.android.launcher3.util.MainThreadInitializedObject.ObjectSandbox import com.android.launcher3.util.SandboxApplication import com.android.launcher3.util.SettingsCache import com.android.launcher3.util.SettingsCacheSandbox @@ -58,7 +57,7 @@ private constructor( private val base: SandboxApplication, val virtualDisplay: VirtualDisplay, private val params: SandboxParams, -) : ContextWrapper(base), ObjectSandbox by base, TestRule { +) : ContextWrapper(base), TestRule { val settingsCacheSandbox = SettingsCacheSandbox() @@ -138,7 +137,13 @@ abstract class DisplayControllerModule { @LauncherAppSingleton @Component( - modules = [AllModulesForTest::class, FakePrefsModule::class, DisplayControllerModule::class] + modules = + [ + AllModulesMinusWMProxy::class, + FakePrefsModule::class, + DisplayControllerModule::class, + TaskbarSandboxModule::class, + ] ) interface TaskbarSandboxComponent : LauncherAppComponent { diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java index 8b17958177..ad9bbb9534 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java @@ -177,8 +177,8 @@ public class RecentTasksListTest { createRecentTaskInfo(4 /* taskId */, DEFAULT_DISPLAY), createRecentTaskInfo(5 /* taskId */, 1 /* displayId */), createRecentTaskInfo(6 /* taskId */, 1 /* displayId */)); - GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forFreeformTasks( - tasks, Collections.emptySet() /* minimizedTaskIds */); + GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forDeskTasks( + 0 /* deskId */, tasks, Collections.emptySet() /* minimizedTaskIds */); when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())) .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); @@ -207,8 +207,8 @@ public class RecentTasksListTest { createRecentTaskInfo(4 /* taskId */, DEFAULT_DISPLAY), createRecentTaskInfo(5 /* taskId */, 1 /* displayId */), createRecentTaskInfo(6 /* taskId */, 1 /* displayId */)); - GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forFreeformTasks( - tasks, Collections.emptySet() /* minimizedTaskIds */); + GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forDeskTasks( + 0 /* deskId */, tasks, Collections.emptySet() /* minimizedTaskIds */); when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())) .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); @@ -241,7 +241,8 @@ public class RecentTasksListTest { createRecentTaskInfo(5 /* taskId */, DEFAULT_DISPLAY)); Set minimizedTaskIds = Arrays.stream(new Integer[]{1, 4, 5}).collect(Collectors.toSet()); - GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forFreeformTasks(tasks, minimizedTaskIds); + GroupedTaskInfo recentTaskInfos = GroupedTaskInfo.forDeskTasks( + 0 /* deskId */, tasks, minimizedTaskIds); when(mSystemUiProxy.getRecentTasks(anyInt(), anyInt())) .thenReturn(new ArrayList<>(Collections.singletonList(recentTaskInfos))); diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt index b652ee8df4..a7370b02e9 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsAnimationDeviceStateTest.kt @@ -1,5 +1,6 @@ package com.android.quickstep +import android.view.Display import androidx.test.annotation.UiThreadTest import androidx.test.filters.SmallTest import com.android.launcher3.dagger.LauncherComponentProvider @@ -13,6 +14,7 @@ import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.launcher3.util.NavigationMode import com.android.launcher3.util.SandboxApplication import com.android.quickstep.util.GestureExclusionManager +import com.android.systemui.shared.system.QuickStepContract import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DISABLE_GESTURE_SPLIT_INVOCATION @@ -150,7 +152,7 @@ class RecentsAnimationDeviceStateTest { allSysUiStates().forEach { state -> val canStartGesture = !disablingStates.contains(state) - underTest.setSystemUiFlags(state) + underTest.setSysUIStateFlagsForDisplay(state, Display.DEFAULT_DISPLAY) assertThat(underTest.canStartTrackpadGesture()).isEqualTo(canStartGesture) } } @@ -166,7 +168,7 @@ class RecentsAnimationDeviceStateTest { ) stateToExpectedResult.forEach { (state, allowed) -> - underTest.setSystemUiFlags(state) + underTest.setSysUIStateFlagsForDisplay(state, Display.DEFAULT_DISPLAY) assertThat(underTest.canStartTrackpadGesture()).isEqualTo(allowed) } } @@ -177,7 +179,7 @@ class RecentsAnimationDeviceStateTest { allSysUiStates().forEach { state -> val canStartGesture = !disablingStates.contains(state) - underTest.setSystemUiFlags(state) + underTest.setSysUIStateFlagsForDisplay(state, Display.DEFAULT_DISPLAY) assertThat(underTest.canStartSystemGesture()).isEqualTo(canStartGesture) } } @@ -197,11 +199,42 @@ class RecentsAnimationDeviceStateTest { ) stateToExpectedResult.forEach { (state, gestureAllowed) -> - underTest.setSystemUiFlags(state) + underTest.setSysUIStateFlagsForDisplay(state, Display.DEFAULT_DISPLAY) assertThat(underTest.canStartSystemGesture()).isEqualTo(gestureAllowed) } } + @Test + fun getSystemUiStateFlags_defaultAwake() { + val NOT_EXISTENT_DISPLAY = 2 + assertThat(underTest.getSystemUiStateFlags(NOT_EXISTENT_DISPLAY)) + .isEqualTo(QuickStepContract.SYSUI_STATE_AWAKE) + } + + @Test + fun clearSysUIStateFlagsForDisplay_displayNotReturnedAnymore() { + underTest.setSysUIStateFlagsForDisplay(1, /* displayId= */ 1) + + assertThat(underTest.displaysWithSysUIState).contains(1) + assertThat(underTest.getSystemUiStateFlags(1)).isEqualTo(1) + + underTest.clearSysUIStateFlagsForDisplay(1) + + assertThat(underTest.displaysWithSysUIState).doesNotContain(1) + assertThat(underTest.getSystemUiStateFlags(1)) + .isEqualTo(QuickStepContract.SYSUI_STATE_AWAKE) + } + + @Test + fun setSysUIStateFlagsForDisplay_setsCorrectly() { + underTest.setSysUIStateFlagsForDisplay(1, /* displayId= */ 1) + underTest.setSysUIStateFlagsForDisplay(2, /* displayId= */ 2) + + assertThat(underTest.getSystemUiStateFlags(1)).isEqualTo(1) + assertThat(underTest.getSystemUiStateFlags(2)).isEqualTo(2) + assertThat(underTest.displaysWithSysUIState).containsAtLeast(1, 2) + } + private fun allSysUiStates(): List { // SYSUI_STATES_* are binary flags return (0..SYSUI_STATES_COUNT).map { 1L shl it } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java index 7776351517..b3056f5c46 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java @@ -24,8 +24,11 @@ import static android.view.MotionEvent.ACTION_UP; import static androidx.test.core.app.ApplicationProvider.getApplicationContext; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LONG_PRESS_NAVBAR; +import static com.android.launcher3.logging.StatsLogManager.LauncherLatencyEvent.LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.quickstep.DeviceConfigWrapper.DEFAULT_LPNH_TIMEOUT_MS; +import static com.android.quickstep.inputconsumers.NavHandleLongPressInputConsumer.MIN_TIME_TO_LOG_ABANDON_MS; import static com.google.common.truth.Truth.assertThat; @@ -33,9 +36,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import android.os.SystemClock; @@ -47,9 +52,10 @@ import androidx.test.platform.app.InstrumentationRegistry; import com.android.launcher3.dagger.LauncherAppComponent; import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.util.AllModulesForTest; import com.android.launcher3.util.DisplayController; -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext; +import com.android.launcher3.util.SandboxContext; import com.android.quickstep.DeviceConfigWrapper; import com.android.quickstep.GestureState; import com.android.quickstep.InputConsumer; @@ -83,6 +89,7 @@ public class NavHandleLongPressInputConsumerTest { private NavHandleLongPressInputConsumer mUnderTest; private SandboxContext mContext; private float mScreenWidth; + private long mDownTimeMs; @Mock InputConsumer mDelegate; @Mock InputMonitorCompat mInputMonitor; @Mock RecentsAnimationDeviceState mDeviceState; @@ -91,6 +98,9 @@ public class NavHandleLongPressInputConsumerTest { @Mock NavHandleLongPressHandler mNavHandleLongPressHandler; @Mock TopTaskTracker mTopTaskTracker; @Mock TopTaskTracker.CachedTaskInfo mTaskInfo; + @Mock StatsLogManager mStatsLogManager; + @Mock StatsLogManager.StatsLogger mStatsLogger; + @Mock StatsLogManager.StatsLatencyLogger mStatsLatencyLogger; @Before public void setup() { @@ -100,6 +110,11 @@ public class NavHandleLongPressInputConsumerTest { when(mDelegate.allowInterceptByParent()).thenReturn(true); mLongPressTriggered.set(false); when(mNavHandleLongPressHandler.getLongPressRunnable(any())).thenReturn(mLongPressRunnable); + when(mStatsLogger.withPackageName(any())).thenReturn(mStatsLogger); + when(mStatsLatencyLogger.withInstanceId(any())).thenReturn(mStatsLatencyLogger); + when(mStatsLatencyLogger.withLatency(anyLong())).thenReturn(mStatsLatencyLogger); + when(mStatsLogManager.logger()).thenReturn(mStatsLogger); + when(mStatsLogManager.latencyLogger()).thenReturn(mStatsLatencyLogger); initializeObjectUnderTest(); } @@ -124,17 +139,23 @@ public class NavHandleLongPressInputConsumerTest { assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); verify(mNavHandleLongPressHandler, never()).onTouchStarted(any()); verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogManager); + verifyNoMoreInteractions(mStatsLogger); + verifyNoMoreInteractions(mStatsLatencyLogger); } @Test public void testDelegateDisallowsTouchInterceptAfterTouchDown() { + // Touch down and wait the minimum abandonment time. mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); // Delegate should still get touches unless long press is triggered. verify(mDelegate).onMotionEvent(any()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + // Child delegate blocks us from intercepting further motion events. when(mDelegate.allowInterceptByParent()).thenReturn(false); mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_MOVE)); @@ -144,46 +165,54 @@ public class NavHandleLongPressInputConsumerTest { assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogger); + // Because we handled touch down before the child blocked additional events, log abandon. + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); } @Test public void testLongPressTriggered() { mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); assertTrue(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); + + // Ensure abandon latency is still not logged after long press. + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_UP)); + verifyNoMoreInteractions(mStatsLatencyLogger); } @Test public void testLongPressTriggeredWithSlightVerticalMovement() { mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); - mUnderTest.onMotionEvent(generateCenteredMotionEventWithYOffset(ACTION_MOVE, - -(TOUCH_SLOP - 1))); - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + mUnderTest.onMotionEvent(generateCenteredMotionEventWithYOffset(ACTION_MOVE, 1)); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); assertTrue(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); } @Test public void testLongPressTriggeredWithSlightHorizontalMovement() { mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); - mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, - mScreenWidth / 2f - (TOUCH_SLOP - 1), 0)); - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, mScreenWidth / 2f + 1, 0)); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); assertTrue(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); } @Test @@ -196,8 +225,7 @@ public class NavHandleLongPressInputConsumerTest { mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, mScreenWidth / 2f - (TOUCH_SLOP - 1), 0)); // We have entered the second stage, so the normal timeout shouldn't trigger. - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); @@ -207,14 +235,15 @@ public class NavHandleLongPressInputConsumerTest { // After an extended time, the long press should trigger. float extendedDurationMultiplier = (DeviceConfigWrapper.get().getTwoStageDurationPercentage() / 100f); - SystemClock.sleep((long) (DEFAULT_LPNH_TIMEOUT_MS + sleep((long) (DEFAULT_LPNH_TIMEOUT_MS * (extendedDurationMultiplier - 1))); // -1 because we already waited 1x - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); assertTrue(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); } catch (Exception e) { throw new RuntimeException(e); } @@ -228,13 +257,14 @@ public class NavHandleLongPressInputConsumerTest { mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); // We have not entered the second stage, so the normal timeout should trigger. - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_ACTIVE); assertTrue(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verify(mStatsLogger).log(LAUNCHER_LONG_PRESS_NAVBAR); + verifyNoMoreInteractions(mStatsLatencyLogger); } catch (Exception e) { throw new RuntimeException(e); } @@ -243,48 +273,47 @@ public class NavHandleLongPressInputConsumerTest { @Test public void testLongPressAbortedByTouchUp() { mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS - 10); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_UP)); // Wait past the long press timeout, to be extra sure it wouldn't have triggered. - SystemClock.sleep(20); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); } @Test public void testLongPressAbortedByTouchCancel() { mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS - 10); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_CANCEL)); // Wait past the long press timeout, to be extra sure it wouldn't have triggered. - SystemClock.sleep(20); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); } @Test public void testLongPressAbortedByTouchSlopPassedVertically() { mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS - 10); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); @@ -292,20 +321,20 @@ public class NavHandleLongPressInputConsumerTest { mUnderTest.onMotionEvent(generateCenteredMotionEventWithYOffset(ACTION_MOVE, -(TOUCH_SLOP + 1))); // Wait past the long press timeout, to be extra sure it wouldn't have triggered. - SystemClock.sleep(20); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); } @Test public void testLongPressAbortedByTouchSlopPassedHorizontally() { mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS - 10); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(MIN_TIME_TO_LOG_ABANDON_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); @@ -313,13 +342,14 @@ public class NavHandleLongPressInputConsumerTest { mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, mScreenWidth / 2f - (TOUCH_SLOP + 1), 0)); // Wait past the long press timeout, to be extra sure it wouldn't have triggered. - SystemClock.sleep(20); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); } @Test @@ -333,8 +363,7 @@ public class NavHandleLongPressInputConsumerTest { mUnderTest.onMotionEvent(generateCenteredMotionEventWithYOffset(ACTION_MOVE, -(TOUCH_SLOP - 1))); // Normal duration shouldn't trigger. - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); @@ -345,15 +374,16 @@ public class NavHandleLongPressInputConsumerTest { // Wait past the extended long press timeout, to be sure it wouldn't have triggered. float extendedDurationMultiplier = (DeviceConfigWrapper.get().getTwoStageDurationPercentage() / 100f); - SystemClock.sleep((long) (DEFAULT_LPNH_TIMEOUT_MS + sleep((long) (DEFAULT_LPNH_TIMEOUT_MS * (extendedDurationMultiplier - 1))); // -1 because we already waited 1x - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); // Touch cancelled. verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); } catch (Exception e) { throw new RuntimeException(e); } @@ -370,8 +400,7 @@ public class NavHandleLongPressInputConsumerTest { mUnderTest.onMotionEvent(generateMotionEvent(ACTION_MOVE, mScreenWidth / 2f - (TOUCH_SLOP - 1), 0)); // Normal duration shouldn't trigger. - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); @@ -382,15 +411,16 @@ public class NavHandleLongPressInputConsumerTest { // Wait past the extended long press timeout, to be sure it wouldn't have triggered. float extendedDurationMultiplier = (DeviceConfigWrapper.get().getTwoStageDurationPercentage() / 100f); - SystemClock.sleep((long) (DEFAULT_LPNH_TIMEOUT_MS + sleep((long) (DEFAULT_LPNH_TIMEOUT_MS * (extendedDurationMultiplier - 1))); // -1 because we already waited 1x - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, times(1)).onTouchStarted(any()); // Touch cancelled. verify(mNavHandleLongPressHandler, times(1)).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogger); + verify(mStatsLatencyLogger).log(LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON); } catch (Exception e) { throw new RuntimeException(e); } @@ -400,14 +430,16 @@ public class NavHandleLongPressInputConsumerTest { public void testTouchOutsideNavHandleIgnored() { // Touch the far left side of the screen. (y=0 is top of navbar region, picked arbitrarily) mUnderTest.onMotionEvent(generateMotionEvent(ACTION_DOWN, 0, 0)); - SystemClock.sleep(DEFAULT_LPNH_TIMEOUT_MS); - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + sleep(DEFAULT_LPNH_TIMEOUT_MS); // Should be ignored because the x position was not centered in the navbar region. assertThat(mUnderTest.mState).isEqualTo(DelegateInputConsumer.STATE_INACTIVE); assertFalse(mLongPressTriggered.get()); verify(mNavHandleLongPressHandler, never()).onTouchStarted(any()); verify(mNavHandleLongPressHandler, never()).onTouchFinished(any(), any()); + verifyNoMoreInteractions(mStatsLogManager); + verifyNoMoreInteractions(mStatsLogger); + verifyNoMoreInteractions(mStatsLatencyLogger); } @Test @@ -422,6 +454,20 @@ public class NavHandleLongPressInputConsumerTest { mUnderTest.onHoverEvent(generateCenteredMotionEvent(ACTION_HOVER_ENTER)); verify(mDelegate, times(2)).onHoverEvent(any()); + + verifyNoMoreInteractions(mStatsLogManager); + verifyNoMoreInteractions(mStatsLogger); + verifyNoMoreInteractions(mStatsLatencyLogger); + } + + @Test + public void testNoLogsForShortTouch() { + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_DOWN)); + sleep(10); + mUnderTest.onMotionEvent(generateCenteredMotionEvent(ACTION_UP)); + verifyNoMoreInteractions(mStatsLogManager); + verifyNoMoreInteractions(mStatsLogger); + verifyNoMoreInteractions(mStatsLatencyLogger); } private void initializeObjectUnderTest() { @@ -437,6 +483,13 @@ public class NavHandleLongPressInputConsumerTest { mUnderTest = new NavHandleLongPressInputConsumer(mContext, mDelegate, mInputMonitor, mDeviceState, mNavHandle, mGestureState); mUnderTest.setNavHandleLongPressHandler(mNavHandleLongPressHandler); + mUnderTest.setStatsLogManager(mStatsLogManager); + mDownTimeMs = 0; + } + + private static void sleep(long sleepMs) { + SystemClock.sleep(sleepMs); + InstrumentationRegistry.getInstrumentation().waitForIdleSync(); } /** Generate a motion event centered horizontally in the screen. */ @@ -449,8 +502,12 @@ public class NavHandleLongPressInputConsumerTest { return generateMotionEvent(motionAction, mScreenWidth / 2f, y); } - private static MotionEvent generateMotionEvent(int motionAction, float x, float y) { - return MotionEvent.obtain(0, 0, motionAction, x, y, 0); + private MotionEvent generateMotionEvent(int motionAction, float x, float y) { + if (motionAction == ACTION_DOWN) { + mDownTimeMs = SystemClock.uptimeMillis(); + } + long eventTime = SystemClock.uptimeMillis(); + return MotionEvent.obtain(mDownTimeMs, eventTime, motionAction, x, y, 0); } private static AutoCloseable overrideTwoStageFlag(boolean value) { diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/LandscapePagedViewHandlerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/LandscapePagedViewHandlerTest.kt index ea52842e22..0570c26eed 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/LandscapePagedViewHandlerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/LandscapePagedViewHandlerTest.kt @@ -62,6 +62,7 @@ class LandscapePagedViewHandlerTest { isRTL, OVERVIEW_TASK_MARGIN_PX, DIVIDER_SIZE_PX, + oneIconHiddenDueToSmallWidth = false, ) } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/SeascapePagedViewHandlerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/SeascapePagedViewHandlerTest.kt index 2bc182c02d..37886888ea 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/SeascapePagedViewHandlerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/orientation/SeascapePagedViewHandlerTest.kt @@ -62,6 +62,7 @@ class SeascapePagedViewHandlerTest { isRTL, OVERVIEW_TASK_MARGIN_PX, DIVIDER_SIZE_PX, + oneIconHiddenDueToSmallWidth = false, ) } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskThumbnailDataSource.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskThumbnailDataSource.kt index e10afc47bb..40d5e0264c 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskThumbnailDataSource.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/FakeTaskThumbnailDataSource.kt @@ -22,7 +22,6 @@ import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.ThumbnailData import kotlinx.coroutines.yield import org.mockito.kotlin.mock -import org.mockito.kotlin.whenever class FakeTaskThumbnailDataSource : TaskThumbnailDataSource { @@ -31,6 +30,8 @@ class FakeTaskThumbnailDataSource : TaskThumbnailDataSource { private val completionPrevented: MutableSet = mutableSetOf() private val getThumbnailCalls = mutableMapOf() + var highResEnabled = true + /** Retrieves and sets a thumbnail on [task] from [taskIdToBitmap]. */ override suspend fun getThumbnail(task: Task): ThumbnailData { getThumbnailCalls[task.key.id] = (getThumbnailCalls[task.key.id] ?: 0) + 1 @@ -38,9 +39,10 @@ class FakeTaskThumbnailDataSource : TaskThumbnailDataSource { while (task.key.id in completionPrevented) { yield() } - return mock().also { - whenever(it.thumbnail).thenReturn(taskIdToBitmap[task.key.id]) - } + return ThumbnailData( + thumbnail = taskIdToBitmap[task.key.id], + reducedResolution = !highResEnabled, + ) } fun getNumberOfGetThumbnailCalls(taskId: Int): Int = getThumbnailCalls[taskId] ?: 0 diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegateTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegateTest.kt index 41f6bfdf75..b91f8bd6fd 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegateTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TaskVisualsChangedDelegateTest.kt @@ -19,16 +19,19 @@ package com.android.quickstep.recents.data import android.content.ComponentName import android.content.Intent import android.os.UserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskIconChangedCallback import com.android.quickstep.recents.data.TaskVisualsChangedDelegate.TaskThumbnailChangedCallback import com.android.systemui.shared.recents.model.Task.TaskKey import com.android.systemui.shared.recents.model.ThumbnailData import com.google.common.truth.Truth.assertThat import org.junit.Test +import org.junit.runner.RunWith import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.mockito.kotlin.verifyNoMoreInteractions +@RunWith(AndroidJUnit4::class) class TaskVisualsChangedDelegateTest { private val taskVisualsChangeNotifier = FakeTaskVisualsChangeNotifier() private val highResLoadingStateNotifier = FakeHighResLoadingStateNotifier() @@ -83,21 +86,21 @@ class TaskVisualsChangedDelegateTest { // Correct match systemUnderTest.registerTaskIconChangedCallback( createTaskKey(id = 1, pkg = ALTERNATIVE_PACKAGE_NAME, userId = 1), - expectedListener + expectedListener, ) // 1 out of 2 match systemUnderTest.registerTaskIconChangedCallback( createTaskKey(id = 2, pkg = PACKAGE_NAME, userId = 1), - listener + listener, ) systemUnderTest.registerTaskIconChangedCallback( createTaskKey(id = 3, pkg = ALTERNATIVE_PACKAGE_NAME, userId = 2), - listener + listener, ) // 0 out of 2 match systemUnderTest.registerTaskIconChangedCallback( createTaskKey(id = 4, pkg = PACKAGE_NAME, userId = 2), - listener + listener, ) systemUnderTest.onTaskIconChanged(ALTERNATIVE_PACKAGE_NAME, UserHandle(1)) @@ -112,11 +115,11 @@ class TaskVisualsChangedDelegateTest { val newListener = mock() systemUnderTest.registerTaskIconChangedCallback( createTaskKey(id = 1, pkg = ALTERNATIVE_PACKAGE_NAME, userId = 1), - replacedListener + replacedListener, ) systemUnderTest.registerTaskIconChangedCallback( createTaskKey(id = 1, pkg = ALTERNATIVE_PACKAGE_NAME, userId = 1), - newListener + newListener, ) systemUnderTest.onTaskIconChanged(ALTERNATIVE_PACKAGE_NAME, UserHandle(1)) @@ -132,11 +135,11 @@ class TaskVisualsChangedDelegateTest { val expectedThumbnailData = ThumbnailData(snapshotId = 12345) systemUnderTest.registerTaskThumbnailChangedCallback( createTaskKey(id = 1), - expectedListener + expectedListener, ) systemUnderTest.registerTaskThumbnailChangedCallback( createTaskKey(id = 2), - additionalListener + additionalListener, ) systemUnderTest.onTaskThumbnailChanged(1, expectedThumbnailData) @@ -146,22 +149,41 @@ class TaskVisualsChangedDelegateTest { } @Test - fun onHighResLoadingStateChanged_notifiesAllListeners() { + fun onHighResLoadingStateChanged_toEnabled_notifiesAllListeners() { val expectedListener = mock() val additionalListener = mock() systemUnderTest.registerTaskThumbnailChangedCallback( createTaskKey(id = 1), - expectedListener + expectedListener, ) systemUnderTest.registerTaskThumbnailChangedCallback( createTaskKey(id = 2), - additionalListener + additionalListener, ) systemUnderTest.onHighResLoadingStateChanged(true) - verify(expectedListener).onHighResLoadingStateChanged() - verify(additionalListener).onHighResLoadingStateChanged() + verify(expectedListener).onHighResLoadingStateChanged(true) + verify(additionalListener).onHighResLoadingStateChanged(true) + } + + @Test + fun onHighResLoadingStateChanged_toDisabled_notifiesAllListeners() { + val expectedListener = mock() + val additionalListener = mock() + systemUnderTest.registerTaskThumbnailChangedCallback( + createTaskKey(id = 1), + expectedListener, + ) + systemUnderTest.registerTaskThumbnailChangedCallback( + createTaskKey(id = 2), + additionalListener, + ) + + systemUnderTest.onHighResLoadingStateChanged(false) + + verify(expectedListener).onHighResLoadingStateChanged(false) + verify(additionalListener).onHighResLoadingStateChanged(false) } @Test @@ -171,7 +193,7 @@ class TaskVisualsChangedDelegateTest { val expectedThumbnailData = ThumbnailData(snapshotId = 12345) systemUnderTest.registerTaskThumbnailChangedCallback( createTaskKey(id = 1), - replacedListener1 + replacedListener1, ) systemUnderTest.registerTaskThumbnailChangedCallback(createTaskKey(id = 1), newListener1) diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TasksRepositoryTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TasksRepositoryTest.kt index 823f808bc9..6790567a85 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TasksRepositoryTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/data/TasksRepositoryTest.kt @@ -64,7 +64,7 @@ class TasksRepositoryTest { /* snapPosition = */ SNAP_TO_2_50_50, ), ), - DesktopTask(tasks.subList(3, 6)), + DesktopTask(deskId = 0, tasks.subList(3, 6)), ) private val recentsModel = FakeRecentTasksDataSource() private val taskThumbnailDataSource = FakeTaskThumbnailDataSource() @@ -326,8 +326,9 @@ class TasksRepositoryTest { } @Test - fun onHighResLoadingStateChanged_setsNewThumbnailDataOnTask() = + fun onHighResLoadingStateChanged_highResReplacesLowResThumbnail() = testScope.runTest { + taskThumbnailDataSource.highResEnabled = false recentsModel.seedTasks(defaultTaskList) systemUnderTest.getAllTaskData(forceRefresh = true) @@ -337,16 +338,77 @@ class TasksRepositoryTest { val expectedPreviousBitmap = taskThumbnailDataSource.taskIdToBitmap[1] val taskDataFlow = systemUnderTest.getTaskDataById(1) - val task1ThumbnailValues = mutableListOf() + val task1ThumbnailValues = mutableListOf() testScope.backgroundScope.launch { - taskDataFlow.map { it?.thumbnail?.thumbnail }.toList(task1ThumbnailValues) + taskDataFlow.map { it?.thumbnail }.toList(task1ThumbnailValues) } taskThumbnailDataSource.taskIdToBitmap[1] = expectedBitmap + taskThumbnailDataSource.highResEnabled = true taskVisualsChangedDelegate.onHighResLoadingStateChanged(true) - assertThat(task1ThumbnailValues.first()).isEqualTo(expectedPreviousBitmap) - assertThat(task1ThumbnailValues.last()).isEqualTo(expectedBitmap) + val firstThumbnailValue = task1ThumbnailValues.first()!! + assertThat(firstThumbnailValue.thumbnail).isEqualTo(expectedPreviousBitmap) + assertThat(firstThumbnailValue.reducedResolution).isTrue() + + val lastThumbnailValue = task1ThumbnailValues.last()!! + assertThat(lastThumbnailValue.thumbnail).isEqualTo(expectedBitmap) + assertThat(lastThumbnailValue.reducedResolution).isFalse() + } + + @Test + fun onHighResLoadingStateChanged_invisibleTaskIgnored() = + testScope.runTest { + taskThumbnailDataSource.highResEnabled = false + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(forceRefresh = true) + + systemUnderTest.setVisibleTasks(setOf(1)) + + val invisibleTaskId = 2 + val taskDataFlow = systemUnderTest.getTaskDataById(invisibleTaskId) + + val task2ThumbnailValues = mutableListOf() + testScope.backgroundScope.launch { + taskDataFlow.map { it?.thumbnail }.toList(task2ThumbnailValues) + } + + taskThumbnailDataSource.highResEnabled = true + taskVisualsChangedDelegate.onHighResLoadingStateChanged(true) + + assertThat(task2ThumbnailValues.filterNotNull()).isEmpty() + assertThat(taskThumbnailDataSource.getNumberOfGetThumbnailCalls(2)).isEqualTo(0) + } + + @Test + fun onHighResLoadingStateChanged_lowResDoesNotReplaceHighResThumbnail() = + testScope.runTest { + taskThumbnailDataSource.highResEnabled = true + recentsModel.seedTasks(defaultTaskList) + systemUnderTest.getAllTaskData(forceRefresh = true) + + systemUnderTest.setVisibleTasks(setOf(1)) + + val expectedBitmap = mock() + val expectedPreviousBitmap = taskThumbnailDataSource.taskIdToBitmap[1] + val taskDataFlow = systemUnderTest.getTaskDataById(1) + + val task1ThumbnailValues = mutableListOf() + testScope.backgroundScope.launch { + taskDataFlow.map { it?.thumbnail }.toList(task1ThumbnailValues) + } + + taskThumbnailDataSource.taskIdToBitmap[1] = expectedBitmap + taskThumbnailDataSource.highResEnabled = false + taskVisualsChangedDelegate.onHighResLoadingStateChanged(false) + + val firstThumbnailValue = task1ThumbnailValues.first()!! + assertThat(firstThumbnailValue.thumbnail).isEqualTo(expectedPreviousBitmap) + assertThat(firstThumbnailValue.reducedResolution).isFalse() + + val lastThumbnailValue = task1ThumbnailValues.last()!! + assertThat(lastThumbnailValue.thumbnail).isEqualTo(expectedPreviousBitmap) + assertThat(lastThumbnailValue.reducedResolution).isFalse() } @Test diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapperTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapperTest.kt index 124045fd69..7ca194afcf 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapperTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/mapper/TaskUiStateMapperTest.kt @@ -21,6 +21,7 @@ import android.graphics.Color import android.graphics.drawable.ShapeDrawable import android.platform.test.annotations.EnableFlags import android.view.Surface +import android.view.View import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.launcher3.Flags import com.android.quickstep.recents.ui.viewmodel.TaskData @@ -43,6 +44,7 @@ class TaskUiStateMapperTest { taskData = null, isLiveTile = false, hasHeader = false, + clickCloseListener = null, ) assertThat(result).isEqualTo(TaskThumbnailUiState.Uninitialized) } @@ -57,6 +59,7 @@ class TaskUiStateMapperTest { taskData = input, isLiveTile = true, hasHeader = false, + clickCloseListener = null, ) assertThat(result).isEqualTo(LiveTile.WithoutHeader) } @@ -72,14 +75,18 @@ class TaskUiStateMapperTest { TASK_DATA.copy(isLocked = true), TASK_DATA.copy(title = null), ) + val closeCallback = View.OnClickListener {} val expected = - LiveTile.WithHeader(header = ThumbnailHeader(TASK_ICON, TASK_TITLE_DESCRIPTION)) + LiveTile.WithHeader( + header = ThumbnailHeader(TASK_ICON, TASK_TITLE_DESCRIPTION, closeCallback) + ) inputs.forEach { taskData -> val result = TaskUiStateMapper.toTaskThumbnailUiState( taskData = taskData, isLiveTile = true, hasHeader = true, + clickCloseListener = closeCallback, ) assertThat(result).isEqualTo(expected) } @@ -101,6 +108,7 @@ class TaskUiStateMapperTest { taskData = taskData, isLiveTile = true, hasHeader = true, + clickCloseListener = {}, ) assertThat(result).isEqualTo(LiveTile.WithoutHeader) } @@ -113,6 +121,7 @@ class TaskUiStateMapperTest { taskData = TASK_DATA, isLiveTile = false, hasHeader = false, + clickCloseListener = null, ) val expected = @@ -133,6 +142,7 @@ class TaskUiStateMapperTest { @Test fun taskData_isStaticTile_withHeader_returns_SnapshotSplashWithHeader() { val inputs = listOf(TASK_DATA, TASK_DATA.copy(title = null)) + val closeCallback = View.OnClickListener {} val expected = TaskThumbnailUiState.SnapshotSplash( snapshot = @@ -140,7 +150,7 @@ class TaskUiStateMapperTest { backgroundColor = TASK_BACKGROUND_COLOR, bitmap = TASK_THUMBNAIL, thumbnailRotation = Surface.ROTATION_0, - header = ThumbnailHeader(TASK_ICON, TASK_TITLE_DESCRIPTION), + header = ThumbnailHeader(TASK_ICON, TASK_TITLE_DESCRIPTION, closeCallback), ), splash = TASK_ICON, ) @@ -150,6 +160,7 @@ class TaskUiStateMapperTest { taskData = taskData, isLiveTile = false, hasHeader = true, + clickCloseListener = closeCallback, ) assertThat(result).isEqualTo(expected) } @@ -176,6 +187,7 @@ class TaskUiStateMapperTest { taskData = taskData, isLiveTile = false, hasHeader = true, + clickCloseListener = {}, ) assertThat(result).isInstanceOf(TaskThumbnailUiState.SnapshotSplash::class.java) @@ -191,6 +203,7 @@ class TaskUiStateMapperTest { taskData = TASK_DATA.copy(thumbnailData = null), isLiveTile = false, hasHeader = false, + clickCloseListener = null, ) val expected = TaskThumbnailUiState.BackgroundOnly(TASK_BACKGROUND_COLOR) @@ -204,6 +217,7 @@ class TaskUiStateMapperTest { taskData = TASK_DATA.copy(isLocked = true), isLiveTile = false, hasHeader = false, + clickCloseListener = null, ) val expected = TaskThumbnailUiState.BackgroundOnly(TASK_BACKGROUND_COLOR) @@ -212,6 +226,7 @@ class TaskUiStateMapperTest { private companion object { const val TASK_TITLE_DESCRIPTION = "Title Description 1" + var TASK_ID = 1 val TASK_ICON = ShapeDrawable() val TASK_THUMBNAIL = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) val TASK_THUMBNAIL_DATA = @@ -219,7 +234,7 @@ class TaskUiStateMapperTest { val TASK_BACKGROUND_COLOR = Color.rgb(1, 2, 3) val TASK_DATA = TaskData.Data( - 1, + TASK_ID, title = "Task 1", titleDescription = TASK_TITLE_DESCRIPTION, icon = TASK_ICON, diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/usecase/GetThumbnailUseCaseTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/usecase/GetThumbnailUseCaseTest.kt deleted file mode 100644 index 90ef61d931..0000000000 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/usecase/GetThumbnailUseCaseTest.kt +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.quickstep.recents.usecase - -import android.content.ComponentName -import android.content.Intent -import android.graphics.Bitmap -import android.graphics.Color -import com.android.quickstep.recents.data.FakeTasksRepository -import com.android.systemui.shared.recents.model.Task -import com.android.systemui.shared.recents.model.ThumbnailData -import com.google.common.truth.Truth.assertThat -import org.junit.Test -import org.mockito.kotlin.mock -import org.mockito.kotlin.whenever - -/** Test for [GetThumbnailUseCase] */ -class GetThumbnailUseCaseTest { - private val task = - Task(Task.TaskKey(TASK_ID, 0, Intent(), ComponentName("", ""), 0, 2000)).apply { - colorBackground = Color.BLACK - } - private val thumbnailData = - ThumbnailData( - thumbnail = - mock().apply { - whenever(width).thenReturn(THUMBNAIL_WIDTH) - whenever(height).thenReturn(THUMBNAIL_HEIGHT) - } - ) - - private val tasksRepository = FakeTasksRepository() - private val systemUnderTest = GetThumbnailUseCase(tasksRepository) - - @Test - fun taskNotSeeded_returnsNull() { - assertThat(systemUnderTest.run(TASK_ID)).isNull() - } - - @Test - fun taskNotLoaded_returnsNull() { - tasksRepository.seedTasks(listOf(task)) - - assertThat(systemUnderTest.run(TASK_ID)).isNull() - } - - @Test - fun taskNotVisible_returnsNull() { - tasksRepository.seedTasks(listOf(task)) - tasksRepository.seedThumbnailData(mapOf(TASK_ID to thumbnailData)) - - assertThat(systemUnderTest.run(TASK_ID)).isNull() - } - - @Test - fun taskVisible_returnsThumbnail() { - tasksRepository.seedTasks(listOf(task)) - tasksRepository.seedThumbnailData(mapOf(TASK_ID to thumbnailData)) - tasksRepository.setVisibleTasks(setOf(TASK_ID)) - - assertThat(systemUnderTest.run(TASK_ID)).isEqualTo(thumbnailData.thumbnail) - } - - private companion object { - const val TASK_ID = 0 - const val THUMBNAIL_WIDTH = 100 - const val THUMBNAIL_HEIGHT = 200 - } -} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt index ee70e0a9d3..76d36d3658 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/AppPairsControllerTest.kt @@ -16,7 +16,9 @@ package com.android.quickstep.util +import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM import android.content.Context +import android.content.res.Resources import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.launcher3.apppairs.AppPairIcon import com.android.launcher3.logging.StatsLogManager @@ -28,6 +30,7 @@ import com.android.quickstep.TopTaskTracker import com.android.quickstep.TopTaskTracker.CachedTaskInfo import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.Task.TaskKey +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_33_66 import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50 import com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_66_33 @@ -54,6 +57,7 @@ import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) class AppPairsControllerTest { @Mock lateinit var context: Context + @Mock lateinit var resources: Resources @Mock lateinit var splitSelectStateController: SplitSelectStateController @Mock lateinit var statsLogManager: StatsLogManager @@ -109,6 +113,8 @@ class AppPairsControllerTest { doNothing() .whenever(spyAppPairsController) .launchToSide(anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull()) + whenever(mockAppPairIcon.context.resources).thenReturn(resources) + whenever(DesktopModeStatus.canEnterDesktopMode(mockAppPairIcon.context)).thenReturn(false) } @Test @@ -391,6 +397,68 @@ class AppPairsControllerTest { .launchToSide(anyOrNull(), anyOrNull(), anyOrNull(), eq(STAGE_POSITION_TOP_OR_LEFT)) } + @Test + fun handleAppPairLaunchInApp_freeformTask1IsOnScreen_shouldLaunchAppPair() { + whenever(DesktopModeStatus.canEnterDesktopMode(mockAppPairIcon.context)).thenReturn(true) + /// Test launching apps 1 and 2 from app pair + whenever(mockTaskKey1.getId()).thenReturn(1) + whenever(mockTaskKey2.getId()).thenReturn(2) + // Task 1 is in freeform windowing mode + mockTaskKey1.windowingMode = WINDOWING_MODE_FREEFORM + // ... and app 1 is already on screen + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + whenever(mockCachedTaskInfo.topGroupedTaskContainsTask(eq(1))).thenReturn(true) + } else { + whenever(mockCachedTaskInfo.taskId).thenReturn(1) + } + + // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback + spyAppPairsController.handleAppPairLaunchInApp( + mockAppPairIcon, + listOf(mockItemInfo1, mockItemInfo2), + ) + verify(splitSelectStateController) + .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) + val callback: Consumer> = callbackCaptor.value + callback.accept(arrayOf(mockTask1, mockTask2)) + + // Verify that launchAppPair was called + verify(spyAppPairsController, times(1)).launchAppPair(any(), any()) + verify(spyAppPairsController, never()) + .launchToSide(anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull()) + } + + @Test + fun handleAppPairLaunchInApp_freeformTask2IsOnScreen_shouldLaunchAppPair() { + whenever(DesktopModeStatus.canEnterDesktopMode(mockAppPairIcon.context)).thenReturn(true) + /// Test launching apps 1 and 2 from app pair + whenever(mockTaskKey1.getId()).thenReturn(1) + whenever(mockTaskKey2.getId()).thenReturn(2) + // Task 2 is in freeform windowing mode + mockTaskKey1.windowingMode = WINDOWING_MODE_FREEFORM + // ... and app 2 is already on screen + if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) { + whenever(mockCachedTaskInfo.topGroupedTaskContainsTask(eq(2))).thenReturn(true) + } else { + whenever(mockCachedTaskInfo.taskId).thenReturn(2) + } + + // Trigger app pair launch, capture and run callback from findLastActiveTasksAndRunCallback + spyAppPairsController.handleAppPairLaunchInApp( + mockAppPairIcon, + listOf(mockItemInfo1, mockItemInfo2), + ) + verify(splitSelectStateController) + .findLastActiveTasksAndRunCallback(any(), any(), callbackCaptor.capture()) + val callback: Consumer> = callbackCaptor.value + callback.accept(arrayOf(mockTask1, mockTask2)) + + // Verify that launchAppPair was called + verify(spyAppPairsController, times(1)).launchAppPair(any(), any()) + verify(spyAppPairsController, never()) + .launchToSide(anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull()) + } + @Test fun handleAppPairLaunchInApp_shouldLaunchAppPairNormallyWhenUnrelatedSingleAppIsFullscreen() { // Test launching apps 1 and 2 from app pair diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/DesktopTaskTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/DesktopTaskTest.kt index 7aed579f44..6fbf4823b7 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/DesktopTaskTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/DesktopTaskTest.kt @@ -29,35 +29,42 @@ class DesktopTaskTest { @Test fun testDesktopTask_sameInstance_isEqual() { - val task = DesktopTask(createTasks(1)) + val task = DesktopTask(deskId = 0, createTasks(1)) assertThat(task).isEqualTo(task) } @Test fun testDesktopTask_identicalConstructor_isEqual() { - val task1 = DesktopTask(createTasks(1)) - val task2 = DesktopTask(createTasks(1)) + val task1 = DesktopTask(deskId = 0, createTasks(1)) + val task2 = DesktopTask(deskId = 0, createTasks(1)) assertThat(task1).isEqualTo(task2) } @Test fun testDesktopTask_copy_isEqual() { - val task1 = DesktopTask(createTasks(1)) + val task1 = DesktopTask(deskId = 0, createTasks(1)) val task2 = task1.copy() assertThat(task1).isEqualTo(task2) } @Test - fun testDesktopTask_differentId_isNotEqual() { - val task1 = DesktopTask(createTasks(1)) - val task2 = DesktopTask(createTasks(2)) + fun testDesktopTask_differentDeskIds_isNotEqual() { + val task1 = DesktopTask(deskId = 0, createTasks(1)) + val task2 = DesktopTask(deskId = 1, createTasks(1)) + assertThat(task1).isNotEqualTo(task2) + } + + @Test + fun testDesktopTask_differentTaskIds_isNotEqual() { + val task1 = DesktopTask(deskId = 0, createTasks(1)) + val task2 = DesktopTask(deskId = 0, createTasks(2)) assertThat(task1).isNotEqualTo(task2) } @Test fun testDesktopTask_differentLength_isNotEqual() { - val task1 = DesktopTask(createTasks(1)) - val task2 = DesktopTask(createTasks(1, 2)) + val task1 = DesktopTask(deskId = 0, createTasks(1)) + val task2 = DesktopTask(deskId = 0, createTasks(1, 2)) assertThat(task1).isNotEqualTo(task2) } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GroupTaskTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GroupTaskTest.kt index fa043b969a..67fc62f772 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GroupTaskTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/GroupTaskTest.kt @@ -98,7 +98,7 @@ class GroupTaskTest { @Test fun testGroupTask_differentType_isNotEqual() { val task1 = SingleTask(createTask(1)) - val task2 = DesktopTask(listOf(createTask(1))) + val task2 = DesktopTask(deskId = 0, listOf(createTask(1))) assertThat(task1).isNotEqualTo(task2) } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt index 9d000a4687..c9d7e1dee9 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/SplitAnimationControllerTest.kt @@ -94,6 +94,7 @@ class SplitAnimationControllerTest { whenever(mockTaskContainer.task).thenReturn(mockTask) whenever(mockIconView.drawable).thenReturn(mockTaskViewDrawable) whenever(mockTaskView.taskContainers).thenReturn(List(1) { mockTaskContainer }) + whenever(mockTaskView.firstTaskContainer).thenReturn(mockTaskContainer) whenever(splitSelectSource.drawable).thenReturn(mockSplitSourceDrawable) whenever(splitSelectSource.view).thenReturn(mockSplitSourceView) diff --git a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java b/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java index fa2eb1ee14..d52d0548f9 100644 --- a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java +++ b/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java @@ -91,6 +91,7 @@ public final class WidgetsPredicationUpdateTaskTest { private AppWidgetProviderInfo mApp4Provider1; private AppWidgetProviderInfo mApp4Provider2; private AppWidgetProviderInfo mApp5Provider1; + private AppWidgetProviderInfo mApp6PinOnlyProvider1; private List allWidgets; private FakeBgDataModelCallback mCallback = new FakeBgDataModelCallback(); @@ -117,8 +118,14 @@ public final class WidgetsPredicationUpdateTaskTest { ComponentName.createRelative("app4", ".provider2")); mApp5Provider1 = createAppWidgetProviderInfo( ComponentName.createRelative("app5", "provider1")); + mApp6PinOnlyProvider1 = createAppWidgetProviderInfo( + ComponentName.createRelative("app6", "provider1"), + /*hideFromPicker=*/ true + ); + + allWidgets = Arrays.asList(mApp1Provider1, mApp1Provider2, mApp2Provider1, - mApp4Provider1, mApp4Provider2, mApp5Provider1); + mApp4Provider1, mApp4Provider2, mApp5Provider1, mApp6PinOnlyProvider1); mLauncherApps = mModelHelper.sandboxContext.spyService(LauncherApps.class); doAnswer(i -> { @@ -270,6 +277,32 @@ public final class WidgetsPredicationUpdateTaskTest { }); } + @Test + public void widgetsRecommendations_excludesWidgetsHiddenForPicker() { + runOnExecutorSync(MODEL_EXECUTOR, () -> { + + // Not installed widget - hence eligible + AppTarget widget1 = new AppTarget(new AppTargetId("app1"), "app1", "provider1", + mUserHandle); + // Provider marked as hidden from picker - hence not eligible + AppTarget widget6 = new AppTarget(new AppTargetId("app6"), "app6", "provider1", + mUserHandle); + + mCallback.mRecommendedWidgets = null; + mModelHelper.getModel().enqueueModelUpdateTask( + newWidgetsPredicationTask(List.of(widget1, widget6))); + runOnExecutorSync(MAIN_EXECUTOR, () -> { }); + + // Only widget 1 (and no widget 6 as its meant to be hidden from picker). + List recommendedWidgets = mCallback.mRecommendedWidgets.items + .stream() + .map(itemInfo -> (PendingAddWidgetInfo) itemInfo) + .collect(Collectors.toList()); + assertThat(recommendedWidgets).hasSize(1); + assertThat(recommendedWidgets.get(0).componentName.getPackageName()).isEqualTo("app1"); + }); + } + private void assertWidgetInfo( LauncherAppWidgetProviderInfo actual, AppWidgetProviderInfo expected) { assertThat(actual.provider).isEqualTo(expected.provider); diff --git a/quickstep/tests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt b/quickstep/tests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt new file mode 100644 index 0000000000..4b8f2a2348 --- /dev/null +++ b/quickstep/tests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt @@ -0,0 +1,80 @@ +/* + * 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.statehandlers + +import android.content.Context +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.quickstep.SystemUiProxy +import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND +import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND +import com.android.wm.shell.shared.desktopmode.DesktopModeStatus +import org.junit.After +import org.junit.Assert.assertFalse +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever +import org.mockito.quality.Strictness + +/** + * Tests the behavior of [DesktopVisibilityController] in regards to multiple desktops and multiple + * displays. + */ +@SmallTest +@RunWith(AndroidJUnit4::class) +class DesktopVisibilityControllerTest { + + @get:Rule val setFlagsRule = SetFlagsRule() + + private val mockitoSession = + mockitoSession() + .strictness(Strictness.LENIENT) + .mockStatic(DesktopModeStatus::class.java) + .startMocking() + + private val context = mock() + private val systemUiProxy = mock() + private val lifeCycleTracker = mock() + private lateinit var desktopVisibilityController: DesktopVisibilityController + + @Before + fun setUp() { + whenever(context.resources).thenReturn(mock()) + whenever(DesktopModeStatus.enableMultipleDesktops(context)).thenReturn(true) + desktopVisibilityController = + DesktopVisibilityController(context, systemUiProxy, lifeCycleTracker) + } + + @After + fun tearDown() { + mockitoSession.finishMocking() + } + + @Test + @EnableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND) + fun noCrashWhenCheckingNonExistentDisplay() { + assertFalse(desktopVisibilityController.isInDesktopMode(displayId = 500)) + assertFalse(desktopVisibilityController.isInDesktopModeAndNotInOverview(displayId = 300)) + } +} diff --git a/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt b/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt index 76aab39f1b..a523e02196 100644 --- a/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt @@ -20,6 +20,7 @@ import android.content.ComponentName import android.content.Context import android.content.Intent import android.content.pm.PackageManager +import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags import android.view.Display.DEFAULT_DISPLAY import androidx.test.platform.app.InstrumentationRegistry @@ -106,6 +107,7 @@ class DesktopSystemShortcutTest { @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY) + @DisableFlags(Flags.FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PERMISSION) fun createDesktopTaskShortcutFactory_transparentTask() { val baseComponent = ComponentName("", /* class */ "") val taskKey = diff --git a/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt b/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt index 818841a70c..2db94f6f1a 100644 --- a/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt +++ b/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt @@ -20,6 +20,7 @@ import android.content.ComponentName import android.content.Context import android.content.Intent import android.content.pm.PackageManager +import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags import android.platform.test.flag.junit.SetFlagsRule import android.view.Display.DEFAULT_DISPLAY @@ -113,6 +114,7 @@ class ExternalDisplaySystemShortcutTest { Flags.FLAG_MOVE_TO_EXTERNAL_DISPLAY_SHORTCUT, Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY, ) + @DisableFlags(Flags.FLAG_ENABLE_MODALS_FULLSCREEN_WITH_PERMISSION) fun createExternalDisplayTaskShortcut_transparentTask() { val baseComponent = ComponentName("", /* class */ "") val taskKey = diff --git a/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java b/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java index a0ec63577d..154d86d977 100644 --- a/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java +++ b/quickstep/tests/src/com/android/quickstep/OrientationTouchTransformerTest.java @@ -300,7 +300,7 @@ public class OrientationTouchTransformerTest { @Test public void testSimpleOrientationTouchTransformer() { final DisplayController displayController = mock(DisplayController.class); - doReturn(mInfo).when(displayController).getInfo(); + doReturn(mInfo).when(displayController).getInfoForDisplay(anyInt()); final SimpleOrientationTouchTransformer transformer = new SimpleOrientationTouchTransformer(getApplicationContext(), displayController, mock(DaggerSingletonTracker.class)); diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 79d3c19a0f..1c87bce61e 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -23,6 +23,7 @@ import static com.android.quickstep.TaskbarModeSwitchRule.Mode.TRANSIENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; @@ -50,6 +51,7 @@ import com.android.launcher3.tapl.Workspace; import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; import com.android.launcher3.util.TestUtil; import com.android.launcher3.util.Wait; +import com.android.launcher3.util.rule.ScreenRecordRule; import com.android.launcher3.util.rule.TestStabilityRule; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch; @@ -62,6 +64,7 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.Comparator; import java.util.function.Consumer; import java.util.function.Function; @@ -541,6 +544,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @Test @PortraitLandscape + @ScreenRecordRule.ScreenRecord // TODO(b/396447643): Remove screen record. public void testDismissCancel() throws Exception { startTestAppsWithCheck(); Overview overview = mLauncher.goHome().switchToOverview(); @@ -557,6 +561,60 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { numTasks == null ? 0 : numTasks, recentsView.getTaskViewCount())); } + @Test + @PortraitLandscape + public void testDismissBottomRow() throws Exception { + assumeTrue(mLauncher.isTablet()); + mLauncher.goHome().switchToOverview().dismissAllTasks(); + startTestAppsWithCheck(); + Overview overview = mLauncher.goHome().switchToOverview(); + assertIsInState("Launcher internal state didn't switch to Overview", + ExpectedState.OVERVIEW); + final Integer numTasks = getFromRecentsView(RecentsView::getTaskViewCount); + OverviewTask bottomTask = overview.getCurrentTasksForTablet().stream().max( + Comparator.comparingInt(OverviewTask::getTaskCenterY)).get(); + assertNotNull("bottomTask null", bottomTask); + + bottomTask.dismiss(); + + runOnRecentsView(recentsView -> assertEquals( + "Dismissing a bottomTask didn't remove 1 bottomTask from Overview", + numTasks - 1, recentsView.getTaskViewCount())); + } + + @Test + @PortraitLandscape + public void testDismissLastGridRow() throws Exception { + assumeTrue(mLauncher.isTablet()); + mLauncher.goHome().switchToOverview().dismissAllTasks(); + startTestAppsWithCheck(); + startTestActivity(3); + startTestActivity(4); + runOnRecentsView( + recentsView -> assertNotEquals("Grid overview should have unequal row counts", + recentsView.getTopRowTaskCountForTablet(), + recentsView.getBottomRowTaskCountForTablet())); + Overview overview = mLauncher.goHome().switchToOverview(); + assertIsInState("Launcher internal state didn't switch to Overview", + ExpectedState.OVERVIEW); + overview.flingForwardUntilClearAllVisible(); + assertTrue("Clear All not visible.", overview.isClearAllVisible()); + final Integer numTasks = getFromRecentsView(RecentsView::getTaskViewCount); + OverviewTask lastGridTask = overview.getCurrentTasksForTablet().stream().min( + Comparator.comparingInt(OverviewTask::getTaskCenterX)).get(); + assertNotNull("lastGridTask null.", lastGridTask); + + lastGridTask.dismiss(); + + runOnRecentsView(recentsView -> assertEquals( + "Dismissing a lastGridTask didn't remove 1 lastGridTask from Overview", + numTasks - 1, recentsView.getTaskViewCount())); + runOnRecentsView(recentsView -> assertEquals("Grid overview should have equal row counts.", + recentsView.getTopRowTaskCountForTablet(), + recentsView.getBottomRowTaskCountForTablet())); + assertTrue("Clear All not visible.", overview.isClearAllVisible()); + } + private void startTestAppsWithCheck() throws Exception { startTestApps(); expectLaunchedAppState(); diff --git a/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt b/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt new file mode 100644 index 0000000000..b4d9f5b396 --- /dev/null +++ b/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt @@ -0,0 +1,279 @@ +/* + * 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.quickstep.desktop + +import android.animation.Animator +import android.animation.AnimatorSet +import android.animation.ValueAnimator +import android.app.ActivityManager +import android.app.WindowConfiguration +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.res.Resources +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.util.DisplayMetrics +import android.view.SurfaceControl +import android.view.WindowManager +import android.window.TransitionInfo +import androidx.core.util.Supplier +import com.android.app.animation.Interpolators +import com.android.internal.jank.Cuj +import com.android.launcher3.desktop.DesktopAppLaunchAnimatorHelper +import com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType +import com.android.launcher3.util.Executors.MAIN_EXECUTOR +import com.android.window.flags.Flags +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +class DesktopAppLaunchAnimatorHelperTest { + + @get:Rule val setFlagsRule = SetFlagsRule() + + private val context = mock() + private val resources = mock() + private val transaction = mock() + private val transactionSupplier = mock>() + + private lateinit var helper: DesktopAppLaunchAnimatorHelper + + @Before + fun setUp() { + helper = + DesktopAppLaunchAnimatorHelper( + context = context, + launchType = AppLaunchType.LAUNCH, + cujType = Cuj.CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_INTENT, + transactionSupplier = transactionSupplier, + ) + whenever(transactionSupplier.get()).thenReturn(transaction) + whenever(transaction.setCrop(any(), any())).thenReturn(transaction) + whenever(transaction.setCornerRadius(any(), any())).thenReturn(transaction) + + whenever(context.resources).thenReturn(resources) + whenever(resources.displayMetrics).thenReturn(DisplayMetrics()) + whenever(context.mainThreadHandler).thenReturn(MAIN_EXECUTOR.handler) + } + + @Test + fun launchTransition_returnsLaunchAnimator() { + val openChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_OPEN + taskInfo = TASK_INFO_FREEFORM + } + val transitionInfo = TransitionInfo(WindowManager.TRANSIT_NONE, 0) + transitionInfo.addChange(openChange) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(1) + assertLaunchAnimator(actual[0]) + } + + @Test + fun minimizeTransition_returnsLaunchAndMinimizeAnimator() { + val openChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_OPEN + taskInfo = TASK_INFO_FREEFORM + } + val minimizeChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_TO_BACK + taskInfo = TASK_INFO_FREEFORM + } + val transitionInfo = TransitionInfo(WindowManager.TRANSIT_NONE, 0) + transitionInfo.addChange(openChange) + transitionInfo.addChange(minimizeChange) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(2) + assertLaunchAnimator(actual[0]) + assertMinimizeAnimator(actual[1]) + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX) + fun trampolineTransition_flagEnabled_returnsLaunchAndCloseAnimator() { + val openChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_OPEN + taskInfo = TASK_INFO_FREEFORM + } + val closeChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_CLOSE + taskInfo = TASK_INFO_FREEFORM + } + val transitionInfo = TransitionInfo(WindowManager.TRANSIT_NONE, 0) + transitionInfo.addChange(openChange) + transitionInfo.addChange(closeChange) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(2) + assertTrampolineLaunchAnimator(actual[0]) + assertCloseAnimator(actual[1]) + } + + @Test + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX) + fun trampolineTransition_flagDisabled_returnsLaunchAnimator() { + val openChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_OPEN + taskInfo = TASK_INFO_FREEFORM + } + val closeChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_CLOSE + taskInfo = TASK_INFO_FREEFORM + } + val transitionInfo = TransitionInfo(WindowManager.TRANSIT_NONE, 0) + transitionInfo.addChange(openChange) + transitionInfo.addChange(closeChange) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(1) + assertLaunchAnimator(actual[0]) + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX) + fun trampolineTransition_flagEnabled_hitDesktopWindowLimit_returnsLaunchMinimizeCloseAnimator() { + val openChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_OPEN + taskInfo = TASK_INFO_FREEFORM + } + val minimizeChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_TO_BACK + taskInfo = TASK_INFO_FREEFORM + } + val closeChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_CLOSE + taskInfo = TASK_INFO_FREEFORM + } + val transitionInfo = TransitionInfo(WindowManager.TRANSIT_NONE, 0) + transitionInfo.addChange(openChange) + transitionInfo.addChange(minimizeChange) + transitionInfo.addChange(closeChange) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(3) + assertTrampolineLaunchAnimator(actual[0]) + assertMinimizeAnimator(actual[1]) + assertCloseAnimator(actual[2]) + } + + @Test + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_TRAMPOLINE_CLOSE_ANIMATION_BUGFIX) + fun trampolineTransition_flagDisabled_hitDesktopWindowLimit_returnsLaunchMinimizeAnimator() { + val openChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_OPEN + taskInfo = TASK_INFO_FREEFORM + } + val minimizeChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_TO_BACK + taskInfo = TASK_INFO_FREEFORM + } + val closeChange = + TransitionInfo.Change(mock(), mock()).apply { + mode = WindowManager.TRANSIT_CLOSE + taskInfo = TASK_INFO_FREEFORM + } + val transitionInfo = TransitionInfo(WindowManager.TRANSIT_NONE, 0) + transitionInfo.addChange(openChange) + transitionInfo.addChange(minimizeChange) + transitionInfo.addChange(closeChange) + + val actual = helper.createAnimators(transitionInfo, finishCallback = {}) + + assertThat(actual).hasSize(2) + assertLaunchAnimator(actual[0]) + assertMinimizeAnimator(actual[1]) + } + + private fun assertLaunchAnimator(animator: Animator) { + assertThat(animator).isInstanceOf(AnimatorSet::class.java) + assertThat((animator as AnimatorSet).childAnimations.size).isEqualTo(2) + assertThat(animator.childAnimations[0]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[0].interpolator) + .isEqualTo(AppLaunchType.LAUNCH.boundsAnimationParams.interpolator) + assertThat(animator.childAnimations[0].duration) + .isEqualTo(AppLaunchType.LAUNCH.boundsAnimationParams.durationMs) + assertThat(animator.childAnimations[1]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[1].interpolator).isEqualTo(Interpolators.LINEAR) + assertThat(animator.childAnimations[1].duration) + .isEqualTo(AppLaunchType.LAUNCH.alphaDurationMs) + } + + private fun assertTrampolineLaunchAnimator(animator: Animator) { + assertThat(animator).isInstanceOf(AnimatorSet::class.java) + assertThat((animator as AnimatorSet).childAnimations.size).isEqualTo(1) + assertThat(animator.childAnimations[0]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[0].interpolator).isEqualTo(Interpolators.LINEAR) + assertThat(animator.childAnimations[0].duration) + .isEqualTo(AppLaunchType.LAUNCH.alphaDurationMs) + } + + private fun assertMinimizeAnimator(animator: Animator) { + assertThat(animator).isInstanceOf(AnimatorSet::class.java) + assertThat((animator as AnimatorSet).childAnimations.size).isEqualTo(2) + assertThat(animator.childAnimations[0]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[0].interpolator) + .isInstanceOf(Interpolators.STANDARD_ACCELERATE::class.java) + assertThat(animator.childAnimations[0].duration).isEqualTo(200) + assertThat(animator.childAnimations[1]).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.childAnimations[1].interpolator) + .isInstanceOf(Interpolators.LINEAR::class.java) + assertThat(animator.childAnimations[1].duration).isEqualTo(100) + } + + private fun assertCloseAnimator(animator: Animator) { + assertThat(animator).isInstanceOf(ValueAnimator::class.java) + assertThat(animator.interpolator).isInstanceOf(Interpolators.LINEAR::class.java) + assertThat(animator.duration).isEqualTo(100) + } + + private companion object { + val TASK_INFO_FREEFORM = + ActivityManager.RunningTaskInfo().apply { + baseIntent = + Intent().apply { + component = ComponentName("com.example.app", "com.example.app.MainActivity") + } + configuration.windowConfiguration.windowingMode = + WindowConfiguration.WINDOWING_MODE_FREEFORM + } + } +} diff --git a/res/drawable/private_space_install_app_icon.xml b/res/drawable/private_space_install_app_icon.xml index cfec2b126d..1e7fe43527 100644 --- a/res/drawable/private_space_install_app_icon.xml +++ b/res/drawable/private_space_install_app_icon.xml @@ -13,19 +13,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - - - - - + + + + diff --git a/res/drawable/private_space_install_app_icon_foreground.xml b/res/drawable/private_space_install_app_icon_foreground.xml new file mode 100644 index 0000000000..d55abe7304 --- /dev/null +++ b/res/drawable/private_space_install_app_icon_foreground.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 6d44a97606..98571addce 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -62,7 +62,7 @@ "Приспособления" "Търсене" "Изчистване на текста от полето за търсене" - "Няма налице преки пътища и приспособления" + "Няма налични преки пътища и приспособления" "Няма открити преки пътища или приспособления" "Лични" "Служебни" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index ff8a541022..c0568bf28f 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -41,7 +41,7 @@ "Dodirnite i zadržite da pomjerite vidžet." "Dvaput dodirnite i zadržite da pomjerite vidžet ili da koristite prilagođene radnje." "Više opcija" - "Prikazuj sve vidžete" + "Prikaži sve vidžete" "%1$d × %2$d" "Širina %1$d, visina %2$d" "Vidžet %1$s" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 2ac7233b54..b9f0ba271a 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -46,12 +46,12 @@ "šířka %1$d, výška %2$d" "%1$s widget" "Widget %1$s, šířka %2$d, výška %3$d" - "Pokud chcete widgetem pohybovat po ploše, podržte ho" + "Pokud chcete widgetem pohybovat po ploše, podržte ho." "Přidat na plochu" "Widget %1$s byl přidán na plochu" "Návrhy" "Nejdůležitější aplikace" - "Zprávy a časopisy" + "Noviny a časopisy" "Zábava" "Sociální sítě" "Návrhy pro vás" @@ -127,7 +127,7 @@ "Složka: %1$s, počet položek: %2$d nebo více" "Nepojmenovaná složka" "Dvojice aplikací: %1$s a %2$s" - "Tapeta a styl" + "Tapety a styl" "Upravit plochu" "Nastavení plochy" "Zakázáno administrátorem" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index c45d37231e..abaaa89750 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -64,8 +64,8 @@ "پاک کردن نوشتار از چارگوش جستجو" "ابزاره و میان‌بری دردسترس نیست" "هیچ ابزاره یا میان‌بری پیدا نشد" - "ابزاره‌های شخصی" - "ابزاره‌های کاری" + "شخصی" + "کاری" "مکالمه‌ها" "یادداشت‌برداری" "نشان دادن دکمه افزودن" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 49252945b3..5a33983b64 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -60,7 +60,7 @@ "{count,plural, =1{# શૉર્ટકટ}one{# શૉર્ટકટ}other{# શૉર્ટકટ}}" "%1$s, %2$s" "વિજેટ" - "શોધ" + "શોધો" "શોધ બૉક્સમાંથી ટેક્સ્ટ સાફ કરો" "વિજેટ અને શૉર્ટકટ ઉપલબ્ધ નથી" "કોઈ વિજેટ અથવા શૉર્ટકટ મળ્યા નથી" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 75e7cd28dd..314513367f 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -46,7 +46,7 @@ "%1$d di larghezza per %2$d di altezza" "Widget %1$s" "Widget %1$s, %2$d di larghezza per %3$d di altezza" - "Tocca e tieni premuto il widget per spostarlo nella schermata Home" + "Tieni premuto il widget per spostarlo nella schermata Home" "Aggiungi alla schermata Home" "Widget %1$s aggiunto alla schermata Home" "Suggerimenti" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index b6b5b66849..b98b61d2cc 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -46,7 +46,7 @@ "Туурасы: %1$d, бийиктиги: %2$d" "%1$s виджети" "%1$s виджети, кеңдиги %2$d жана бийиктиги %3$d" - "Башкы экранга жылдыруу үчүн виджетти коё бербей басып туруңуз" + "Вижетти коё бербей басып туруп башкы экранга жылдырыңыз" "Башкы экранга кошуу" "%1$s виджети башкы экранга кошулду" "Сунуштар" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index bd792acebe..1a4a3f26c4 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -28,7 +28,7 @@ "Sparčiojo klavišo negalima naudoti" "Pagrindinis" "Nustatykite „%1$s“ kaip numatytąją pagrindinę programą skiltyje „Nustatymai“" - "Išskaidyto ekrano režimas" + "Išskaidytas ekranas" "Programos „%1$s“ informacija" "„%1$s“ naudojimo nustatymai" "Naujas langas" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 3031259e75..3eb680fb66 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -60,10 +60,10 @@ "{count,plural, =1{#ଟି ସର୍ଟକଟ୍}other{#ଟି ସର୍ଟକଟ୍}}" "%1$s, %2$s" "ୱିଜେଟ୍‌" - "ସନ୍ଧାନ କରନ୍ତୁ" + "ସର୍ଚ୍ଚ କରନ୍ତୁ" "ସନ୍ଧାନ ବାକ୍ସରୁ ଟେକ୍ସଟ୍ ଖାଲି କରନ୍ତୁ" "ୱିଜେଟ୍ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକ ଉପଲବ୍ଧ ନାହିଁ" - "କୌଣସି ୱିଜେଟ୍ କିମ୍ବା ସର୍ଟକଟ୍ ମିଳିଲା ନାହିଁ" + "କୌଣସି ୱିଜେଟ କିମ୍ବା ସର୍ଟକଟ ମିଳିଲା ନାହିଁ" "ବ୍ୟକ୍ତିଗତ" "ୱାର୍କ" "ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ" @@ -164,7 +164,7 @@ "ହୋମ ସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ" "ଆଇଟମ୍‌କୁ ଏଠାକୁ ଘୁଞ୍ଚାନ୍ତୁ" "ଆଇଟମକୁ କାଢ଼ି ଦିଆଯାଇଛି" - "ପୂର୍ବବତ କରନ୍ତୁ" + "ଅନଡୁ କରନ୍ତୁ" "ଆଇଟମ୍‌ ଘୁଞ୍ଚାନ୍ତୁ" "%3$sରେ ଧାଡି %1$s ସ୍ତମ୍ଭ %2$sକୁ ମୁଭ କରନ୍ତୁ" "%1$s ସ୍ଥିତିକୁ ନିଅନ୍ତୁ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index c15e2e9599..17ecb78c66 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -94,7 +94,7 @@ "ਕਾਰਜ-ਸਥਾਨ ਸੰਬੰਧੀ ਐਪਾਂ ਦੀ ਸੂਚੀ" "ਹਟਾਓ" "ਅਣਸਥਾਪਤ ਕਰੋ" - "ਐਪ ਜਾਣਕਾਰੀ" + "ਐਪ ਸੰਬੰਧੀ ਜਾਣਕਾਰੀ" "ਪ੍ਰਾਈਵੇਟ ਵਜੋਂ ਸਥਾਪਤ ਕਰੋ" "ਐਪ ਅਣਸਥਾਪਤ ਕਰੋ" "ਸਥਾਪਤ ਕਰੋ" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 701bb25d0d..e016f204b0 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -64,7 +64,7 @@ "Limpe o texto da caixa de pesquisa" "Os widgets e os atalhos não estão disponíveis" "Nenhum widget ou atalho encontrado" - "Pessoais" + "Pessoal" "Trabalho" "Conversas" "Tomar notas" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index ad5e28196e..d2bca5270b 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -64,8 +64,8 @@ "Rensa texten från sökrutan" "Widgetar och genvägar är inte tillgängliga" "Inga widgetar eller genvägar hittades" - "Privat" - "Arbete" + "Personligt" + "Jobb" "Konversationer" "Anteckna" "Visa knappen Lägg till" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index b6563b00ab..4b2591299e 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -46,14 +46,14 @@ "%1$d వెడల్పు X %2$d ఎత్తు" "%1$s విడ్జెట్" "%1$s విడ్జెట్, %2$d వెడల్పు %3$d ఎత్తు ఉండాలి" - "విడ్జెట్‌ను మొదటి స్క్రీన్‌లో తిప్పడానికి దాన్ని తాకి, & నొక్కి పట్టుకోండి" + "విడ్జెట్‌ను మొదటి స్క్రీన్‌లో అటు, ఇటు కదపడానికి దాన్ని తాకి, నొక్కి పట్టుకోండి" "మొదటి స్క్రీన్‌కు జోడించండి" "మొదటి స్క్రీన్‌కు %1$s విడ్జెట్ జోడించబడింది" "సూచనలు" "నిత్యావసరాలు" "వార్తలు & మ్యాగజైన్లు" "వినోదం" - "సామాజికం" + "సోషల్ మీడియా" "మీ కోసం సూచించినవి" "కుడి వైపున %1$s విడ్జెట్‌లు, ఎడమ వైపున సెర్చ్, ఇతర ఆప్షన్‌లు" "{count,plural, =1{# విడ్జెట్}other{# విడ్జెట్‌లు}}" @@ -64,8 +64,8 @@ "సెర్చ్ బాక్స్ నుండి టెక్స్ట్‌ను క్లియర్ చేయండి" "విడ్జెట్‌లు, షార్ట్‌కట్‌లు అందుబాటులో లేవు" "విడ్జెట్‌లు లేదా షార్ట్‌కట్‌లు కనుగొనబడలేదు" - "వ్యక్తిగత గ్యాడ్జెట్స్" - "ఆఫీస్" + "వ్యక్తిగత విడ్జెట్స్" + "వర్క్ విడ్జెట్స్" "సంభాషణలు" "నోట్-టేకింగ్" "యాడ్‌ చేసే (జోడించే) బటన్‌ను చూపండి" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index cb47400387..3fdae5946a 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -31,7 +31,7 @@ "Bölünmüş ekran" "%1$s uygulama bilgileri" "%1$s ile ilgili kullanım ayarları" - "Yeni Pencere" + "Yeni pencere" "Pencereleri yönet" "Uygulama çiftini kaydedin" "%1$s | %2$s" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index ed002bae0b..855a8c33b2 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -32,7 +32,7 @@ "‏%1$s کے لیے ایپ کی معلومات" "‏%1$s کیلئے استعمال کی ترتیبات" "نئی ونڈو" - "‏‫Windows کا نظم کریں" + "ونڈوز کا نظم کریں" "ایپس کے جوڑے کو محفوظ کریں" "%1$s | %2$s" "ایپس کا یہ جوڑا اس آلے پر تعاون یافتہ نہیں ہے" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index cecfedba04..febc8c2764 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -127,7 +127,7 @@ "文件夹:%1$s,%2$d 个或更多项目" "未命名文件夹" "应用对:“%1$s”和“%2$s”" - "壁纸与个性化" + "壁纸与风格" "修改主屏幕" "主屏幕设置" "已被您的管理员停用" diff --git a/res/values/config.xml b/res/values/config.xml index 07f97bc4b7..1a2ac9e928 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -67,7 +67,6 @@ - @@ -75,8 +74,6 @@ - - diff --git a/res/values/dimens.xml b/res/values/dimens.xml index c3cb31db5c..7aa709d117 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -307,6 +307,7 @@ 6dp + 4dp 10dp diff --git a/res/values/id.xml b/res/values/id.xml index 67692d8fee..78b8308cc9 100644 --- a/res/values/id.xml +++ b/res/values/id.xml @@ -79,6 +79,7 @@ + diff --git a/res/values/strings.xml b/res/values/strings.xml index a02516a44f..56befd679f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -293,6 +293,9 @@ New home screen page + Active + Minimized + Folder opened, %1$d by %2$d diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index 753b2e2978..b90200b88c 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -126,7 +126,8 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch /** Type of popups that should get exclusive accessibility focus. */ public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER & ~TYPE_ALL_APPS_EDU & ~TYPE_TASKBAR_ALL_APPS & ~TYPE_PIN_IME_POPUP - & ~TYPE_WIDGET_RESIZE_FRAME & ~TYPE_ONE_GRID_MIGRATION_EDU & ~TYPE_ON_BOARD_POPUP; + & ~TYPE_WIDGET_RESIZE_FRAME & ~TYPE_ONE_GRID_MIGRATION_EDU & ~TYPE_ON_BOARD_POPUP + & ~TYPE_TASKBAR_OVERLAY_PROXY; // These view all have particular operation associated with swipe down interaction. public static final int TYPE_STATUS_BAR_SWIPE_DOWN_DISALLOW = TYPE_WIDGETS_BOTTOM_SHEET | diff --git a/src/com/android/launcher3/AppFilter.java b/src/com/android/launcher3/AppFilter.java index 3db456cbdb..8ee7053ccb 100644 --- a/src/com/android/launcher3/AppFilter.java +++ b/src/com/android/launcher3/AppFilter.java @@ -3,10 +3,14 @@ package com.android.launcher3; import android.content.ComponentName; import android.content.Context; +import com.android.launcher3.dagger.ApplicationContext; + import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; +import javax.inject.Inject; + /** * Utility class to filter out components from various lists */ @@ -14,7 +18,8 @@ public class AppFilter { private final Set mFilteredComponents; - public AppFilter(Context context) { + @Inject + public AppFilter(@ApplicationContext Context context) { mFilteredComponents = Arrays.stream( context.getResources().getStringArray(R.array.filtered_components)) .map(ComponentName::unflattenFromString) diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 6277e41c14..84c80402b2 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -481,10 +481,8 @@ public abstract class BaseActivity extends Activity implements ActivityContext, public static T fromContext(Context context) { if (context instanceof BaseActivity) { return (T) context; - } else if (context instanceof ActivityContextDelegate) { - return (T) ((ActivityContextDelegate) context).mDelegate; - } else if (context instanceof ContextWrapper) { - return fromContext(((ContextWrapper) context).getBaseContext()); + } else if (context instanceof ContextWrapper cw) { + return fromContext(cw.getBaseContext()); } else { throw new IllegalArgumentException("Cannot find BaseActivity in parent tree"); } diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index e6b34574a9..730ad7858e 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -20,6 +20,9 @@ import static android.graphics.fonts.FontStyle.FONT_WEIGHT_BOLD; import static android.graphics.fonts.FontStyle.FONT_WEIGHT_NORMAL; import static android.text.Layout.Alignment.ALIGN_NORMAL; +import static com.android.launcher3.BubbleTextView.RunningAppState.RUNNING; +import static com.android.launcher3.BubbleTextView.RunningAppState.NOT_RUNNING; +import static com.android.launcher3.BubbleTextView.RunningAppState.MINIMIZED; import static com.android.launcher3.Flags.enableContrastTiles; import static com.android.launcher3.Flags.enableCursorHoverStates; import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon; @@ -27,6 +30,7 @@ import static com.android.launcher3.icons.BitmapInfo.FLAG_NO_BADGE; import static com.android.launcher3.icons.BitmapInfo.FLAG_SKIP_USER_BADGE; import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED; import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound; +import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK; @@ -75,7 +79,6 @@ import com.android.launcher3.dot.DotInfo; import com.android.launcher3.dragndrop.DragOptions.PreDragCondition; import com.android.launcher3.dragndrop.DraggableView; import com.android.launcher3.folder.FolderIcon; -import com.android.launcher3.graphics.IconShape; import com.android.launcher3.graphics.PreloadIconDrawable; import com.android.launcher3.icons.DotRenderer; import com.android.launcher3.icons.FastBitmapDrawable; @@ -208,6 +211,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, private final int mRunningAppIndicatorColor; private final int mMinimizedAppIndicatorColor; + private final String mMinimizedStateDescription; + private final String mRunningStateDescription; + /** * Various options for the running state of an app. */ @@ -240,6 +246,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, super(context, attrs, defStyle); mActivity = ActivityContext.lookupContext(context); FastBitmapDrawable.setFlagHoverEnabled(enableCursorHoverStates()); + mMinimizedStateDescription = getContext().getString( + R.string.app_minimized_state_description); + mRunningStateDescription = getContext().getString(R.string.app_running_state_description); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BubbleTextView, defStyle, 0); @@ -432,6 +441,19 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, invalidate(); } + /** + * Returns state description of this icon. + */ + public String getIconStateDescription() { + if (mRunningAppState == MINIMIZED) { + return mMinimizedStateDescription; + } else if (mRunningAppState == RUNNING) { + return mRunningStateDescription; + } else { + return ""; + } + } + protected void setItemInfo(ItemInfoWithIcon itemInfo) { setTag(itemInfo); } @@ -723,8 +745,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, protected void drawDotIfNecessary(Canvas canvas) { if (!mForceHideDot && (hasDot() || mDotParams.scale > 0)) { getIconBounds(mDotParams.iconBounds); - Utilities.scaleRectAboutCenter(mDotParams.iconBounds, - IconShape.INSTANCE.get(getContext()).getNormalizationScale()); + Utilities.scaleRectAboutCenter(mDotParams.iconBounds, ICON_VISIBLE_AREA_FACTOR); final int scrollX = getScrollX(); final int scrollY = getScrollY(); canvas.translate(scrollX, scrollY); @@ -769,15 +790,13 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, /** Draws a line under the app icon if this is representing a running app in Desktop Mode. */ protected void drawRunningAppIndicatorIfNecessary(Canvas canvas) { - if (mRunningAppState == RunningAppState.NOT_RUNNING || mDisplay != DISPLAY_TASKBAR) { + if (mRunningAppState == NOT_RUNNING || mDisplay != DISPLAY_TASKBAR) { return; } getIconBounds(mRunningAppIconBounds); - Utilities.scaleRectAboutCenter( - mRunningAppIconBounds, - IconShape.INSTANCE.get(getContext()).getNormalizationScale()); + Utilities.scaleRectAboutCenter(mRunningAppIconBounds, ICON_VISIBLE_AREA_FACTOR); - final boolean isMinimized = mRunningAppState == RunningAppState.MINIMIZED; + final boolean isMinimized = mRunningAppState == MINIMIZED; final int indicatorTop = mRunningAppIconBounds.bottom + mRunningAppIndicatorTopMargin; final int indicatorWidth = isMinimized ? mMinimizedAppIndicatorWidth : mRunningAppIndicatorWidth; diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 257f911852..0ce966b99b 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -16,7 +16,6 @@ package com.android.launcher3; -import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.dragndrop.DraggableView.DRAGGABLE_ICON; import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_REORDER_PREVIEW_OFFSET; @@ -71,7 +70,6 @@ import com.android.launcher3.dragndrop.DraggableView; import com.android.launcher3.folder.PreviewBackground; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; -import com.android.launcher3.statemanager.StateManager; import com.android.launcher3.util.CellAndSpan; import com.android.launcher3.util.GridOccupancy; import com.android.launcher3.util.MSDLPlayerWrapper; @@ -791,18 +789,8 @@ public class CellLayout extends ViewGroup { // Whenever an app is added, if Accessibility service is enabled, focus on that app. if (mActivity instanceof Launcher) { - Launcher.cast(mActivity).getStateManager().addStateListener( - new StateManager.StateListener() { - @Override - public void onStateTransitionComplete(LauncherState finalState) { - if (finalState == NORMAL) { - child.performAccessibilityAction( - AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null); - Launcher.cast(mActivity).getStateManager() - .removeStateListener(this); - } - } - }); + child.setTag(R.id.perform_a11y_action_on_launcher_state_normal_tag, + AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS); } if (markCells) markCellsAsOccupiedForView(child); diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 3b283c3cb0..c85ca49c43 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -31,6 +31,7 @@ import static com.android.launcher3.testing.shared.ResourceUtils.pxFromDp; import static com.android.launcher3.testing.shared.ResourceUtils.roundPxValueFromFloat; import static com.android.wm.shell.Flags.enableBubbleBar; import static com.android.wm.shell.Flags.enableTinyTaskbar; +import static com.android.wm.shell.Flags.enableBubbleBarOnPhones; import android.annotation.SuppressLint; import android.content.Context; @@ -52,9 +53,8 @@ import androidx.core.content.res.ResourcesCompat; import com.android.launcher3.CellLayout.ContainerType; import com.android.launcher3.DevicePaddings.DevicePadding; import com.android.launcher3.folder.ClippedFolderIconLayoutRule; -import com.android.launcher3.graphics.IconShape; +import com.android.launcher3.graphics.ThemeManager; import com.android.launcher3.icons.DotRenderer; -import com.android.launcher3.icons.IconNormalizer; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.responsive.CalculatedCellSpec; import com.android.launcher3.responsive.CalculatedHotseatSpec; @@ -388,7 +388,7 @@ public class DeviceProfile { /** TODO: Once we fully migrate to staged split, remove "isMultiWindowMode" */ DeviceProfile(Context context, InvariantDeviceProfile inv, Info info, - WindowManagerProxy wmProxy, IconShape iconShape, WindowBounds windowBounds, + WindowManagerProxy wmProxy, ThemeManager themeManager, WindowBounds windowBounds, SparseArray dotRendererCache, boolean isMultiWindowMode, boolean transposeLayoutWithOrientation, boolean isMultiDisplay, boolean isGestureMode, @NonNull final ViewScaleProvider viewScaleProvider, @@ -420,7 +420,9 @@ public class DeviceProfile { isTablet = info.isTablet(windowBounds); isPhone = !isTablet; isTwoPanels = isTablet && isMultiDisplay; - isTaskbarPresent = (isTablet || (enableTinyTaskbar() && isGestureMode)) + boolean taskbarOrBubbleBarOnPhones = enableTinyTaskbar() + || (enableBubbleBar() && enableBubbleBarOnPhones()); + isTaskbarPresent = (isTablet || (taskbarOrBubbleBarOnPhones && isGestureMode)) && wmProxy.isTaskbarDrawnInProcess(); // Some more constants. @@ -846,8 +848,8 @@ public class DeviceProfile { dimensionOverrideProvider.accept(this); // This is done last, after iconSizePx is calculated above. - mDotRendererWorkSpace = createDotRenderer(iconShape, iconSizePx, dotRendererCache); - mDotRendererAllApps = createDotRenderer(iconShape, allAppsIconSizePx, dotRendererCache); + mDotRendererWorkSpace = createDotRenderer(themeManager, iconSizePx, dotRendererCache); + mDotRendererAllApps = createDotRenderer(themeManager, allAppsIconSizePx, dotRendererCache); } /** @@ -869,12 +871,12 @@ public class DeviceProfile { } private static DotRenderer createDotRenderer( - @NonNull IconShape iconShape, int size, @NonNull SparseArray cache) { + @NonNull ThemeManager themeManager, int size, @NonNull SparseArray cache) { DotRenderer renderer = cache.get(size); if (renderer == null) { renderer = new DotRenderer( size, - iconShape.getShape().getPath(DEFAULT_DOT_SIZE), + themeManager.getIconShape().getPath(DEFAULT_DOT_SIZE), DEFAULT_DOT_SIZE); cache.put(size, renderer); } @@ -1371,7 +1373,7 @@ public class DeviceProfile { updateHotseatSizes(iconSizePx); // Folder icon - folderIconSizePx = IconNormalizer.getNormalizedCircleSize(iconSizePx); + folderIconSizePx = Math.round(iconSizePx * ICON_VISIBLE_AREA_FACTOR); folderIconOffsetYPx = (iconSizePx - folderIconSizePx) / 2; // Update widget padding: @@ -2478,7 +2480,7 @@ public class DeviceProfile { private final InvariantDeviceProfile mInv; private final Info mInfo; private final WindowManagerProxy mWMProxy; - private final IconShape mIconShape; + private final ThemeManager mThemeManager; private WindowBounds mWindowBounds; private boolean mIsMultiDisplay; @@ -2495,12 +2497,12 @@ public class DeviceProfile { private boolean mIsTransientTaskbar; public Builder(Context context, InvariantDeviceProfile inv, Info info, - WindowManagerProxy wmProxy, IconShape iconShape) { + WindowManagerProxy wmProxy, ThemeManager themeManager) { mContext = context; mInv = inv; mInfo = info; mWMProxy = wmProxy; - mIconShape = iconShape; + mThemeManager = themeManager; mIsTransientTaskbar = info.isTransientTaskbar(); } @@ -2581,7 +2583,7 @@ public class DeviceProfile { if (mOverrideProvider == null) { mOverrideProvider = DEFAULT_DIMENSION_PROVIDER; } - return new DeviceProfile(mContext, mInv, mInfo, mWMProxy, mIconShape, + return new DeviceProfile(mContext, mInv, mInfo, mWMProxy, mThemeManager, mWindowBounds, mDotRendererCache, mIsMultiWindowMode, mTransposeLayoutWithOrientation, mIsMultiDisplay, mIsGestureMode, mViewScaleProvider, mOverrideProvider, mIsTransientTaskbar); diff --git a/src/com/android/launcher3/DropTarget.java b/src/com/android/launcher3/DropTarget.java index 2d995103e7..7f0c7b50c0 100644 --- a/src/com/android/launcher3/DropTarget.java +++ b/src/com/android/launcher3/DropTarget.java @@ -18,6 +18,7 @@ package com.android.launcher3; import android.content.Context; import android.graphics.Rect; +import android.view.View; import com.android.launcher3.accessibility.DragViewStateAnnouncer; import com.android.launcher3.dragndrop.DragOptions; @@ -145,4 +146,9 @@ public interface DropTarget { // These methods are implemented in Views void getHitRectRelativeToDragLayer(Rect outRect); + + /** Returns the drop target view. By default, the implementor class is cast to the view. */ + default View getDropView() { + return (View) this; + } } diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 4107c8fdea..f189549463 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -57,7 +57,7 @@ import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dagger.ApplicationContext; import com.android.launcher3.dagger.LauncherAppComponent; import com.android.launcher3.dagger.LauncherAppSingleton; -import com.android.launcher3.graphics.IconShape; +import com.android.launcher3.graphics.ThemeManager; import com.android.launcher3.icons.DotRenderer; import com.android.launcher3.logging.FileLog; import com.android.launcher3.model.DeviceGridState; @@ -85,6 +85,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; import javax.inject.Inject; @@ -136,7 +137,7 @@ public class InvariantDeviceProfile { private final DisplayController mDisplayController; private final WindowManagerProxy mWMProxy; private final LauncherPrefs mPrefs; - private final IconShape mIconShape; + private final ThemeManager mThemeManager; /** * Number of icons per row and column in the workspace. @@ -252,7 +253,7 @@ public class InvariantDeviceProfile { public Point defaultWallpaperSize; - private final ArrayList mChangeListeners = new ArrayList<>(); + private final List mChangeListeners = new CopyOnWriteArrayList<>(); @Inject InvariantDeviceProfile( @@ -260,12 +261,12 @@ public class InvariantDeviceProfile { LauncherPrefs prefs, DisplayController dc, WindowManagerProxy wmProxy, - IconShape iconShape, + ThemeManager themeManager, DaggerSingletonTracker lifeCycle) { mDisplayController = dc; mWMProxy = wmProxy; mPrefs = prefs; - mIconShape = iconShape; + mThemeManager = themeManager; String gridName = prefs.get(GRID_NAME); initGrid(context, gridName); @@ -312,7 +313,7 @@ public class InvariantDeviceProfile { context, gridName, displayInfo, - RestoreDbTask.isPending(mPrefs), + (RestoreDbTask.isPending(mPrefs) && !Flags.oneGridSpecs()), mPrefs.get(FIXED_LANDSCAPE_MODE) ); @@ -490,7 +491,7 @@ public class InvariantDeviceProfile { } DeviceProfile.Builder newDPBuilder(Context context, Info info) { - return new DeviceProfile.Builder(context, this, info, mWMProxy, mIconShape); + return new DeviceProfile.Builder(context, this, info, mWMProxy, mThemeManager); } public void addOnChangeListener(OnIDPChangeListener listener) { @@ -505,6 +506,7 @@ public class InvariantDeviceProfile { * Updates the current grid, this triggers a new IDP, reloads the database and triggers a grid * migration. */ + @VisibleForTesting public void setCurrentGrid(Context context, String newGridName) { mPrefs.put(GRID_NAME, newGridName); MAIN_EXECUTOR.execute(() -> { diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 38e2806501..7b41586b34 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -183,9 +183,8 @@ import com.android.launcher3.celllayout.CellPosMapper.CellPos; import com.android.launcher3.celllayout.CellPosMapper.TwoPanelCellPosMapper; import com.android.launcher3.compat.AccessibilityManagerCompat; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.debug.TestEvent; import com.android.launcher3.debug.TestEventEmitter; -import com.android.launcher3.dot.DotInfo; +import com.android.launcher3.debug.TestEventEmitter.TestEvent; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragView; @@ -237,6 +236,7 @@ import com.android.launcher3.util.IntArray; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.ItemInflater; import com.android.launcher3.util.KeyboardShortcutsDelegate; +import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.util.LockedUserState; import com.android.launcher3.util.MSDLPlayerWrapper; import com.android.launcher3.util.PackageUserKey; @@ -544,7 +544,7 @@ public class Launcher extends StatefulActivity mItemInflater = new ItemInflater<>(this, mAppWidgetHolder, getItemOnClickListener(), mFocusHandler, new CellLayout(mWorkspace.getContext(), mWorkspace)); - mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots); + mPopupDataProvider = new PopupDataProvider(this); mWidgetPickerDataProvider = new WidgetPickerDataProvider(); PillColorProvider.getInstance(mWorkspace.getContext()).registerObserver(); @@ -611,7 +611,7 @@ public class Launcher extends StatefulActivity RuleController.getInstance(this).setRules( RuleController.parseRules(this, R.xml.split_configuration)); } - TestEventEmitter.INSTANCE.get(this).sendEvent(TestEvent.LAUNCHER_ON_CREATE); + TestEventEmitter.sendEvent(TestEvent.LAUNCHER_ON_CREATE); } protected ModelCallbacks createModelCallbacks() { @@ -1598,11 +1598,6 @@ public class Launcher extends StatefulActivity private final ScreenOnListener mScreenOnListener = this::onScreenOnChanged; - private void updateNotificationDots(Predicate updatedDots) { - mWorkspace.updateNotificationDots(updatedDots); - mAppsView.getAppsStore().updateNotificationDots(updatedDots); - } - @Override public void onAttachedToWindow() { super.onAttachedToWindow(); @@ -1674,7 +1669,7 @@ public class Launcher extends StatefulActivity } else if (Intent.ACTION_ALL_APPS.equals(intent.getAction())) { showAllAppsFromIntent(alreadyOnHome); } else if (INTENT_ACTION_ALL_APPS_TOGGLE.equals(intent.getAction())) { - toggleAllAppsSearch(alreadyOnHome); + toggleAllApps(alreadyOnHome, true); } else if (Intent.ACTION_SHOW_WORK_APPS.equals(intent.getAction())) { showAllAppsWithSelectedTabFromIntent(alreadyOnHome, ActivityAllAppsContainerView.AdapterHolder.WORK); @@ -1688,12 +1683,15 @@ public class Launcher extends StatefulActivity // Overridden } - /** Toggles Launcher All Apps with keyboard ready for search. */ - public void toggleAllAppsSearch() { - toggleAllAppsSearch(/* alreadyOnHome= */ true); + /** + * Toggles Launcher All Apps. + * @param focusSearch Indicates whether to make All Apps keyboard ready for search. + */ + public void toggleAllApps(boolean focusSearch) { + toggleAllApps(/* alreadyOnHome= */ true, focusSearch); } - protected void toggleAllAppsSearch(boolean alreadyOnHome) { + private void toggleAllApps(boolean alreadyOnHome, boolean focusSearch) { if (getStateManager().isInStableState(ALL_APPS)) { getStateManager().goToState(NORMAL, alreadyOnHome); } else { @@ -1705,7 +1703,8 @@ public class Launcher extends StatefulActivity new AnimationSuccessListener() { @Override public void onAnimationSuccess(Animator animator) { - if (mAppsView.getSearchUiManager().getEditText() != null) { + if (focusSearch + && mAppsView.getSearchUiManager().getEditText() != null) { mAppsView.getSearchUiManager().getEditText().requestFocus(); } } @@ -2948,11 +2947,6 @@ public class Launcher extends StatefulActivity return mModelCallbacks.getWorkspaceLoading(); } - @Override - public boolean isBindingItems() { - return isWorkspaceLoading(); - } - /** * Returns true if a touch interaction is in progress */ @@ -3027,11 +3021,6 @@ public class Launcher extends StatefulActivity return mWidgetPickerDataProvider; } - @Override - public DotInfo getDotInfoForItem(ItemInfo info) { - return mPopupDataProvider.getDotInfoForItem(info); - } - @NonNull public LauncherOverlayManager getOverlayManager() { return mOverlayManager; @@ -3046,6 +3035,12 @@ public class Launcher extends StatefulActivity return mDragLayer; } + @NonNull + @Override + public LauncherBindableItemsContainer getContent() { + return mWorkspace; + } + @Override public ActivityAllAppsContainerView getAppsView() { return mAppsView; diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java deleted file mode 100644 index 71013c3fa6..0000000000 --- a/src/com/android/launcher3/LauncherAppState.java +++ /dev/null @@ -1,249 +0,0 @@ -/* - * Copyright (C) 2013 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; - -import static android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED; -import static android.content.Context.RECEIVER_EXPORTED; - -import static com.android.launcher3.Flags.enableSmartspaceRemovalToggle; -import static com.android.launcher3.model.LoaderTask.SMARTSPACE_ON_HOME_SCREEN; -import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; -import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI; -import static com.android.launcher3.util.SettingsCache.PRIVATE_SPACE_HIDE_WHEN_LOCKED_URI; - -import android.content.ComponentName; -import android.content.Context; -import android.content.SharedPreferences; -import android.content.SharedPreferences.OnSharedPreferenceChangeListener; -import android.content.pm.LauncherApps; -import android.content.pm.LauncherApps.ArchiveCompatibilityParams; -import android.util.Log; - -import androidx.annotation.Nullable; -import androidx.core.os.BuildCompat; - -import com.android.launcher3.graphics.ThemeManager; -import com.android.launcher3.graphics.ThemeManager.ThemeChangeListener; -import com.android.launcher3.icons.IconCache; -import com.android.launcher3.icons.IconProvider; -import com.android.launcher3.icons.LauncherIconProvider; -import com.android.launcher3.icons.LauncherIcons; -import com.android.launcher3.model.ModelLauncherCallbacks; -import com.android.launcher3.model.WidgetsFilterDataProvider; -import com.android.launcher3.notification.NotificationListener; -import com.android.launcher3.pm.InstallSessionHelper; -import com.android.launcher3.pm.InstallSessionTracker; -import com.android.launcher3.pm.UserCache; -import com.android.launcher3.util.LockedUserState; -import com.android.launcher3.util.MainThreadInitializedObject; -import com.android.launcher3.util.PackageManagerHelper; -import com.android.launcher3.util.Preconditions; -import com.android.launcher3.util.RunnableList; -import com.android.launcher3.util.SafeCloseable; -import com.android.launcher3.util.SettingsCache; -import com.android.launcher3.util.SimpleBroadcastReceiver; -import com.android.launcher3.util.TraceHelper; -import com.android.launcher3.widget.custom.CustomWidgetManager; - -public class LauncherAppState implements SafeCloseable { - - public static final String TAG = "LauncherAppState"; - public static final String ACTION_FORCE_ROLOAD = "force-reload-launcher"; - - // We do not need any synchronization for this variable as its only written on UI thread. - public static final MainThreadInitializedObject INSTANCE = - new MainThreadInitializedObject<>(LauncherAppState::new); - - private final Context mContext; - private final LauncherModel mModel; - private final LauncherIconProvider mIconProvider; - private final IconCache mIconCache; - private final InvariantDeviceProfile mInvariantDeviceProfile; - private boolean mIsSafeModeEnabled; - - private final RunnableList mOnTerminateCallback = new RunnableList(); - - public static LauncherAppState getInstance(Context context) { - return INSTANCE.get(context); - } - - public Context getContext() { - return mContext; - } - - @SuppressWarnings("NewApi") - public LauncherAppState(Context context) { - this(context, LauncherFiles.APP_ICONS_DB); - Log.v(Launcher.TAG, "LauncherAppState initiated"); - Preconditions.assertUIThread(); - - mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode", - () -> context.getPackageManager().isSafeMode()); - mInvariantDeviceProfile.addOnChangeListener(modelPropertiesChanged -> { - if (modelPropertiesChanged) { - refreshAndReloadLauncher(); - } - }); - - ThemeChangeListener themeChangeListener = this::refreshAndReloadLauncher; - ThemeManager.INSTANCE.get(context).addChangeListener(themeChangeListener); - mOnTerminateCallback.add(() -> - ThemeManager.INSTANCE.get(context).removeChangeListener(themeChangeListener)); - - ModelLauncherCallbacks callbacks = mModel.newModelCallbacks(); - LauncherApps launcherApps = mContext.getSystemService(LauncherApps.class); - launcherApps.registerCallback(callbacks); - mOnTerminateCallback.add(() -> - mContext.getSystemService(LauncherApps.class).unregisterCallback(callbacks)); - - if (BuildCompat.isAtLeastV() && Flags.enableSupportForArchiving()) { - ArchiveCompatibilityParams params = new ArchiveCompatibilityParams(); - params.setEnableUnarchivalConfirmation(false); - params.setEnableIconOverlay(!Flags.useNewIconForArchivedApps()); - launcherApps.setArchiveCompatibility(params); - } - - SimpleBroadcastReceiver modelChangeReceiver = - new SimpleBroadcastReceiver(context, UI_HELPER_EXECUTOR, mModel::onBroadcastIntent); - modelChangeReceiver.register( - ACTION_DEVICE_POLICY_RESOURCE_UPDATED); - if (BuildConfig.IS_STUDIO_BUILD) { - modelChangeReceiver.register(RECEIVER_EXPORTED, ACTION_FORCE_ROLOAD); - } - mOnTerminateCallback.add(() -> modelChangeReceiver.unregisterReceiverSafely()); - - SafeCloseable userChangeListener = UserCache.INSTANCE.get(mContext) - .addUserEventListener(mModel::onUserEvent); - mOnTerminateCallback.add(userChangeListener::close); - - if (enableSmartspaceRemovalToggle()) { - OnSharedPreferenceChangeListener firstPagePinnedItemListener = - new OnSharedPreferenceChangeListener() { - @Override - public void onSharedPreferenceChanged( - SharedPreferences sharedPreferences, String key) { - if (SMARTSPACE_ON_HOME_SCREEN.equals(key)) { - mModel.forceReload(); - } - } - }; - LauncherPrefs.getPrefs(mContext).registerOnSharedPreferenceChangeListener( - firstPagePinnedItemListener); - mOnTerminateCallback.add(() -> LauncherPrefs.getPrefs(mContext) - .unregisterOnSharedPreferenceChangeListener(firstPagePinnedItemListener)); - } - - LockedUserState.get(context).runOnUserUnlocked(() -> { - CustomWidgetManager cwm = CustomWidgetManager.INSTANCE.get(mContext); - mOnTerminateCallback.add(cwm.addWidgetRefreshCallback(mModel::rebindCallbacks)::close); - - SafeCloseable iconChangeTracker = mIconProvider.registerIconChangeListener( - mModel::onAppIconChanged, MODEL_EXECUTOR.getHandler()); - mOnTerminateCallback.add(iconChangeTracker::close); - - InstallSessionTracker installSessionTracker = - InstallSessionHelper.INSTANCE.get(context).registerInstallTracker(callbacks); - mOnTerminateCallback.add(installSessionTracker::unregister); - }); - - // Register an observer to rebind the notification listener when dots are re-enabled. - SettingsCache settingsCache = SettingsCache.INSTANCE.get(mContext); - SettingsCache.OnChangeListener notificationLister = this::onNotificationSettingsChanged; - settingsCache.register(NOTIFICATION_BADGING_URI, notificationLister); - onNotificationSettingsChanged(settingsCache.getValue(NOTIFICATION_BADGING_URI)); - mOnTerminateCallback.add(() -> - settingsCache.unregister(NOTIFICATION_BADGING_URI, notificationLister)); - // Register an observer to notify Launcher about Private Space settings toggle. - registerPrivateSpaceHideWhenLockListener(settingsCache); - } - - public LauncherAppState(Context context, @Nullable String iconCacheFileName) { - mContext = context; - - mInvariantDeviceProfile = InvariantDeviceProfile.INSTANCE.get(context); - mIconProvider = new LauncherIconProvider(context); - mIconCache = new IconCache(mContext, mInvariantDeviceProfile, - iconCacheFileName, mIconProvider); - mModel = new LauncherModel(context, this, mIconCache, - WidgetsFilterDataProvider.Companion.newInstance(context), new AppFilter(mContext), - PackageManagerHelper.INSTANCE.get(context), iconCacheFileName != null); - mOnTerminateCallback.add(mIconCache::close); - mOnTerminateCallback.add(mModel::destroy); - } - - private void onNotificationSettingsChanged(boolean areNotificationDotsEnabled) { - if (areNotificationDotsEnabled) { - NotificationListener.requestRebind(new ComponentName( - mContext, NotificationListener.class)); - } - } - - private void registerPrivateSpaceHideWhenLockListener(SettingsCache settingsCache) { - SettingsCache.OnChangeListener psHideWhenLockChangedListener = - this::onPrivateSpaceHideWhenLockChanged; - settingsCache.register(PRIVATE_SPACE_HIDE_WHEN_LOCKED_URI, psHideWhenLockChangedListener); - mOnTerminateCallback.add(() -> settingsCache.unregister(PRIVATE_SPACE_HIDE_WHEN_LOCKED_URI, - psHideWhenLockChangedListener)); - } - - private void onPrivateSpaceHideWhenLockChanged(boolean isPrivateSpaceHideOnLockEnabled) { - mModel.forceReload(); - } - - private void refreshAndReloadLauncher() { - LauncherIcons.clearPool(mContext); - mIconCache.updateIconParams( - mInvariantDeviceProfile.fillResIconDpi, mInvariantDeviceProfile.iconBitmapSize); - mModel.forceReload(); - } - - /** - * Call from Application.onTerminate(), which is not guaranteed to ever be called. - */ - @Override - public void close() { - mOnTerminateCallback.executeAllAndDestroy(); - } - - public IconProvider getIconProvider() { - return mIconProvider; - } - - public IconCache getIconCache() { - return mIconCache; - } - - public LauncherModel getModel() { - return mModel; - } - - public InvariantDeviceProfile getInvariantDeviceProfile() { - return mInvariantDeviceProfile; - } - - public boolean isSafeModeEnabled() { - return mIsSafeModeEnabled; - } - - /** - * Shorthand for {@link #getInvariantDeviceProfile()} - */ - public static InvariantDeviceProfile getIDP(Context context) { - return InvariantDeviceProfile.INSTANCE.get(context); - } -} diff --git a/src/com/android/launcher3/LauncherAppState.kt b/src/com/android/launcher3/LauncherAppState.kt new file mode 100644 index 0000000000..ff84c3c863 --- /dev/null +++ b/src/com/android/launcher3/LauncherAppState.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2013 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 + +import android.content.Context +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.icons.IconCache +import com.android.launcher3.icons.LauncherIconProvider +import com.android.launcher3.util.DaggerSingletonObject +import javax.inject.Inject +import javax.inject.Named + +/** A collection of common dependencies used across Launcher */ +@Deprecated("Inject the specific targets directly instead of using LauncherAppState") +data class LauncherAppState +@Inject +constructor( + @ApplicationContext val context: Context, + val iconProvider: LauncherIconProvider, + val iconCache: IconCache, + val model: LauncherModel, + val invariantDeviceProfile: InvariantDeviceProfile, + @Named("SAFE_MODE") val isSafeModeEnabled: Boolean, +) { + + companion object { + + @JvmField var INSTANCE = DaggerSingletonObject { it.launcherAppState } + + @JvmStatic fun getInstance(context: Context) = INSTANCE[context] + + /** Shorthand for [.getInvariantDeviceProfile] */ + @JvmStatic fun getIDP(context: Context) = InvariantDeviceProfile.INSTANCE[context] + } +} diff --git a/src/com/android/launcher3/LauncherApplication.java b/src/com/android/launcher3/LauncherApplication.java index 678901b5b2..03eaeea178 100644 --- a/src/com/android/launcher3/LauncherApplication.java +++ b/src/com/android/launcher3/LauncherApplication.java @@ -20,6 +20,7 @@ import android.app.Application; import com.android.launcher3.dagger.DaggerLauncherAppComponent; import com.android.launcher3.dagger.LauncherAppComponent; import com.android.launcher3.dagger.LauncherBaseAppComponent; +import com.android.launcher3.util.TraceHelper; /** * Main application class for Launcher @@ -41,7 +42,8 @@ public class LauncherApplication extends Application { if (mAppComponent == null) { // Initialize the dagger component on demand as content providers can get // accessed before the Launcher application (b/36917845#comment4) - initDaggerComponent(DaggerLauncherAppComponent.builder()); + initDaggerComponent(DaggerLauncherAppComponent.builder() + .iconsDbName(LauncherFiles.APP_ICONS_DB)); } } } @@ -55,7 +57,11 @@ public class LauncherApplication extends Application { /** * Init with the desired dagger component. */ - public void initDaggerComponent(LauncherAppComponent.Builder componentBuilder) { - mAppComponent = componentBuilder.appContext(this).build(); + public void initDaggerComponent(LauncherBaseAppComponent.Builder componentBuilder) { + mAppComponent = componentBuilder + .appContext(this) + .setSafeModeEnabled(TraceHelper.allowIpcs( + "isSafeMode", () -> getPackageManager().isSafeMode())) + .build(); } } diff --git a/src/com/android/launcher3/LauncherModel.kt b/src/com/android/launcher3/LauncherModel.kt index 185629b30e..892a2180b0 100644 --- a/src/com/android/launcher3/LauncherModel.kt +++ b/src/com/android/launcher3/LauncherModel.kt @@ -15,16 +15,16 @@ */ package com.android.launcher3 -import android.app.admin.DevicePolicyManager import android.content.Context import android.content.Intent import android.content.pm.ShortcutInfo import android.os.UserHandle import android.text.TextUtils -import android.util.Log import android.util.Pair import androidx.annotation.WorkerThread import com.android.launcher3.celllayout.CellPosMapper +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppSingleton import com.android.launcher3.icons.IconCache import com.android.launcher3.model.AddWorkspaceItemsTask import com.android.launcher3.model.AllAppsList @@ -35,6 +35,7 @@ import com.android.launcher3.model.ItemInstallQueue import com.android.launcher3.model.LoaderTask import com.android.launcher3.model.ModelDbController import com.android.launcher3.model.ModelDelegate +import com.android.launcher3.model.ModelInitializer import com.android.launcher3.model.ModelLauncherCallbacks import com.android.launcher3.model.ModelTaskController import com.android.launcher3.model.ModelWriter @@ -47,32 +48,42 @@ import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.pm.UserCache import com.android.launcher3.shortcuts.ShortcutRequest -import com.android.launcher3.testing.shared.TestProtocol.sDebugTracing +import com.android.launcher3.util.DaggerSingletonTracker import com.android.launcher3.util.Executors.MAIN_EXECUTOR import com.android.launcher3.util.Executors.MODEL_EXECUTOR -import com.android.launcher3.util.PackageManagerHelper import com.android.launcher3.util.PackageUserKey import com.android.launcher3.util.Preconditions import java.io.FileDescriptor import java.io.PrintWriter import java.util.concurrent.CancellationException import java.util.function.Consumer +import javax.inject.Inject +import javax.inject.Named +import javax.inject.Provider /** * Maintains in-memory state of the Launcher. It is expected that there should be only one * LauncherModel object held in a static. Also provide APIs for updating the database state for the * Launcher. */ -class LauncherModel( - private val context: Context, - private val mApp: LauncherAppState, +@LauncherAppSingleton +class LauncherModel +@Inject +constructor( + @ApplicationContext private val context: Context, + private val appProvider: Provider, private val iconCache: IconCache, - private val widgetsFilterDataProvider: WidgetsFilterDataProvider, + private val prefs: LauncherPrefs, + private val installQueue: ItemInstallQueue, appFilter: AppFilter, - mPmHelper: PackageManagerHelper, - isPrimaryInstance: Boolean, + @Named("ICONS_DB") dbFileName: String?, + initializer: ModelInitializer, + lifecycle: DaggerSingletonTracker, + val modelDelegate: ModelDelegate, ) { + private val widgetsFilterDataProvider = WidgetsFilterDataProvider.newInstance(context) + private val mCallbacksList = ArrayList(1) // < only access in worker thread > @@ -84,16 +95,6 @@ class LauncherModel( */ private val mBgDataModel = BgDataModel() - val modelDelegate: ModelDelegate = - ModelDelegate.newInstance( - context, - mApp, - mPmHelper, - mBgAllAppsList, - mBgDataModel, - isPrimaryInstance, - ) - val modelDbController = ModelDbController(context) private val mLock = Any() @@ -128,6 +129,14 @@ class LauncherModel( } } + init { + if (!dbFileName.isNullOrEmpty()) { + initializer.initialize(this) + } + lifecycle.addCloseable { destroy() } + modelDelegate.init(this, mBgAllAppsList, mBgDataModel) + } + fun newModelCallbacks() = ModelLauncherCallbacks(this::enqueueModelUpdateTask) /** Adds the provided items to the workspace. */ @@ -140,7 +149,7 @@ class LauncherModel( verifyChanges: Boolean, cellPosMapper: CellPosMapper?, owner: BgDataModel.Callbacks?, - ) = ModelWriter(mApp.context, this, mBgDataModel, verifyChanges, cellPosMapper, owner) + ) = ModelWriter(context, this, mBgDataModel, verifyChanges, cellPosMapper, owner) /** Returns the [WidgetsFilterDataProvider] that manages widget filters. */ fun getWidgetsFilterDataProvider(): WidgetsFilterDataProvider { @@ -173,15 +182,8 @@ class LauncherModel( } } - fun onBroadcastIntent(intent: Intent) { - if (DEBUG_RECEIVER || sDebugTracing) Log.d(TAG, "onReceive intent=$intent") - when (intent.action) { - LauncherAppState.ACTION_FORCE_ROLOAD -> - // If we have changed locale we need to clear out the labels in all apps/workspace. - forceReload() - DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED -> - enqueueModelUpdateTask(ReloadStringCacheTask(this.modelDelegate)) - } + fun reloadStringCache() { + enqueueModelUpdateTask(ReloadStringCacheTask(this.modelDelegate)) } /** @@ -212,7 +214,7 @@ class LauncherModel( UserCache.ACTION_PROFILE_UNLOCKED -> enqueueModelUpdateTask(UserLockStateChangedTask(user, true)) Intent.ACTION_MANAGED_PROFILE_REMOVED -> { - LauncherPrefs.get(mApp.context).put(LauncherPrefs.WORK_EDU_STEP, 0) + prefs.put(LauncherPrefs.WORK_EDU_STEP, 0) forceReload() } UserCache.ACTION_PROFILE_ADDED, @@ -243,6 +245,13 @@ class LauncherModel( rebindCallbacks() } + /** Reloads the model if it is already in use */ + fun reloadIfActive() { + val wasActive: Boolean + synchronized(mLock) { wasActive = mModelLoaded || stopLoader() } + if (wasActive) forceReload() + } + /** Rebinds all existing callbacks with already loaded model */ fun rebindCallbacks() { if (hasCallbacks()) { @@ -290,7 +299,7 @@ class LauncherModel( private fun startLoader(newCallbacks: Array): Boolean { // Enable queue before starting loader. It will get disabled in Launcher#finishBindingItems - ItemInstallQueue.INSTANCE.get(context).pauseModelPush(ItemInstallQueue.FLAG_LOADER_RUNNING) + installQueue.pauseModelPush(ItemInstallQueue.FLAG_LOADER_RUNNING) synchronized(mLock) { // If there is already one running, tell it to stop. val wasRunning = stopLoader() @@ -302,7 +311,12 @@ class LauncherModel( callbacksList.forEach { MAIN_EXECUTOR.execute(it::clearPendingBinds) } val launcherBinder = - BaseLauncherBinder(mApp, mBgDataModel, mBgAllAppsList, callbacksList) + BaseLauncherBinder( + appProvider.get(), + mBgDataModel, + mBgAllAppsList, + callbacksList, + ) if (bindDirectly) { // Divide the set of loaded items into those that we are binding synchronously, // and everything else that is to be bound normally (asynchronously). @@ -314,19 +328,20 @@ class LauncherModel( launcherBinder.bindWidgets() return true } else { - mLoaderTask = + val task = LoaderTask( - mApp, + appProvider.get(), mBgAllAppsList, mBgDataModel, this.modelDelegate, launcherBinder, widgetsFilterDataProvider, ) + mLoaderTask = task // Always post the loader task, instead of running directly // (even on same thread) so that we exit any nested synchronized blocks - MODEL_EXECUTOR.post(mLoaderTask) + MODEL_EXECUTOR.post(task) } } } @@ -422,7 +437,7 @@ class LauncherModel( /** Called when the labels for the widgets has updated in the icon cache. */ fun onWidgetLabelsUpdated(updatedPackages: HashSet, user: UserHandle) { enqueueModelUpdateTask { taskController, dataModel, _ -> - dataModel.widgetsModel.onPackageIconsUpdated(updatedPackages, user, mApp) + dataModel.widgetsModel.onPackageIconsUpdated(updatedPackages, user, appProvider.get()) taskController.bindUpdatedWidgets(dataModel) } } @@ -445,7 +460,13 @@ class LauncherModel( return@execute } task.execute( - ModelTaskController(mApp, mBgDataModel, mBgAllAppsList, this, MAIN_EXECUTOR), + ModelTaskController( + appProvider.get(), + mBgDataModel, + mBgAllAppsList, + this, + MAIN_EXECUTOR, + ), mBgDataModel, mBgAllAppsList, ) @@ -506,8 +527,6 @@ class LauncherModel( } companion object { - private const val DEBUG_RECEIVER = false - const val TAG = "Launcher.Model" } } diff --git a/src/com/android/launcher3/LauncherPrefs.kt b/src/com/android/launcher3/LauncherPrefs.kt index 2a5cd63752..7a04b0f950 100644 --- a/src/com/android/launcher3/LauncherPrefs.kt +++ b/src/com/android/launcher3/LauncherPrefs.kt @@ -75,18 +75,18 @@ constructor(@ApplicationContext private val encryptedContext: Context) { @Suppress("IMPLICIT_CAST_TO_ANY", "UNCHECKED_CAST") private fun getInner(item: Item, default: T): T { val sp = getSharedPrefs(item) - - return when (item.type) { - String::class.java -> sp.getString(item.sharedPrefKey, default as? String) - Boolean::class.java, - java.lang.Boolean::class.java -> sp.getBoolean(item.sharedPrefKey, default as Boolean) - Int::class.java, - java.lang.Integer::class.java -> sp.getInt(item.sharedPrefKey, default as Int) - Float::class.java, - java.lang.Float::class.java -> sp.getFloat(item.sharedPrefKey, default as Float) - Long::class.java, - java.lang.Long::class.java -> sp.getLong(item.sharedPrefKey, default as Long) - Set::class.java -> sp.getStringSet(item.sharedPrefKey, default as? Set) + return when { + item.type == String::class.java -> sp.getString(item.sharedPrefKey, default as? String) + item.type == Boolean::class.java || item.type == java.lang.Boolean::class.java -> + sp.getBoolean(item.sharedPrefKey, default as Boolean) + item.type == Int::class.java || item.type == java.lang.Integer::class.java -> + sp.getInt(item.sharedPrefKey, default as Int) + item.type == Float::class.java || item.type == java.lang.Float::class.java -> + sp.getFloat(item.sharedPrefKey, default as Float) + item.type == Long::class.java || item.type == java.lang.Long::class.java -> + sp.getLong(item.sharedPrefKey, default as Long) + Set::class.java.isAssignableFrom(item.type) -> + sp.getStringSet(item.sharedPrefKey, default as? Set) else -> throw IllegalArgumentException( "item type: ${item.type}" + " is not compatible with sharedPref methods" @@ -147,17 +147,18 @@ constructor(@ApplicationContext private val encryptedContext: Context) { item: Item, value: Any?, ): SharedPreferences.Editor = - when (item.type) { - String::class.java -> putString(item.sharedPrefKey, value as? String) - Boolean::class.java, - java.lang.Boolean::class.java -> putBoolean(item.sharedPrefKey, value as Boolean) - Int::class.java, - java.lang.Integer::class.java -> putInt(item.sharedPrefKey, value as Int) - Float::class.java, - java.lang.Float::class.java -> putFloat(item.sharedPrefKey, value as Float) - Long::class.java, - java.lang.Long::class.java -> putLong(item.sharedPrefKey, value as Long) - Set::class.java -> putStringSet(item.sharedPrefKey, value as? Set) + when { + item.type == String::class.java -> putString(item.sharedPrefKey, value as? String) + item.type == Boolean::class.java || item.type == java.lang.Boolean::class.java -> + putBoolean(item.sharedPrefKey, value as Boolean) + item.type == Int::class.java || item.type == java.lang.Integer::class.java -> + putInt(item.sharedPrefKey, value as Int) + item.type == Float::class.java || item.type == java.lang.Float::class.java -> + putFloat(item.sharedPrefKey, value as Float) + item.type == Long::class.java || item.type == java.lang.Long::class.java -> + putLong(item.sharedPrefKey, value as Long) + Set::class.java.isAssignableFrom(item.type) -> + putStringSet(item.sharedPrefKey, value as? Set) else -> throw IllegalArgumentException( "item type: ${item.type} is not compatible with sharedPref methods" diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index a526b89532..03ecf14ef6 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -61,11 +61,10 @@ public class LauncherProvider extends ContentProvider { */ @Override public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { - LauncherAppState.INSTANCE.executeIfCreated(appState -> { - if (appState.getModel().isModelLoaded()) { - appState.getModel().dumpState("", fd, writer, args); - } - }); + LauncherModel model = LauncherAppState.INSTANCE.get(getContext()).getModel(); + if (model.isModelLoaded()) { + model.dumpState("", fd, writer, args); + } } @Override diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index 8c6555e9a9..78ad04bf05 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -70,6 +70,7 @@ public abstract class LauncherState implements BaseState { public static final int WORKSPACE_PAGE_INDICATOR = 1 << 5; public static final int SPLIT_PLACHOLDER_VIEW = 1 << 6; public static final int FLOATING_SEARCH_BAR = 1 << 7; + public static final int ADD_DESK_BUTTON = 1 << 8; // Flag indicating workspace has multiple pages visible. public static final int FLAG_MULTI_PAGE = BaseState.getFlag(0); diff --git a/src/com/android/launcher3/ModelCallbacks.kt b/src/com/android/launcher3/ModelCallbacks.kt index 5338fb435f..d01f35dc83 100644 --- a/src/com/android/launcher3/ModelCallbacks.kt +++ b/src/com/android/launcher3/ModelCallbacks.kt @@ -11,8 +11,8 @@ import com.android.launcher3.Utilities.SHOULD_SHOW_FIRST_PAGE_WIDGET import com.android.launcher3.WorkspaceLayoutManager.FIRST_SCREEN_ID import com.android.launcher3.allapps.AllAppsStore import com.android.launcher3.config.FeatureFlags -import com.android.launcher3.debug.TestEvent import com.android.launcher3.debug.TestEventEmitter +import com.android.launcher3.debug.TestEventEmitter.TestEvent import com.android.launcher3.model.BgDataModel import com.android.launcher3.model.StringCache import com.android.launcher3.model.data.AppInfo @@ -154,7 +154,7 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks { /*pause=*/ false, deviceProfile.isTwoPanels, ) - TestEventEmitter.INSTANCE.get(launcher).sendEvent(TestEvent.WORKSPACE_FINISH_LOADING) + TestEventEmitter.sendEvent(TestEvent.WORKSPACE_FINISH_LOADING) } /** diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 5072e37314..d6abb56286 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -17,6 +17,7 @@ package com.android.launcher3; import static com.android.app.animation.Interpolators.SCROLL; +import static com.android.launcher3.RemoveAnimationSettingsTracker.WINDOW_ANIMATION_SCALE_URI; import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled; import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType; import static com.android.launcher3.testing.shared.TestProtocol.SCROLL_FINISHED_MESSAGE; @@ -33,7 +34,6 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.os.Bundle; -import android.provider.Settings; import android.util.AttributeSet; import android.util.Log; import android.view.InputDevice; @@ -1756,8 +1756,8 @@ public abstract class PagedView extends ViewGrou } if (FeatureFlags.IS_STUDIO_BUILD && !Utilities.isRunningInTestHarness()) { - duration *= Settings.Global.getFloat(getContext().getContentResolver(), - Settings.Global.WINDOW_ANIMATION_SCALE, 1); + duration *= RemoveAnimationSettingsTracker.INSTANCE.get(getContext()).getValue( + WINDOW_ANIMATION_SCALE_URI); } whichPage = validateNewPage(whichPage); diff --git a/src/com/android/launcher3/RemoveAnimationSettingsTracker.kt b/src/com/android/launcher3/RemoveAnimationSettingsTracker.kt new file mode 100644 index 0000000000..dbc04f1613 --- /dev/null +++ b/src/com/android/launcher3/RemoveAnimationSettingsTracker.kt @@ -0,0 +1,110 @@ +/* + * 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 + +import android.content.Context +import android.database.ContentObserver +import android.net.Uri +import android.os.Handler +import android.os.Looper +import android.provider.Settings +import android.provider.Settings.Global.ANIMATOR_DURATION_SCALE +import android.provider.Settings.Global.TRANSITION_ANIMATION_SCALE +import android.provider.Settings.Global.WINDOW_ANIMATION_SCALE +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.dagger.LauncherAppComponent +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.DaggerSingletonObject +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import java.util.concurrent.ConcurrentHashMap +import javax.inject.Inject + +/** Tracker Class for when user turns on/off remove animation setting. */ +@LauncherAppSingleton +class RemoveAnimationSettingsTracker +@Inject +constructor(@ApplicationContext val context: Context, tracker: DaggerSingletonTracker) : + ContentObserver(Handler(Looper.getMainLooper())) { + + private val contentResolver = context.contentResolver + + /** Caches the last seen value for registered keys. */ + private val cache: MutableMap = ConcurrentHashMap() + + init { + UI_HELPER_EXECUTOR.execute { + contentResolver.registerContentObserver(WINDOW_ANIMATION_SCALE_URI, false, this) + contentResolver.registerContentObserver(TRANSITION_ANIMATION_SCALE_URI, false, this) + contentResolver.registerContentObserver(ANIMATOR_DURATION_SCALE_URI, false, this) + } + + tracker.addCloseable { + UI_HELPER_EXECUTOR.execute { contentResolver.unregisterContentObserver(this) } + } + } + + /** + * Returns the value for this classes key from the cache. If not in cache, will call + * [updateValue] to fetch. + */ + fun getValue(uri: Uri): Float { + return getValue(uri, 1f) + } + + /** + * Returns the value for this classes key from the cache. If not in cache, will call + * [getValueFromSettingsGlobal] to fetch. + */ + private fun getValue(uri: Uri, defaultValue: Float): Float { + return cache.computeIfAbsent(uri) { getValueFromSettingsGlobal(uri, defaultValue) } + } + + /** Returns if user has opted into having no animation on their device. */ + fun isRemoveAnimationEnabled(): Boolean { + return getValue(WINDOW_ANIMATION_SCALE_URI) == 0f && + getValue(TRANSITION_ANIMATION_SCALE_URI) == 0f && + getValue(ANIMATOR_DURATION_SCALE_URI) == 0f + } + + override fun onChange(selfChange: Boolean, uri: Uri?) { + if (uri == null) return + updateValue(uri) + } + + private fun getValueFromSettingsGlobal(uri: Uri, defaultValue: Float = 1f): Float { + return Settings.Global.getFloat(contentResolver, uri.lastPathSegment, defaultValue) + } + + private fun updateValue(uri: Uri, defaultValue: Float = 1f) { + val newValue = getValueFromSettingsGlobal(uri, defaultValue) + cache[uri] = newValue + } + + companion object { + @JvmField + val INSTANCE = + DaggerSingletonObject(LauncherAppComponent::getRemoveAnimationSettingsTracker) + @JvmField + val WINDOW_ANIMATION_SCALE_URI: Uri = Settings.Global.getUriFor(WINDOW_ANIMATION_SCALE) + @JvmField + val TRANSITION_ANIMATION_SCALE_URI: Uri = + Settings.Global.getUriFor(TRANSITION_ANIMATION_SCALE) + @JvmField + val ANIMATOR_DURATION_SCALE_URI: Uri = Settings.Global.getUriFor(ANIMATOR_DURATION_SCALE) + } +} diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index b41a425846..1b5e2e68b4 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -53,6 +53,7 @@ import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Bundle; import android.os.Parcelable; import android.util.AttributeSet; import android.util.Log; @@ -80,9 +81,8 @@ import com.android.launcher3.celllayout.CellLayoutLayoutParams; import com.android.launcher3.celllayout.CellPosMapper; import com.android.launcher3.celllayout.CellPosMapper.CellPos; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.debug.TestEvent; import com.android.launcher3.debug.TestEventEmitter; -import com.android.launcher3.dot.FolderDotInfo; +import com.android.launcher3.debug.TestEventEmitter.TestEvent; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragOptions; @@ -118,7 +118,6 @@ import com.android.launcher3.util.IntSparseArrayMap; import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.util.MSDLPlayerWrapper; import com.android.launcher3.util.OverlayEdgeEffect; -import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.WallpaperOffsetInterpolator; @@ -299,6 +298,17 @@ public class Workspace extends PagedView private final StatsLogManager mStatsLogManager; private final MSDLPlayerWrapper mMSDLPlayerWrapper; + + private final StateManager.StateListener mAccessibilityDropListener = + new StateListener<>() { + @Override + public void onStateTransitionComplete(LauncherState finalState) { + if (finalState == NORMAL) { + performAccessibilityActionOnViewTree(Workspace.this); + } + } + }; + @Nullable private DragController.DragListener mAccessibilityDragListener; @@ -881,6 +891,9 @@ public class Workspace extends PagedView mScreenOrder.removeValue(extraEmptyPageId); }); + // Since we removed some screens, before moving to next page, update the state + // description with correct page numbers. + updateAccessibilityViewPageDescription(); setCurrentPage(getNextPage()); // Update the page indicator to reflect the removed page. @@ -1106,6 +1119,9 @@ public class Workspace extends PagedView if (pageShift >= 0) { setCurrentPage(currentPage - pageShift); } + + // Now that we have removed some pages, ensure state description is up to date. + updateAccessibilityViewPageDescription(); } /** @@ -1454,11 +1470,13 @@ public class Workspace extends PagedView super.onAttachedToWindow(); mWallpaperOffset.setWindowToken(getWindowToken()); computeScroll(); + mLauncher.getStateManager().addStateListener(mAccessibilityDropListener); } protected void onDetachedFromWindow() { super.onDetachedFromWindow(); mWallpaperOffset.setWindowToken(null); + mLauncher.getStateManager().removeStateListener(mAccessibilityDropListener); } @Override @@ -2239,23 +2257,15 @@ public class Workspace extends PagedView // the order of operations in this method related to the StateListener below, please // test that accessibility moves retain focus after accessibility dropping an item. // Accessibility focus must be requested after launcher is back to a normal state - mLauncher.getStateManager().addStateListener(new StateListener() { - @Override - public void onStateTransitionComplete(LauncherState finalState) { - if (finalState == NORMAL) { - cell.performAccessibilityAction( - AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null); - mLauncher.getStateManager().removeStateListener(this); - } - } - }); + cell.setTag(R.id.perform_a11y_action_on_launcher_state_normal_tag, + AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS); } } if (d.stateAnnouncer != null && !droppedOnOriginalCell) { d.stateAnnouncer.completeAction(R.string.item_moved); } - TestEventEmitter.INSTANCE.get(getContext()).sendEvent(TestEvent.WORKSPACE_ON_DROP); + TestEventEmitter.sendEvent(TestEvent.WORKSPACE_ON_DROP); } @Nullable @@ -3413,38 +3423,6 @@ public class Workspace extends PagedView return null; } - public void updateNotificationDots(Predicate updatedDots) { - final PackageUserKey packageUserKey = new PackageUserKey(null, null); - Predicate matcher = info -> !packageUserKey.updateFromItemInfo(info) - || updatedDots.test(packageUserKey); - - ItemOperator op = (info, v) -> { - if (info instanceof WorkspaceItemInfo && v instanceof BubbleTextView) { - if (matcher.test(info)) { - ((BubbleTextView) v).applyDotState(info, true /* animate */); - } - } else if (info instanceof FolderInfo && v instanceof FolderIcon) { - FolderInfo fi = (FolderInfo) info; - if (fi.anyMatch(matcher)) { - FolderDotInfo folderDotInfo = new FolderDotInfo(); - for (ItemInfo si : fi.getContents()) { - folderDotInfo.addDotInfo(mLauncher.getDotInfoForItem(si)); - } - ((FolderIcon) v).setDotInfo(folderDotInfo); - } - } - - // process all the shortcuts - return false; - }; - - mapOverItems(op); - Folder folder = Folder.getOpen(mLauncher); - if (folder != null) { - folder.iterateOverItems(op); - } - } - /** * Remove workspace icons & widget information related to items in matcher. * @@ -3507,6 +3485,18 @@ public class Workspace extends PagedView protected void announcePageForAccessibility() { // Talkback focuses on AccessibilityActionView by default, so we need to modify the state // description there in order for the change in page scroll to be announced. + updateAccessibilityViewPageDescription(); + } + + /** + * Updates the state description that is set on the accessibility actions view for the + * workspace. + *

The updated value is called out when talkback focuses on the view and is not disruptive. + *

+ */ + protected void updateAccessibilityViewPageDescription() { + // Set the state description on accessibility action view so that when it is focused, + // talkback describes the correct state of home screen pages. ViewCompat.setStateDescription(mLauncher.getAccessibilityActionView(), getCurrentPageDescription()); } @@ -3580,4 +3570,22 @@ public class Workspace extends PagedView onEndStateTransition(); } } + + /** + * Recursively check view tag {@link R.id.perform_a11y_action_on_launcher_state_normal_tag} and + * call {@link View#performAccessibilityAction(int, Bundle)} on view tree. The tag is cleared + * after this call. + */ + private static void performAccessibilityActionOnViewTree(View view) { + Object tag = view.getTag(R.id.perform_a11y_action_on_launcher_state_normal_tag); + if (tag instanceof Integer) { + view.performAccessibilityAction((int) tag, null); + view.setTag(R.id.perform_a11y_action_on_launcher_state_normal_tag, null); + } + if (view instanceof ViewGroup viewgroup) { + for (int i = 0; i < viewgroup.getChildCount(); i++) { + performAccessibilityActionOnViewTree(viewgroup.getChildAt(i)); + } + } + } } diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index 260ff9f838..fafa60bf6d 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -116,6 +116,7 @@ public class ActivityAllAppsContainerView ScrimView.ScrimDrawingController { + private static final String TAG = "ActivityAllAppsContainerView"; public static final float PULL_MULTIPLIER = .02f; public static final float FLING_VELOCITY_MULTIPLIER = 1200f; protected static final String BUNDLE_KEY_CURRENT_PAGE = "launcher.allapps.current_page"; @@ -600,6 +601,7 @@ public class ActivityAllAppsContainerView mViewPager.getPageIndicator().setActiveMarker(AdapterHolder.MAIN); findViewById(R.id.tab_personal) .setOnClickListener((View view) -> { + Log.d(TAG, "rebindAdapters: " + "Clicked personal tab."); if (mViewPager.snapToPage(AdapterHolder.MAIN)) { mActivityContext.getStatsLogManager().logger() .log(LAUNCHER_ALLAPPS_TAP_ON_PERSONAL_TAB); @@ -607,6 +609,7 @@ public class ActivityAllAppsContainerView }); findViewById(R.id.tab_work) .setOnClickListener((View view) -> { + Log.d(TAG, "rebindAdapters: " + "Clicked work tab."); if (mViewPager.snapToPage(AdapterHolder.WORK)) { mActivityContext.getStatsLogManager().logger() .log(LAUNCHER_ALLAPPS_TAP_ON_WORK_TAB); diff --git a/src/com/android/launcher3/allapps/WorkPausedCard.java b/src/com/android/launcher3/allapps/WorkPausedCard.java index a14ac9819a..864ede8840 100644 --- a/src/com/android/launcher3/allapps/WorkPausedCard.java +++ b/src/com/android/launcher3/allapps/WorkPausedCard.java @@ -20,6 +20,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH import android.content.Context; import android.content.res.Configuration; import android.util.AttributeSet; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; @@ -34,6 +35,7 @@ import com.android.launcher3.views.ActivityContext; */ public class WorkPausedCard extends LinearLayout implements View.OnClickListener { + private static final String TAG = "WorkPausedCard"; private final ActivityContext mActivityContext; private Button mBtn; @@ -79,6 +81,7 @@ public class WorkPausedCard extends LinearLayout implements View.OnClickListener @Override public void onClick(View view) { + Log.d(TAG, "WorkPausedCard clicked."); mActivityContext.getAppsView().getWorkManager().setWorkProfileEnabled(true); mActivityContext.getStatsLogManager().logger().log(LAUNCHER_TURN_ON_WORK_APPS_TAP); } diff --git a/src/com/android/launcher3/allapps/WorkProfileManager.java b/src/com/android/launcher3/allapps/WorkProfileManager.java index 6d7d1930fd..920efa4f64 100644 --- a/src/com/android/launcher3/allapps/WorkProfileManager.java +++ b/src/com/android/launcher3/allapps/WorkProfileManager.java @@ -200,6 +200,7 @@ public class WorkProfileManager extends UserProfileManager private void onWorkFabClicked(View view) { if (getCurrentState() == STATE_ENABLED && mWorkUtilityView.isEnabled()) { + Log.d(TAG, "Work FAB clicked."); logEvents(LAUNCHER_TURN_OFF_WORK_APPS_TAP); setWorkProfileEnabled(false); } diff --git a/src/com/android/launcher3/allapps/WorkUtilityView.java b/src/com/android/launcher3/allapps/WorkUtilityView.java index e42a6b99df..20ceb15e76 100644 --- a/src/com/android/launcher3/allapps/WorkUtilityView.java +++ b/src/com/android/launcher3/allapps/WorkUtilityView.java @@ -30,6 +30,7 @@ import android.content.Intent; import android.graphics.Rect; import android.text.TextUtils; import android.util.AttributeSet; +import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.WindowInsets; @@ -63,6 +64,7 @@ import java.util.ArrayList; public class WorkUtilityView extends LinearLayout implements Insettable, KeyboardInsetAnimationCallback.KeyboardInsetListener { + private static final String TAG = "WorkUtilityView"; private static final int TEXT_EXPAND_OPACITY_DURATION = 300; private static final int TEXT_COLLAPSE_OPACITY_DURATION = 50; private static final int EXPAND_COLLAPSE_DURATION = 300; @@ -143,9 +145,11 @@ public class WorkUtilityView extends LinearLayout implements Insettable, mSchedulerButton.setOnClickListener(null); if (shouldUseScheduler()) { mSchedulerButton.setVisibility(VISIBLE); - mSchedulerButton.setOnClickListener(view -> - mActivityContext.startActivitySafely(view, - new Intent(mWorkSchedulerIntentAction), null /* itemInfo */)); + mSchedulerButton.setOnClickListener(view -> { + Log.d(TAG, "WorkScheduler button clicked."); + mActivityContext.startActivitySafely(view, + new Intent(mWorkSchedulerIntentAction), null /* itemInfo */); + }); } } diff --git a/src/com/android/launcher3/dagger/LauncherBaseAppComponent.java b/src/com/android/launcher3/dagger/LauncherBaseAppComponent.java index 35ae68f903..150761f75c 100644 --- a/src/com/android/launcher3/dagger/LauncherBaseAppComponent.java +++ b/src/com/android/launcher3/dagger/LauncherBaseAppComponent.java @@ -18,9 +18,13 @@ package com.android.launcher3.dagger; import android.content.Context; +import androidx.annotation.Nullable; + import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherPrefs; -import com.android.launcher3.graphics.IconShape; +import com.android.launcher3.RemoveAnimationSettingsTracker; +import com.android.launcher3.graphics.GridCustomizationsProxy; import com.android.launcher3.graphics.ThemeManager; import com.android.launcher3.icons.LauncherIcons.IconPool; import com.android.launcher3.model.ItemInstallQueue; @@ -44,6 +48,8 @@ import com.android.launcher3.widget.custom.CustomWidgetManager; import dagger.BindsInstance; +import javax.inject.Named; + /** * Launcher base component for Dagger injection. * @@ -57,7 +63,6 @@ public interface LauncherBaseAppComponent { ApiWrapper getApiWrapper(); CustomWidgetManager getCustomWidgetManager(); DynamicResource getDynamicResource(); - IconShape getIconShape(); InstallSessionHelper getInstallSessionHelper(); ItemInstallQueue getItemInstallQueue(); RefreshRateTracker getRefreshRateTracker(); @@ -76,10 +81,15 @@ public interface LauncherBaseAppComponent { LockedUserState getLockedUserState(); InvariantDeviceProfile getIDP(); IconPool getIconPool(); + RemoveAnimationSettingsTracker getRemoveAnimationSettingsTracker(); + LauncherAppState getLauncherAppState(); + GridCustomizationsProxy getGridCustomizationsProxy(); /** Builder for LauncherBaseAppComponent. */ interface Builder { @BindsInstance Builder appContext(@ApplicationContext Context context); + @BindsInstance Builder iconsDbName(@Nullable @Named("ICONS_DB") String dbFileName); + @BindsInstance Builder setSafeModeEnabled(@Named("SAFE_MODE") boolean safeModeEnabled); LauncherBaseAppComponent build(); } } diff --git a/src/com/android/launcher3/dagger/LauncherComponentProvider.kt b/src/com/android/launcher3/dagger/LauncherComponentProvider.kt index 71e3354abf..61991494b4 100644 --- a/src/com/android/launcher3/dagger/LauncherComponentProvider.kt +++ b/src/com/android/launcher3/dagger/LauncherComponentProvider.kt @@ -39,8 +39,10 @@ object LauncherComponentProvider { // Create a new component return Holder( - DaggerLauncherAppComponent.builder().appContext(app).build() - as LauncherAppComponent, + DaggerLauncherAppComponent.builder() + .appContext(app) + .setSafeModeEnabled(true) + .build() as LauncherAppComponent, existingFilter, ) .apply { inflater.filter = this } diff --git a/src/com/android/launcher3/debug/TestEventEmitter.java b/src/com/android/launcher3/debug/TestEventEmitter.java new file mode 100644 index 0000000000..ed3b4bbac9 --- /dev/null +++ b/src/com/android/launcher3/debug/TestEventEmitter.java @@ -0,0 +1,45 @@ +/* + * 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.debug; + +/** + * TestEventsEmitter shouldn't do anything since it runs on the launcher code and not on + * tests. This is just a placeholder and test should mock the static sendEvent method. + * See "EventsRule.kt" in tests folder where sendEvent is statically mocked to change the + * behavior in tests. + */ +public class TestEventEmitter { + public static void sendEvent(TestEvent event) { + } + + /** Events fired by the launcher. */ + public enum TestEvent { + + LAUNCHER_ON_CREATE("LAUNCHER_ON_CREATE"), + WORKSPACE_ON_DROP("WORKSPACE_ON_DROP"), + RESIZE_FRAME_SHOWING("RESIZE_FRAME_SHOWING"), + WORKSPACE_FINISH_LOADING("WORKSPACE_FINISH_LOADING"), + SPRING_LOADED_STATE_STARTED("SPRING_LOADED_STATE_STARTED"), + SPRING_LOADED_STATE_COMPLETED("SPRING_LOADED_STATE_COMPLETED"); + + TestEvent(String event) { + } + + } +} + + diff --git a/src/com/android/launcher3/debug/TestEventsEmitterProduction.kt b/src/com/android/launcher3/debug/TestEventsEmitterProduction.kt deleted file mode 100644 index 52b454f2b7..0000000000 --- a/src/com/android/launcher3/debug/TestEventsEmitterProduction.kt +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2024 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.debug - -import android.content.Context -import android.util.Log -import com.android.launcher3.util.MainThreadInitializedObject -import com.android.launcher3.util.SafeCloseable - -/** Events fired by the launcher. */ -enum class TestEvent(val event: String) { - LAUNCHER_ON_CREATE("LAUNCHER_ON_CREATE"), - WORKSPACE_ON_DROP("WORKSPACE_ON_DROP"), - RESIZE_FRAME_SHOWING("RESIZE_FRAME_SHOWING"), - WORKSPACE_FINISH_LOADING("WORKSPACE_FINISH_LOADING"), - SPRING_LOADED_STATE_STARTED("SPRING_LOADED_STATE_STARTED"), - SPRING_LOADED_STATE_COMPLETED("SPRING_LOADED_STATE_COMPLETED"), -} - -/** Interface to create TestEventEmitters. */ -interface TestEventEmitter : SafeCloseable { - - companion object { - @JvmField - val INSTANCE = - MainThreadInitializedObject { _: Context? -> - TestEventsEmitterProduction() - } - } - - fun sendEvent(event: TestEvent) -} - -/** - * TestEventsEmitterProduction shouldn't do anything since it runs on the launcher code and not on - * tests. This is just a placeholder and test should override this class. - */ -class TestEventsEmitterProduction : TestEventEmitter { - - override fun close() {} - - override fun sendEvent(event: TestEvent) { - Log.d("TestEventsEmitterProduction", "Event sent ${event.event}") - } -} diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index c50c008f30..613b4308eb 100644 --- a/src/com/android/launcher3/dragndrop/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -558,7 +558,7 @@ public abstract class DragController target.getHitRectRelativeToDragLayer(r); if (r.contains(x, y)) { - mActivity.getDragLayer().mapCoordInSelfToDescendant((View) target, + mActivity.getDragLayer().mapCoordInSelfToDescendant(target.getDropView(), mCoordinatesTemp); mDragObject.x = mCoordinatesTemp[0]; mDragObject.y = mCoordinatesTemp[1]; diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index 072673d1ea..981b78bb79 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -60,9 +60,9 @@ import androidx.dynamicanimation.animation.SpringForce; import com.android.app.animation.Interpolators; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.graphics.IconShape; +import com.android.launcher3.graphics.ThemeManager; import com.android.launcher3.icons.FastBitmapDrawable; -import com.android.launcher3.icons.LauncherIcons; +import com.android.launcher3.icons.IconNormalizer; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.util.RunnableList; import com.android.launcher3.views.ActivityContext; @@ -246,10 +246,12 @@ public abstract class DragView extends Fram public void setItemInfo(final ItemInfo info) { // Load the adaptive icon on a background thread and add the view in ui thread. MODEL_EXECUTOR.getHandler().postAtFrontOfQueue(() -> { + ThemeManager themeManager = ThemeManager.INSTANCE.get(getContext()); int w = mWidth; int h = mHeight; Pair fullDrawable = Utilities.getFullDrawable( - mActivity, info, w, h, true /* shouldThemeIcon */); + mActivity, info, w, h, + themeManager.isIconThemeEnabled()); if (fullDrawable != null) { AdaptiveIconDrawable adaptiveIcon = fullDrawable.first; int blurMargin = (int) mActivity.getResources() @@ -261,12 +263,7 @@ public abstract class DragView extends Fram // be scaled down due to icon normalization. mBadge = fullDrawable.second; FastBitmapDrawable.setBadgeBounds(mBadge, bounds); - - try (LauncherIcons li = LauncherIcons.obtain(mActivity)) { - // Since we just want the scale, avoid heavy drawing operations - Utilities.scaleRectAboutCenter(bounds, li.getNormalizer().getScale( - new AdaptiveIconDrawable(new ColorDrawable(Color.BLACK), null))); - } + Utilities.scaleRectAboutCenter(bounds, IconNormalizer.ICON_VISIBLE_AREA_FACTOR); // Shrink very tiny bit so that the clip path is smaller than the original bitmap // that has anti aliased edges and shadows. @@ -274,9 +271,8 @@ public abstract class DragView extends Fram Utilities.scaleRectAboutCenter(shrunkBounds, 0.98f); adaptiveIcon.setBounds(shrunkBounds); - IconShape iconShape = IconShape.INSTANCE.get(getContext()); final Path mask = (adaptiveIcon instanceof FolderAdaptiveIcon - ? iconShape.getFolderShape() : iconShape.getShape()) + ? themeManager.getFolderShape() : themeManager.getIconShape()) .getPath(shrunkBounds); mTranslateX = new SpringFloatValue(DragView.this, @@ -567,7 +563,7 @@ public abstract class DragView extends Fram return mContentViewParent; } - /** Return true if {@link mContent} is a {@link AppWidgetHostView}. */ + /** Return true if {@link #mContent} is a {@link AppWidgetHostView}. */ public boolean containsAppWidgetHostView() { return mContent instanceof AppWidgetHostView; } diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java index cf5150a751..36dad89e9a 100644 --- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java +++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java @@ -53,8 +53,18 @@ public class ClippedFolderIconLayoutRule { } else if (index >= MAX_NUM_ITEMS_IN_PREVIEW) { // Items beyond those displayed in the preview are animated to the center mTmpPoint[0] = mTmpPoint[1] = mAvailableSpace / 2 - (mIconSize * totalScale) / 2; - } else { - getPosition(index, curNumItems, mTmpPoint); + } else if (index == 0) { + // top left + getGridPosition(0, 0, mTmpPoint); + } else if (index == 1) { + // top right + getGridPosition(0, 1, mTmpPoint); + } else if (index == 2) { + // bottom left + getGridPosition(1, 0, mTmpPoint); + } else if (index == 3) { + // bottom right + getGridPosition(1, 1, mTmpPoint); } transX = mTmpPoint[0]; diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index fb48a4d559..0ce72494a8 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -65,6 +65,7 @@ import android.view.inputmethod.EditorInfo; import android.widget.TextView; import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.core.content.res.ResourcesCompat; @@ -261,7 +262,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo @Nullable private KeyboardInsetAnimationCallback mKeyboardInsetAnimationCallback; - private GradientDrawable mBackground; + private final @NonNull GradientDrawable mBackground; /** * Used to inflate the Workspace from XML. @@ -283,6 +284,10 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo // click). setFocusableInTouchMode(true); + mBackground = (GradientDrawable) Objects.requireNonNull( + ResourcesCompat.getDrawable(getResources(), + R.drawable.round_rect_folder, getContext().getTheme())); + mBackground.setCallback(this); } @Override @@ -296,9 +301,6 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo final DeviceProfile dp = mActivityContext.getDeviceProfile(); final int paddingLeftRight = dp.folderContentPaddingLeftRight; - mBackground = (GradientDrawable) ResourcesCompat.getDrawable(getResources(), - R.drawable.round_rect_folder, getContext().getTheme()); - mContent = findViewById(R.id.folder_content); mContent.setPadding(paddingLeftRight, dp.folderContentPaddingTop, paddingLeftRight, 0); mContent.setFolder(this); @@ -345,6 +347,11 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo return true; } + @Override + protected boolean verifyDrawable(@NonNull Drawable who) { + return super.verifyDrawable(who) || (who == mBackground); + } + void callBeginDragShared(View v, DragOptions options) { mLauncherDelegate.beginDragShared(v, this, options); } diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index 215761083b..d2354c18e1 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -46,8 +46,8 @@ import com.android.launcher3.Utilities; import com.android.launcher3.anim.PropertyResetListener; import com.android.launcher3.apppairs.AppPairIcon; import com.android.launcher3.celllayout.CellLayoutLayoutParams; -import com.android.launcher3.graphics.IconShape; -import com.android.launcher3.graphics.IconShape.ShapeDelegate; +import com.android.launcher3.graphics.ShapeDelegate; +import com.android.launcher3.graphics.ThemeManager; import com.android.launcher3.util.Themes; import com.android.launcher3.views.BaseDragLayer; @@ -237,7 +237,7 @@ public class FolderAnimationManager { } play(a, getAnimator(mFolder.mFooter, ALPHA, 0, 1f), footerStartDelay, footerAlphaDuration); - ShapeDelegate shapeDelegate = IconShape.INSTANCE.get(mContext).getFolderShape(); + ShapeDelegate shapeDelegate = ThemeManager.INSTANCE.get(mContext).getFolderShape(); // Create reveal animator for the folder background play(a, shapeDelegate.createRevealAnimator( mFolder, startRect, endRect, finalRadius, !mIsOpening)); diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java index 77fa355803..ba8a290392 100644 --- a/src/com/android/launcher3/folder/PreviewBackground.java +++ b/src/com/android/launcher3/folder/PreviewBackground.java @@ -47,8 +47,8 @@ import com.android.launcher3.CellLayout; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.celllayout.DelegatedCellDrawing; -import com.android.launcher3.graphics.IconShape; -import com.android.launcher3.graphics.IconShape.ShapeDelegate; +import com.android.launcher3.graphics.ShapeDelegate; +import com.android.launcher3.graphics.ThemeManager; import com.android.launcher3.util.Themes; import com.android.launcher3.views.ActivityContext; @@ -260,7 +260,7 @@ public class PreviewBackground extends DelegatedCellDrawing { } private ShapeDelegate getShape() { - return IconShape.INSTANCE.get(mContext).getFolderShape(); + return ThemeManager.INSTANCE.get(mContext).getFolderShape(); } public void drawShadow(Canvas canvas) { diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProxy.java similarity index 83% rename from src/com/android/launcher3/graphics/GridCustomizationsProvider.java rename to src/com/android/launcher3/graphics/GridCustomizationsProxy.java index 12c65c72cd..70b9f46c1f 100644 --- a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java +++ b/src/com/android/launcher3/graphics/GridCustomizationsProxy.java @@ -22,14 +22,11 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static java.util.Objects.requireNonNullElse; -import android.content.ContentProvider; import android.content.ContentValues; import android.content.Context; -import android.content.pm.PackageManager; import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; -import android.os.Binder; import android.os.Bundle; import android.os.Handler; import android.os.IBinder.DeathRecipient; @@ -45,15 +42,20 @@ import com.android.launcher3.InvariantDeviceProfile.GridOption; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherPrefs; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; import com.android.launcher3.model.BgDataModel; import com.android.launcher3.shapes.IconShapeModel; import com.android.launcher3.shapes.ShapesProvider; +import com.android.launcher3.util.ContentProviderProxy.ProxyProvider; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.Executors; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.RunnableList; import com.android.systemui.shared.Flags; import java.lang.ref.WeakReference; +import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -62,6 +64,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + /** * Exposes various launcher grid options and allows the caller to change them. * APIs: @@ -76,7 +80,7 @@ import java.util.concurrent.ExecutionException; * rows: number of rows in the grid * cols: number of columns in the grid * preview_count: number of previews available for this grid option. The preview uri - * looks like /preview// + * looks like /preview/[grid-name]/[preview index starting with 0] * is_default: true if this grid option is currently set to the system * * /get_preview: Open a file stream for the grid preview @@ -85,7 +89,8 @@ import java.util.concurrent.ExecutionException; * shape_key: key of the shape to apply * name: key of the grid to apply */ -public class GridCustomizationsProvider extends ContentProvider { +@LauncherAppSingleton +public class GridCustomizationsProxy implements ProxyProvider { private static final String TAG = "GridCustomizationsProvider"; @@ -126,23 +131,35 @@ public class GridCustomizationsProvider extends ContentProvider { private static final int MESSAGE_ID_UPDATE_GRID = 7414; private static final int MESSAGE_ID_UPDATE_COLOR = 856; - private static final String DEFAULT_SHAPE_KEY = "circle"; - // Set of all active previews used to track duplicate memory allocations private final Set mActivePreviews = Collections.newSetFromMap(new ConcurrentHashMap<>()); - @Override - public boolean onCreate() { - return true; + private final Context mContext; + private final ThemeManager mThemeManager; + private final LauncherPrefs mPrefs; + private final InvariantDeviceProfile mIdp; + + @Inject + GridCustomizationsProxy( + @ApplicationContext Context context, + ThemeManager themeManager, + LauncherPrefs prefs, + InvariantDeviceProfile idp, + DaggerSingletonTracker lifeCycle + ) { + mContext = context; + mThemeManager = themeManager; + mPrefs = prefs; + mIdp = idp; + lifeCycle.addCloseable(() -> mActivePreviews.forEach(PreviewLifecycleObserver::binderDied)); } @Override public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { - Context context = getContext(); String path = uri.getPath(); - if (context == null || path == null) { + if (path == null) { return null; } @@ -151,20 +168,19 @@ public class GridCustomizationsProvider extends ContentProvider { if (Flags.newCustomizationPickerUi()) { MatrixCursor cursor = new MatrixCursor(new String[]{ KEY_SHAPE_KEY, KEY_SHAPE_TITLE, KEY_PATH, KEY_IS_DEFAULT}); - String currentShapePath = - ThemeManager.INSTANCE.get(context).getIconState().getIconMask(); - Optional selectedShape = ShapesProvider.INSTANCE.getIconShapes() - .values() - .stream() - .filter(shape -> shape.getPathString().equals(currentShapePath)) - .findFirst(); + String currentShapePath = mThemeManager.getIconState().getIconMask(); + Optional selectedShape = Arrays.stream( + ShapesProvider.INSTANCE.getIconShapes()).filter( + shape -> shape.getPathString().equals(currentShapePath) + ).findFirst(); // Handle default for when current shape doesn't match new shapes. if (selectedShape.isEmpty()) { - selectedShape = Optional.ofNullable(ShapesProvider.INSTANCE.getIconShapes() - .get(DEFAULT_SHAPE_KEY)); + selectedShape = Optional.of(Arrays.stream( + ShapesProvider.INSTANCE.getIconShapes() + ).findFirst().get()); } - for (IconShapeModel shape : ShapesProvider.INSTANCE.getIconShapes().values()) { + for (IconShapeModel shape : ShapesProvider.INSTANCE.getIconShapes()) { cursor.newRow() .add(KEY_SHAPE_KEY, shape.getKey()) .add(KEY_SHAPE_TITLE, shape.getTitle()) @@ -180,8 +196,7 @@ public class GridCustomizationsProvider extends ContentProvider { MatrixCursor cursor = new MatrixCursor(new String[]{ KEY_NAME, KEY_GRID_TITLE, KEY_ROWS, KEY_COLS, KEY_PREVIEW_COUNT, KEY_IS_DEFAULT, KEY_GRID_ICON_ID}); - InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(getContext()); - List gridOptionList = idp.parseAllGridOptions(getContext()); + List gridOptionList = mIdp.parseAllGridOptions(mContext); if (com.android.launcher3.Flags.oneGridSpecs()) { gridOptionList.sort(Comparator .comparingInt((GridOption option) -> option.numColumns) @@ -194,8 +209,8 @@ public class GridCustomizationsProvider extends ContentProvider { .add(KEY_ROWS, gridOption.numRows) .add(KEY_COLS, gridOption.numColumns) .add(KEY_PREVIEW_COUNT, 1) - .add(KEY_IS_DEFAULT, idp.numColumns == gridOption.numColumns - && idp.numRows == gridOption.numRows) + .add(KEY_IS_DEFAULT, mIdp.numColumns == gridOption.numColumns + && mIdp.numRows == gridOption.numRows) .add(KEY_GRID_ICON_ID, gridOption.gridIconId); } return cursor; @@ -203,8 +218,7 @@ public class GridCustomizationsProvider extends ContentProvider { case GET_ICON_THEMED: case ICON_THEMED: { MatrixCursor cursor = new MatrixCursor(new String[]{BOOLEAN_VALUE}); - cursor.newRow().add(BOOLEAN_VALUE, - ThemeManager.INSTANCE.get(getContext()).isMonoThemeEnabled() ? 1 : 0); + cursor.newRow().add(BOOLEAN_VALUE, mThemeManager.isMonoThemeEnabled() ? 1 : 0); return cursor; } default: @@ -212,39 +226,22 @@ public class GridCustomizationsProvider extends ContentProvider { } } - @Override - public String getType(Uri uri) { - return "vnd.android.cursor.dir/launcher_grid"; - } - - @Override - public Uri insert(Uri uri, ContentValues initialValues) { - return null; - } - - @Override - public int delete(Uri uri, String selection, String[] selectionArgs) { - return 0; - } - @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { String path = uri.getPath(); - Context context = getContext(); - if (path == null || context == null) { + if (path == null) { return 0; } switch (path) { case KEY_DEFAULT_GRID: { if (Flags.newCustomizationPickerUi()) { - LauncherPrefs.INSTANCE.get(context).put(PREF_ICON_SHAPE, + mPrefs.put(PREF_ICON_SHAPE, requireNonNullElse(values.getAsString(KEY_SHAPE_KEY), "")); } String gridName = values.getAsString(KEY_NAME); - InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(context); // Verify that this is a valid grid option GridOption match = null; - for (GridOption option : idp.parseAllGridOptions(context)) { + for (GridOption option : mIdp.parseAllGridOptions(mContext)) { String name = option.name; if (name != null && name.equals(gridName)) { match = option; @@ -255,23 +252,22 @@ public class GridCustomizationsProvider extends ContentProvider { return 0; } - idp.setCurrentGrid(context, gridName); + mIdp.setCurrentGrid(mContext, gridName); if (Flags.newCustomizationPickerUi()) { try { // Wait for device profile to be fully reloaded and applied to the launcher - loadModelSync(context); + loadModelSync(mContext); } catch (ExecutionException | InterruptedException e) { Log.e(TAG, "Fail to load model", e); } } - context.getContentResolver().notifyChange(uri, null); + mContext.getContentResolver().notifyChange(uri, null); return 1; } case ICON_THEMED: case SET_ICON_THEMED: { - ThemeManager.INSTANCE.get(context) - .setMonoThemeEnabled(values.getAsBoolean(BOOLEAN_VALUE)); - context.getContentResolver().notifyChange(uri, null); + mThemeManager.setMonoThemeEnabled(values.getAsBoolean(BOOLEAN_VALUE)); + mContext.getContentResolver().notifyChange(uri, null); return 1; } default: @@ -298,17 +294,6 @@ public class GridCustomizationsProvider extends ContentProvider { @Override public Bundle call(@NonNull String method, String arg, Bundle extras) { - Context context = getContext(); - if (context == null) { - return null; - } - - if (context.checkPermission("android.permission.BIND_WALLPAPER", - Binder.getCallingPid(), Binder.getCallingUid()) - != PackageManager.PERMISSION_GRANTED) { - return null; - } - if (METHOD_GET_PREVIEW.equals(method)) { return getPreview(extras); } else { @@ -317,14 +302,10 @@ public class GridCustomizationsProvider extends ContentProvider { } private synchronized Bundle getPreview(Bundle request) { - Context context = getContext(); - if (context == null) { - return null; - } RunnableList lifeCycleTracker = new RunnableList(); try { PreviewSurfaceRenderer renderer = new PreviewSurfaceRenderer( - getContext(), lifeCycleTracker, request); + mContext, lifeCycleTracker, request); PreviewLifecycleObserver observer = new PreviewLifecycleObserver(lifeCycleTracker, renderer); @@ -387,7 +368,9 @@ public class GridCustomizationsProvider extends ContentProvider { if (Flags.newCustomizationPickerUi() && com.android.launcher3.Flags.enableLauncherIconShapes()) { String shapeKey = message.getData().getString(KEY_SHAPE_KEY); - renderer.updateShape(shapeKey); + if (!TextUtils.isEmpty(shapeKey)) { + renderer.updateShape(shapeKey); + } } break; case MESSAGE_ID_UPDATE_GRID: diff --git a/src/com/android/launcher3/graphics/LauncherCustomizationProvider.kt b/src/com/android/launcher3/graphics/LauncherCustomizationProvider.kt new file mode 100644 index 0000000000..c949e2ec17 --- /dev/null +++ b/src/com/android/launcher3/graphics/LauncherCustomizationProvider.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2023 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.graphics + +import android.content.Context +import android.net.Uri +import com.android.launcher3.dagger.LauncherComponentProvider.appComponent +import com.android.launcher3.util.ContentProviderProxy + +/** Provider for various Launcher customizations exposed via a ContentProvider API */ +class LauncherCustomizationProvider : ContentProviderProxy() { + + override fun getProxy(ctx: Context): ProxyProvider? = ctx.appComponent.gridCustomizationsProxy + + override fun getType(uri: Uri) = "vnd.android.cursor.dir/launcher_grid" +} diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java index 03f05820b7..3836f7d3ac 100644 --- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java +++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java @@ -28,6 +28,7 @@ import static com.android.launcher3.LauncherPrefs.GRID_NAME; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; import static com.android.launcher3.Utilities.SHOULD_SHOW_FIRST_PAGE_WIDGET; +import static com.android.launcher3.graphics.ThemeManager.PREF_ICON_SHAPE; import static com.android.launcher3.model.ModelUtils.currentScreenContentFilter; import android.app.Fragment; @@ -67,7 +68,6 @@ import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener; import com.android.launcher3.Hotseat; import com.android.launcher3.InsettableFrameLayout; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.ProxyPrefs; @@ -94,7 +94,7 @@ import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.IntArray; import com.android.launcher3.util.IntSet; -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext; +import com.android.launcher3.util.SandboxContext; import com.android.launcher3.util.WindowBounds; import com.android.launcher3.util.window.WindowManagerProxy; import com.android.launcher3.views.ActivityContext; @@ -138,16 +138,15 @@ public class LauncherPreviewRenderer extends ContextWrapper private final String mPrefName; - public PreviewContext(Context base, String gridName) { + public PreviewContext(Context base, String gridName, String shapeKey) { super(base); mPrefName = "preview-" + UUID.randomUUID().toString(); LauncherPrefs prefs = new ProxyPrefs(this, getSharedPreferences(mPrefName, MODE_PRIVATE)); prefs.put(GRID_NAME, gridName); + prefs.put(PREF_ICON_SHAPE, shapeKey); initDaggerComponent( DaggerLauncherPreviewRenderer_PreviewAppComponent.builder().bindPrefs(prefs)); - putObject(LauncherAppState.INSTANCE, - new LauncherAppState(this, null /* iconCacheFileName */)); } @Override diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java index 50d6d1c4d6..3bd9fb54ca 100644 --- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java +++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java @@ -119,7 +119,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable { IconPalette.getPreloadProgressColor(context, info.bitmap.color), getPreloadColors(context), Utilities.isDarkTheme(context), - IconShape.INSTANCE.get(context).getShape().getPath(DEFAULT_PATH_SIZE) + ThemeManager.INSTANCE.get(context).getIconShape().getPath(DEFAULT_PATH_SIZE) ); } diff --git a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java index f0d670e59a..3641896e16 100644 --- a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java +++ b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java @@ -64,7 +64,6 @@ import com.android.launcher3.model.BgDataModel; import com.android.launcher3.model.BgDataModel.Callbacks; import com.android.launcher3.model.LoaderTask; import com.android.launcher3.model.ModelDbController; -import com.android.launcher3.provider.LauncherDbUtils; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.Themes; @@ -73,7 +72,6 @@ import com.android.systemui.shared.Flags; import java.util.ArrayList; import java.util.Map; -import java.util.Objects; import java.util.concurrent.TimeUnit; /** Render preview using surface view. */ @@ -90,8 +88,9 @@ public class PreviewSurfaceRenderer { private static final String KEY_COLOR_RESOURCE_IDS = "color_resource_ids"; private static final String KEY_COLOR_VALUES = "color_values"; private static final String KEY_DARK_MODE = "use_dark_mode"; + public static final String KEY_SKIP_ANIMATIONS = "skip_animations"; - private Context mContext; + private final Context mContext; private SparseIntArray mPreviewColorOverride; private String mGridName; private String mShapeKey; @@ -104,6 +103,7 @@ public class PreviewSurfaceRenderer { private final IBinder mHostToken; private final int mWidth; private final int mHeight; + private final boolean mSkipAnimations; private final int mDisplayId; private final Display mDisplay; private final WallpaperColors mWallpaperColors; @@ -120,15 +120,17 @@ public class PreviewSurfaceRenderer { if (mGridName == null) { mGridName = LauncherPrefs.get(context).get(GRID_NAME); } + mShapeKey = LauncherPrefs.get(context).get(PREF_ICON_SHAPE); mWallpaperColors = bundle.getParcelable(KEY_COLORS); if (Flags.newCustomizationPickerUi()) { updateColorOverrides(bundle); } - mHideQsb = bundle.getBoolean(GridCustomizationsProvider.KEY_HIDE_BOTTOM_ROW); + mHideQsb = bundle.getBoolean(GridCustomizationsProxy.KEY_HIDE_BOTTOM_ROW); mHostToken = bundle.getBinder(KEY_HOST_TOKEN); mWidth = bundle.getInt(KEY_VIEW_WIDTH); mHeight = bundle.getInt(KEY_VIEW_HEIGHT); + mSkipAnimations = bundle.getBoolean(KEY_SKIP_ANIMATIONS, false); mDisplayId = bundle.getInt(KEY_DISPLAY_ID); mDisplay = context.getSystemService(DisplayManager.class) .getDisplay(mDisplayId); @@ -225,8 +227,8 @@ public class PreviewSurfaceRenderer { * * @param shapeKey key for the IconShape model */ - public void updateShape(@Nullable String shapeKey) { - if (Objects.equals(mShapeKey, shapeKey)) { + public void updateShape(String shapeKey) { + if (shapeKey.equals(mShapeKey)) { Log.w(TAG, "Preview shape already set, skipping. shape=" + mShapeKey); return; } @@ -332,22 +334,10 @@ public class PreviewSurfaceRenderer { private void loadModelData() { final Context inflationContext = getPreviewContext(); if (!mGridName.equals(LauncherPrefs.INSTANCE.get(mContext).get(GRID_NAME)) - || mShapeKey != null) { + || !mShapeKey.equals(LauncherPrefs.INSTANCE.get(mContext).get(PREF_ICON_SHAPE))) { // Start the migration - PreviewContext previewContext = new PreviewContext(inflationContext, mGridName); - if (mShapeKey != null) { - LauncherPrefs.INSTANCE.get(previewContext).put(PREF_ICON_SHAPE, mShapeKey); - } - // Copy existing data to preview DB - LauncherDbUtils.copyTable(LauncherAppState.getInstance(mContext) - .getModel().getModelDbController().getDb(), - TABLE_NAME, - LauncherAppState.getInstance(previewContext) - .getModel().getModelDbController().getDb(), - TABLE_NAME, - mContext); - LauncherAppState.getInstance(previewContext) - .getModel().getModelDbController().clearEmptyDbFlag(); + PreviewContext previewContext = + new PreviewContext(inflationContext, mGridName, mShapeKey); BgDataModel bgModel = new BgDataModel(); new LoaderTask( @@ -434,7 +424,7 @@ public class PreviewSurfaceRenderer { if (!Flags.newCustomizationPickerUi()) { - view.setAlpha(0); + view.setAlpha(mSkipAnimations ? 1 : 0); view.animate().alpha(1) .setInterpolator(new AccelerateDecelerateInterpolator()) .setDuration(FADE_IN_ANIMATION_DURATION) @@ -455,7 +445,7 @@ public class PreviewSurfaceRenderer { ); mViewRoot.setLayoutParams(layoutParams); mViewRoot.addView(view); - mViewRoot.setAlpha(0); + mViewRoot.setAlpha(mSkipAnimations ? 1 : 0); mViewRoot.animate().alpha(1) .setInterpolator(new AccelerateDecelerateInterpolator()) .setDuration(FADE_IN_ANIMATION_DURATION) diff --git a/src/com/android/launcher3/graphics/IconShape.kt b/src/com/android/launcher3/graphics/ShapeDelegate.kt similarity index 80% rename from src/com/android/launcher3/graphics/IconShape.kt rename to src/com/android/launcher3/graphics/ShapeDelegate.kt index eac34406c2..9033eac049 100644 --- a/src/com/android/launcher3/graphics/IconShape.kt +++ b/src/com/android/launcher3/graphics/ShapeDelegate.kt @@ -42,78 +42,37 @@ import androidx.graphics.shapes.rectangle import androidx.graphics.shapes.toPath import androidx.graphics.shapes.transformed import com.android.launcher3.anim.RoundedRectRevealOutlineProvider -import com.android.launcher3.dagger.LauncherAppComponent -import com.android.launcher3.dagger.LauncherAppSingleton -import com.android.launcher3.graphics.ThemeManager.ThemeChangeListener import com.android.launcher3.icons.GraphicsUtils -import com.android.launcher3.icons.IconNormalizer.normalizeAdaptiveIcon -import com.android.launcher3.util.DaggerSingletonObject -import com.android.launcher3.util.DaggerSingletonTracker import com.android.launcher3.views.ClipPathView -import javax.inject.Inject /** Abstract representation of the shape of an icon shape */ -@LauncherAppSingleton -class IconShape -@Inject -constructor(private val themeManager: ThemeManager, lifeCycle: DaggerSingletonTracker) { +interface ShapeDelegate { - val normalizationScale = - normalizeAdaptiveIcon( - AdaptiveIconDrawable(null, ColorDrawable(Color.BLACK)), - AREA_CALC_SIZE, - ) + fun getPath(pathSize: Float = DEFAULT_PATH_SIZE) = + Path().apply { addToPath(this, 0f, 0f, pathSize / 2) } - var shape: ShapeDelegate = pickBestShape(themeManager.iconState.iconMask) - private set - - var folderShape: ShapeDelegate = - themeManager.iconState.run { - if (folderShapeMask == iconMask || folderShapeMask.isEmpty()) shape - else pickBestShape(folderShapeMask) + fun getPath(bounds: Rect) = + Path().apply { + addToPath( + this, + bounds.left.toFloat(), + bounds.top.toFloat(), + // Radius is half of the average size of the icon + (bounds.width() + bounds.height()) / 4f, + ) } - private set - init { - val changeListener = ThemeChangeListener { - shape = pickBestShape(themeManager.iconState.iconMask) - folderShape = - themeManager.iconState.run { - if (folderShapeMask == iconMask || folderShapeMask.isEmpty()) shape - else pickBestShape(folderShapeMask) - } - } - themeManager.addChangeListener(changeListener) - lifeCycle.addCloseable { themeManager.removeChangeListener(changeListener) } - } + fun drawShape(canvas: Canvas, offsetX: Float, offsetY: Float, radius: Float, paint: Paint) - interface ShapeDelegate { - fun getPath(pathSize: Float = DEFAULT_PATH_SIZE) = - Path().apply { addToPath(this, 0f, 0f, pathSize / 2) } + fun addToPath(path: Path, offsetX: Float, offsetY: Float, radius: Float) - fun getPath(bounds: Rect) = - Path().apply { - addToPath( - this, - bounds.left.toFloat(), - bounds.top.toFloat(), - // Radius is half of the average size of the icon - (bounds.width() + bounds.height()) / 4f, - ) - } - - fun drawShape(canvas: Canvas, offsetX: Float, offsetY: Float, radius: Float, paint: Paint) - - fun addToPath(path: Path, offsetX: Float, offsetY: Float, radius: Float) - - fun createRevealAnimator( - target: T, - startRect: Rect, - endRect: Rect, - endRadius: Float, - isReversed: Boolean, - ): ValueAnimator where T : View, T : ClipPathView - } + fun createRevealAnimator( + target: T, + startRect: Rect, + endRect: Rect, + endRadius: Float, + isReversed: Boolean, + ): ValueAnimator where T : View, T : ClipPathView class Circle : RoundedSquare(1f) { @@ -179,10 +138,15 @@ constructor(private val themeManager: ThemeManager, lifeCycle: DaggerSingletonTr } .createRevealAnimator(target, isReversed) } + + override fun equals(other: Any?) = + other is RoundedSquare && other.radiusRatio == radiusRatio + + override fun hashCode() = radiusRatio.hashCode() } /** Generic shape delegate with pathString in bounds [0, 0, 100, 100] */ - class GenericPathShape(pathString: String) : ShapeDelegate { + data class GenericPathShape(private val pathString: String) : ShapeDelegate { private val poly = RoundedPolygon( features = SvgPathParser.parseFeatures(pathString), @@ -287,7 +251,6 @@ constructor(private val themeManager: ThemeManager, lifeCycle: DaggerSingletonTr } companion object { - @JvmField var INSTANCE = DaggerSingletonObject(LauncherAppComponent::getIconShape) const val TAG = "IconShape" const val DEFAULT_PATH_SIZE = 100f @@ -312,7 +275,6 @@ constructor(private val themeManager: ThemeManager, lifeCycle: DaggerSingletonTr } } - @VisibleForTesting fun pickBestShape(shapeStr: String): ShapeDelegate { val baseShape = if (shapeStr.isNotEmpty()) { @@ -332,7 +294,6 @@ constructor(private val themeManager: ThemeManager, lifeCycle: DaggerSingletonTr return pickBestShape(baseShape, shapeStr) } - @VisibleForTesting fun pickBestShape(baseShape: Path, shapeStr: String): ShapeDelegate { val calcAreaDiff = areaDiffCalculator(baseShape) diff --git a/src/com/android/launcher3/graphics/ThemeManager.kt b/src/com/android/launcher3/graphics/ThemeManager.kt index e767290d8d..ebb7ea0de9 100644 --- a/src/com/android/launcher3/graphics/ThemeManager.kt +++ b/src/com/android/launcher3/graphics/ThemeManager.kt @@ -19,12 +19,14 @@ package com.android.launcher3.graphics import android.content.Context import android.content.res.Resources import com.android.launcher3.EncryptionType +import com.android.launcher3.Item import com.android.launcher3.LauncherPrefChangeListener import com.android.launcher3.LauncherPrefs import com.android.launcher3.LauncherPrefs.Companion.backedUpItem import com.android.launcher3.dagger.ApplicationContext import com.android.launcher3.dagger.LauncherAppComponent import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.graphics.ShapeDelegate.Companion.pickBestShape import com.android.launcher3.icons.IconThemeController import com.android.launcher3.icons.mono.MonoIconThemeController import com.android.launcher3.shapes.ShapesProvider @@ -37,50 +39,57 @@ import javax.inject.Inject /** Centralized class for managing Launcher icon theming */ @LauncherAppSingleton -open class ThemeManager +class ThemeManager @Inject constructor( - @ApplicationContext protected val context: Context, - protected val prefs: LauncherPrefs, + @ApplicationContext private val context: Context, + private val prefs: LauncherPrefs, + private val iconControllerFactory: IconControllerFactory, lifecycle: DaggerSingletonTracker, ) { /** Representation of the current icon state */ - var iconState = parseIconState() + var iconState = parseIconState(null) private set var isMonoThemeEnabled set(value) = prefs.put(THEMED_ICONS, value) get() = prefs.get(THEMED_ICONS) - val themeController: IconThemeController? + val themeController get() = iconState.themeController - val isIconThemeEnabled: Boolean + val isIconThemeEnabled get() = themeController != null + val iconShape + get() = iconState.iconShape + + val folderShape + get() = iconState.folderShape + private val listeners = CopyOnWriteArrayList() init { val receiver = SimpleBroadcastReceiver(context, MAIN_EXECUTOR) { verifyIconState() } receiver.registerPkgActions("android", ACTION_OVERLAY_CHANGED) - val prefListener = LauncherPrefChangeListener { key -> - when (key) { - KEY_THEMED_ICONS, - KEY_ICON_SHAPE -> verifyIconState() - } - } - prefs.addListener(prefListener, THEMED_ICONS, PREF_ICON_SHAPE) + val keys = (iconControllerFactory.prefKeys + PREF_ICON_SHAPE) + val keysArray = keys.toTypedArray() + val prefKeySet = keys.map { it.sharedPrefKey } + val prefListener = LauncherPrefChangeListener { key -> + if (prefKeySet.contains(key)) verifyIconState() + } + prefs.addListener(prefListener, *keysArray) lifecycle.addCloseable { receiver.unregisterReceiverSafely() - prefs.removeListener(prefListener) + prefs.removeListener(prefListener, *keysArray) } } - protected fun verifyIconState() { - val newState = parseIconState() + private fun verifyIconState() { + val newState = parseIconState(iconState) if (newState == iconState) return iconState = newState @@ -91,10 +100,10 @@ constructor( fun removeChangeListener(listener: ThemeChangeListener) = listeners.remove(listener) - private fun parseIconState(): IconState { + private fun parseIconState(oldState: IconState?): IconState { val shapeModel = prefs.get(PREF_ICON_SHAPE).let { shapeOverride -> - ShapesProvider.iconShapes.values.firstOrNull { it.key == shapeOverride } + ShapesProvider.iconShapes.firstOrNull { it.key == shapeOverride } } val iconMask = when { @@ -102,24 +111,38 @@ constructor( CONFIG_ICON_MASK_RES_ID == Resources.ID_NULL -> "" else -> context.resources.getString(CONFIG_ICON_MASK_RES_ID) } + + val iconShape = + if (oldState != null && oldState.iconMask == iconMask) oldState.iconShape + else pickBestShape(iconMask) + + val folderShapeMask = shapeModel?.folderPathString ?: iconMask + val folderShape = + when { + oldState != null && oldState.folderShapeMask == folderShapeMask -> + oldState.folderShape + folderShapeMask == iconMask || folderShapeMask.isEmpty() -> iconShape + else -> pickBestShape(folderShapeMask) + } + return IconState( iconMask = iconMask, - folderShapeMask = shapeModel?.folderPathString ?: iconMask, - themeController = createThemeController(), + folderShapeMask = folderShapeMask, + themeController = iconControllerFactory.createThemeController(), iconScale = shapeModel?.iconScale ?: 1f, + iconShape = iconShape, + folderShape = folderShape, ) } - protected open fun createThemeController(): IconThemeController? { - return if (isMonoThemeEnabled) MONO_THEME_CONTROLLER else null - } - data class IconState( val iconMask: String, val folderShapeMask: String, val themeController: IconThemeController?, val themeCode: String = themeController?.themeID ?: "no-theme", val iconScale: Float = 1f, + val iconShape: ShapeDelegate, + val folderShape: ShapeDelegate, ) { fun toUniqueId() = "${iconMask.hashCode()},$themeCode" } @@ -129,6 +152,15 @@ constructor( fun onThemeChanged() } + open class IconControllerFactory @Inject constructor(protected val prefs: LauncherPrefs) { + + open val prefKeys: List = listOf(THEMED_ICONS) + + open fun createThemeController(): IconThemeController? { + return if (prefs.get(THEMED_ICONS)) MONO_THEME_CONTROLLER else null + } + } + companion object { @JvmField val INSTANCE = DaggerSingletonObject(LauncherAppComponent::getThemeManager) diff --git a/src/com/android/launcher3/icons/CacheableShortcutInfo.kt b/src/com/android/launcher3/icons/CacheableShortcutInfo.kt index 225e12f47a..50dd146ca6 100644 --- a/src/com/android/launcher3/icons/CacheableShortcutInfo.kt +++ b/src/com/android/launcher3/icons/CacheableShortcutInfo.kt @@ -30,6 +30,7 @@ import com.android.launcher3.icons.BaseIconFactory.IconOptions import com.android.launcher3.icons.cache.BaseIconCache import com.android.launcher3.icons.cache.CachingLogic import com.android.launcher3.shortcuts.ShortcutKey +import com.android.launcher3.util.ApiWrapper import com.android.launcher3.util.ApplicationInfoWrapper import com.android.launcher3.util.PackageUserKey import com.android.launcher3.util.Themes @@ -114,7 +115,15 @@ object CacheableShortcutCachingLogic : CachingLogic { d, IconOptions() .setExtractedColor(Themes.getColorAccent(context)) - .setSourceHint(getSourceHint(info, cache)), + .setSourceHint( + getSourceHint(info, cache) + .copy( + isFileDrawable = + ApiWrapper.INSTANCE[context].isFileDrawable( + info.shortcutInfo + ) + ) + ), ) } ?: BitmapInfo.LOW_RES_INFO } diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java index 9f99e8f00a..119a6b122b 100644 --- a/src/com/android/launcher3/icons/IconCache.java +++ b/src/com/android/launcher3/icons/IconCache.java @@ -20,6 +20,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SH import static com.android.launcher3.icons.cache.CacheLookupFlag.DEFAULT_LOOKUP_FLAG; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; +import static com.android.launcher3.util.LooperExecutor.CALLER_ICON_CACHE; import static com.android.launcher3.widget.WidgetSections.NO_CATEGORY; import static java.util.stream.Collectors.groupingBy; @@ -35,7 +36,6 @@ import android.content.pm.ShortcutInfo; import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.os.Looper; -import android.os.Process; import android.os.Trace; import android.os.UserHandle; import android.text.TextUtils; @@ -51,6 +51,8 @@ import androidx.core.util.Pair; import com.android.launcher3.Flags; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Utilities; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; import com.android.launcher3.icons.cache.BaseIconCache; import com.android.launcher3.icons.cache.CacheLookupFlag; import com.android.launcher3.icons.cache.CachedObject; @@ -66,6 +68,7 @@ import com.android.launcher3.pm.InstallSessionHelper; import com.android.launcher3.pm.UserCache; import com.android.launcher3.util.CancellableTask; import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.util.DaggerSingletonTracker; import com.android.launcher3.util.InstantAppResolver; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.widget.WidgetSections; @@ -79,9 +82,13 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Stream; +import javax.inject.Inject; +import javax.inject.Named; + /** * Cache of application icons. Icons can be made from any thread. */ +@LauncherAppSingleton public class IconCache extends BaseIconCache { // Shortcut extra which can point to a packageName and can be used to indicate an alternate @@ -96,24 +103,39 @@ public class IconCache extends BaseIconCache { private final LauncherApps mLauncherApps; private final UserCache mUserManager; + private final InstallSessionHelper mInstallSessionHelper; private final InstantAppResolver mInstantAppResolver; private final CancellableTask mCancelledTask; + private final LauncherIcons.IconPool mIconPool; private final SparseArray mWidgetCategoryBitmapInfos; private int mPendingIconRequestCount = 0; - public IconCache(Context context, InvariantDeviceProfile idp, String dbFileName, - IconProvider iconProvider) { + @Inject + public IconCache( + @ApplicationContext Context context, + InvariantDeviceProfile idp, + @Nullable @Named("ICONS_DB") String dbFileName, + UserCache userCache, + LauncherIconProvider iconProvider, + InstallSessionHelper installSessionHelper, + LauncherIcons.IconPool iconPool, + DaggerSingletonTracker lifecycle) { super(context, dbFileName, MODEL_EXECUTOR.getLooper(), idp.fillResIconDpi, idp.iconBitmapSize, true /* inMemoryCache */, iconProvider); mLauncherApps = context.getSystemService(LauncherApps.class); - mUserManager = UserCache.INSTANCE.get(context); + mUserManager = userCache; + mInstallSessionHelper = installSessionHelper; + mIconPool = iconPool; + mInstantAppResolver = InstantAppResolver.newInstance(context); mWidgetCategoryBitmapInfos = new SparseArray<>(); mCancelledTask = new CancellableTask(() -> null, MAIN_EXECUTOR, c -> { }); mCancelledTask.cancel(); + + lifecycle.addCloseable(this::close); } @Override @@ -129,7 +151,7 @@ public class IconCache extends BaseIconCache { @NonNull @Override public BaseIconFactory getIconFactory() { - return LauncherIcons.obtain(context); + return mIconPool.obtain(); } /** @@ -182,7 +204,7 @@ public class IconCache extends BaseIconCache { Runnable endRunnable; if (Looper.myLooper() == Looper.getMainLooper()) { if (mPendingIconRequestCount <= 0) { - MODEL_EXECUTOR.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND); + MODEL_EXECUTOR.elevatePriority(CALLER_ICON_CACHE); } mPendingIconRequestCount++; endRunnable = this::onIconRequestEnd; @@ -199,7 +221,7 @@ public class IconCache extends BaseIconCache { private void onIconRequestEnd() { mPendingIconRequestCount--; if (mPendingIconRequestCount <= 0) { - MODEL_EXECUTOR.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); + MODEL_EXECUTOR.restorePriority(CALLER_ICON_CACHE); } } @@ -279,8 +301,7 @@ public class IconCache extends BaseIconCache { String override = shortcutInfo.getExtras() == null ? null : shortcutInfo.getExtras().getString(EXTRA_SHORTCUT_BADGE_OVERRIDE_PACKAGE); if (!TextUtils.isEmpty(override) - && InstallSessionHelper.INSTANCE.get(context) - .isTrustedPackage(pkg, shortcutInfo.getUserHandle())) { + && mInstallSessionHelper.isTrustedPackage(pkg, shortcutInfo.getUserHandle())) { pkg = override; } else { // Try component based badge before trying the normal package badge @@ -536,7 +557,7 @@ public class IconCache extends BaseIconCache { return; } - try (LauncherIcons li = LauncherIcons.obtain(context)) { + try (LauncherIcons li = mIconPool.obtain()) { final BitmapInfo tempBitmap = li.createBadgedIconBitmap( context.getDrawable(widgetSection.mSectionDrawable), new BaseIconFactory.IconOptions()); diff --git a/src/com/android/launcher3/icons/LauncherIconProvider.java b/src/com/android/launcher3/icons/LauncherIconProvider.java index 482360cb0b..72411984d7 100644 --- a/src/com/android/launcher3/icons/LauncherIconProvider.java +++ b/src/com/android/launcher3/icons/LauncherIconProvider.java @@ -30,7 +30,9 @@ import androidx.annotation.Nullable; import com.android.launcher3.R; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.graphics.IconShape; +import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.dagger.LauncherAppSingleton; +import com.android.launcher3.graphics.ShapeDelegate; import com.android.launcher3.graphics.ThemeManager; import com.android.launcher3.util.ApiWrapper; @@ -39,9 +41,12 @@ import org.xmlpull.v1.XmlPullParser; import java.util.Collections; import java.util.Map; +import javax.inject.Inject; + /** * Extension of {@link IconProvider} with support for overriding theme icons */ +@LauncherAppSingleton public class LauncherIconProvider extends IconProvider { private static final String TAG_ICON = "icon"; @@ -54,13 +59,17 @@ public class LauncherIconProvider extends IconProvider { private Map mThemedIconMap; private final ApiWrapper mApiWrapper; - private final IconShape mIconShape; + private final ThemeManager mThemeManager; - public LauncherIconProvider(Context context) { + @Inject + public LauncherIconProvider( + @ApplicationContext Context context, + ThemeManager themeManager, + ApiWrapper apiWrapper) { super(context); - setIconThemeSupported(ThemeManager.INSTANCE.get(context).isMonoThemeEnabled()); - mApiWrapper = ApiWrapper.INSTANCE.get(context); - mIconShape = IconShape.INSTANCE.get(context); + mThemeManager = themeManager; + mApiWrapper = apiWrapper; + setIconThemeSupported(mThemeManager.isMonoThemeEnabled()); } /** @@ -79,7 +88,7 @@ public class LauncherIconProvider extends IconProvider { @Override public void updateSystemState() { super.updateSystemState(); - mSystemState += "," + ThemeManager.INSTANCE.get(mContext).getIconState().toUniqueId(); + mSystemState += "," + mThemeManager.getIconState().toUniqueId(); } @Override @@ -91,7 +100,7 @@ public class LauncherIconProvider extends IconProvider { @Override protected Drawable loadAppInfoIcon(ApplicationInfo info, Resources resources, int density) { // Tries to load the round icon res, if the app defines it as an adaptive icon - if (mIconShape.getShape() instanceof IconShape.Circle) { + if (mThemeManager.getIconShape() instanceof ShapeDelegate.Circle) { int roundIconRes = mApiWrapper.getRoundIconRes(info); if (roundIconRes != 0 && roundIconRes != info.icon) { try { diff --git a/src/com/android/launcher3/icons/LauncherIcons.kt b/src/com/android/launcher3/icons/LauncherIcons.kt index d173fd657c..29c0de1e5a 100644 --- a/src/com/android/launcher3/icons/LauncherIcons.kt +++ b/src/com/android/launcher3/icons/LauncherIcons.kt @@ -27,7 +27,6 @@ import com.android.launcher3.InvariantDeviceProfile import com.android.launcher3.dagger.ApplicationContext import com.android.launcher3.dagger.LauncherAppSingleton import com.android.launcher3.dagger.LauncherComponentProvider.appComponent -import com.android.launcher3.graphics.IconShape import com.android.launcher3.graphics.ThemeManager import com.android.launcher3.pm.UserCache import com.android.launcher3.util.UserIconInfo @@ -46,9 +45,8 @@ class LauncherIcons internal constructor( @ApplicationContext context: Context, idp: InvariantDeviceProfile, - themeManager: ThemeManager, + private var themeManager: ThemeManager, private var userCache: UserCache, - private var iconShape: IconShape, @Assisted private val pool: ConcurrentLinkedQueue, ) : BaseIconFactory(context, idp.fillResIconDpi, idp.iconBitmapSize), AutoCloseable { @@ -68,9 +66,14 @@ internal constructor( return userCache.getUserInfo(user) } - public override fun getShapePath(drawable: AdaptiveIconDrawable, iconBounds: Rect): Path { - if (!Flags.enableLauncherIconShapes()) return drawable.iconMask - return iconShape.shape.getPath(iconBounds) + override fun getShapePath(drawable: AdaptiveIconDrawable, iconBounds: Rect): Path { + if (!Flags.enableLauncherIconShapes()) return super.getShapePath(drawable, iconBounds) + return themeManager.iconShape.getPath(iconBounds) + } + + override fun getIconScale(): Float { + if (!Flags.enableLauncherIconShapes()) return super.getIconScale() + return themeManager.iconState.iconScale } override fun drawAdaptiveIcon( diff --git a/src/com/android/launcher3/logging/FileLog.java b/src/com/android/launcher3/logging/FileLog.java index 924a44062c..5b254183b1 100644 --- a/src/com/android/launcher3/logging/FileLog.java +++ b/src/com/android/launcher3/logging/FileLog.java @@ -1,6 +1,6 @@ package com.android.launcher3.logging; -import static com.android.launcher3.util.Executors.createAndStartNewLooper; +import static com.android.launcher3.util.LooperExecutor.createAndStartNewLooper; import android.os.Handler; import android.os.HandlerThread; diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java index 9a1c8742f2..2f1af68329 100644 --- a/src/com/android/launcher3/logging/StatsLogManager.java +++ b/src/com/android/launcher3/logging/StatsLogManager.java @@ -905,6 +905,10 @@ public class StatsLogManager implements ResourceBasedOverride { @UiEvent(doc = "Time passed between Contextual Search runnable creation and execution. This" + " ensures that Recent animations have finished before Contextual Search starts.") LAUNCHER_LATENCY_OMNI_RUNNABLE(1546), + + @UiEvent(doc = "Time passed between nav handle touch down and cancellation without " + + "triggering Contextual Search") + LAUNCHER_LATENCY_CONTEXTUAL_SEARCH_LPNH_ABANDON(2171), ; private final int mId; diff --git a/src/com/android/launcher3/model/BaseLauncherBinder.java b/src/com/android/launcher3/model/BaseLauncherBinder.java index 003bef3311..a2ca6b61a1 100644 --- a/src/com/android/launcher3/model/BaseLauncherBinder.java +++ b/src/com/android/launcher3/model/BaseLauncherBinder.java @@ -28,7 +28,6 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; import static java.util.Collections.emptyList; -import android.os.Process; import android.os.Trace; import android.util.Log; import android.util.Pair; @@ -167,7 +166,7 @@ public class BaseLauncherBinder { return; } Map> - widgetsByPackageItem = mBgDataModel.widgetsModel.getWidgetsByPackageItem(); + widgetsByPackageItem = mBgDataModel.widgetsModel.getWidgetsByPackageItemForPicker(); List widgets = new WidgetsListBaseEntriesBuilder(mApp.getContext()) .build(widgetsByPackageItem); Predicate filter = mBgDataModel.widgetsModel.getDefaultWidgetsFilter(); @@ -352,14 +351,8 @@ public class BaseLauncherBinder { onCompleteSignal.executeAllAndDestroy(); } - executeCallbacksTask( - c -> { - if (!enableWorkspaceInflation()) { - MODEL_EXECUTOR.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); - } - c.onInitialBindComplete(currentScreenIds, pendingTasks, onCompleteSignal, - workspaceItemCount, isBindSync); - }, mUiExecutor); + executeCallbacksTask(c -> c.onInitialBindComplete(currentScreenIds, pendingTasks, + onCompleteSignal, workspaceItemCount, isBindSync), mUiExecutor); } private void setupPendingBind( @@ -369,12 +362,8 @@ public class BaseLauncherBinder { executeCallbacksTask(c -> c.bindStringCache(cacheClone), pendingExecutor); executeCallbacksTask(c -> c.finishBindingItems(currentScreenIds), pendingExecutor); - pendingExecutor.execute( - () -> { - MODEL_EXECUTOR.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT); - ItemInstallQueue.INSTANCE.get(mApp.getContext()) - .resumeModelPush(FLAG_LOADER_RUNNING); - }); + pendingExecutor.execute(() -> ItemInstallQueue.INSTANCE.get(mApp.getContext()) + .resumeModelPush(FLAG_LOADER_RUNNING)); } /** diff --git a/src/com/android/launcher3/model/DeviceGridState.java b/src/com/android/launcher3/model/DeviceGridState.java index 6f12c97427..d06f541fae 100644 --- a/src/com/android/launcher3/model/DeviceGridState.java +++ b/src/com/android/launcher3/model/DeviceGridState.java @@ -33,7 +33,6 @@ import android.text.TextUtils; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.logging.StatsLogManager.LauncherEvent; -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext; import java.util.Locale; import java.util.Objects; @@ -103,9 +102,6 @@ public class DeviceGridState implements Comparable { * Stores the device state to shared preferences */ public void writeToPrefs(Context context) { - if (context instanceof SandboxContext) { - return; - } LauncherPrefs.get(context).put( WORKSPACE_SIZE.to(mGridSizeString), HOTSEAT_COUNT.to(mNumHotseat), diff --git a/src/com/android/launcher3/model/GridSizeMigrationDBController.java b/src/com/android/launcher3/model/GridSizeMigrationDBController.java index 47f13bd636..5d0a7bd6a2 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationDBController.java +++ b/src/com/android/launcher3/model/GridSizeMigrationDBController.java @@ -238,16 +238,19 @@ public class GridSizeMigrationDBController { Collections.sort(hotseatToBeAdded); Collections.sort(workspaceToBeAdded); - List idsInUse = dstWorkspaceItems.stream() + List remainingDstHotseatItems = destReader.loadHotseatEntries(); + List remainingDstWorkspaceItems = destReader.loadAllWorkspaceEntries(); + List idsInUse = remainingDstHotseatItems.stream() .map(entry -> entry.id) .collect(Collectors.toList()); - idsInUse.addAll(dstHotseatItems.stream() + idsInUse.addAll(remainingDstWorkspaceItems.stream() .map(entry -> entry.id) .collect(Collectors.toList())); + // Migrate hotseat solveHotseatPlacement(helper, destHotseatSize, - srcReader, destReader, dstHotseatItems, hotseatToBeAdded, idsInUse); + srcReader, destReader, remainingDstHotseatItems, hotseatToBeAdded, idsInUse); // Migrate workspace. // First we create a collection of the screens @@ -467,7 +470,7 @@ public class GridSizeMigrationDBController { final Context mContext; int mLastScreenId = -1; - final Map> mWorkspaceEntriesByScreenId = + Map> mWorkspaceEntriesByScreenId = new ArrayMap<>(); public DbReader(SQLiteDatabase db, String tableName, Context context) { @@ -539,6 +542,7 @@ public class GridSizeMigrationDBController { } protected List loadAllWorkspaceEntries() { + mWorkspaceEntriesByScreenId.clear(); final List workspaceEntries = new ArrayList<>(); Cursor c = queryWorkspace( new String[]{ diff --git a/src/com/android/launcher3/model/GridSizeMigrationLogic.kt b/src/com/android/launcher3/model/GridSizeMigrationLogic.kt index 9586bf3015..5df135a98f 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationLogic.kt +++ b/src/com/android/launcher3/model/GridSizeMigrationLogic.kt @@ -183,9 +183,11 @@ class GridSizeMigrationLogic { ) } + val remainingDstHotseatItems = destReader.loadHotseatEntries() + placeHotseatItems( itemsToBeAdded, - dstHotseatItems, + remainingDstHotseatItems, destHotseatSize, helper, srcReader, @@ -265,9 +267,10 @@ class GridSizeMigrationLogic { ) } + val remainingDstWorkspaceItems = destReader.loadAllWorkspaceEntries() placeWorkspaceItems( workspaceToBeAdded, - dstWorkspaceItems, + remainingDstWorkspaceItems, targetSize.x, targetSize.y, helper, diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index c1ee69b729..d44b289db4 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -36,6 +36,7 @@ import static com.android.launcher3.model.ModelUtils.WIDGET_FILTER; import static com.android.launcher3.model.ModelUtils.currentScreenContentFilter; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; +import static com.android.launcher3.util.LooperExecutor.CALLER_LOADER_TASK; import static com.android.launcher3.util.PackageManagerHelper.hasShortcutsPermission; import android.appwidget.AppWidgetProviderInfo; @@ -251,6 +252,7 @@ public class LoaderTask implements Runnable { } TraceHelper.INSTANCE.beginSection(TAG); + MODEL_EXECUTOR.elevatePriority(CALLER_LOADER_TASK); LoaderMemoryLogger memoryLogger = new LoaderMemoryLogger(); mIsRestoreFromBackup = LauncherPrefs.get(mApp.getContext()).get(IS_FIRST_LOAD_AFTER_RESTORE); @@ -403,6 +405,7 @@ public class LoaderTask implements Runnable { memoryLogger.printLogs(); throw e; } + MODEL_EXECUTOR.restorePriority(CALLER_LOADER_TASK); TraceHelper.INSTANCE.endSection(); } diff --git a/src/com/android/launcher3/model/ModelDbController.java b/src/com/android/launcher3/model/ModelDbController.java index 3a55aa7785..feae632bc5 100644 --- a/src/com/android/launcher3/model/ModelDbController.java +++ b/src/com/android/launcher3/model/ModelDbController.java @@ -80,7 +80,6 @@ import com.android.launcher3.provider.LauncherDbUtils.SQLiteTransaction; import com.android.launcher3.provider.RestoreDbTask; import com.android.launcher3.util.IOUtils; import com.android.launcher3.util.IntArray; -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext; import com.android.launcher3.util.Partner; import com.android.launcher3.widget.LauncherWidgetHolder; @@ -143,14 +142,11 @@ public class ModelDbController { } protected DatabaseHelper createDatabaseHelper(boolean forMigration, String dbFile) { - boolean isSandbox = mContext instanceof SandboxContext; - String dbName = isSandbox ? null : dbFile; - // Set the flag for empty DB Runnable onEmptyDbCreateCallback = forMigration ? () -> { } - : () -> LauncherPrefs.get(mContext).putSync(getEmptyDbCreatedKey(dbName).to(true)); + : () -> LauncherPrefs.get(mContext).putSync(getEmptyDbCreatedKey(dbFile).to(true)); - DatabaseHelper databaseHelper = new DatabaseHelper(mContext, dbName, + DatabaseHelper databaseHelper = new DatabaseHelper(mContext, dbFile, this::getSerialNumberForUser, onEmptyDbCreateCallback); // Table creation sometimes fails silently, which leads to a crash loop. // This way, we will try to create a table every time after crash, so the device @@ -380,8 +376,7 @@ public class ModelDbController { .filter(dbName -> mContext.getDatabasePath(dbName).exists()) .collect(Collectors.toList()); - mOpenHelper = (mContext instanceof SandboxContext) ? oldHelper - : createDatabaseHelper(true, new DeviceGridState(idp).getDbFile()); + mOpenHelper = createDatabaseHelper(true, new DeviceGridState(idp).getDbFile()); try { // This is the current grid we have, given by the mContext DeviceGridState srcDeviceState = new DeviceGridState(mContext); @@ -462,8 +457,7 @@ public class ModelDbController { List existingDBs = LauncherFiles.GRID_DB_FILES.stream() .filter(dbName -> mContext.getDatabasePath(dbName).exists()) .collect(Collectors.toList()); - mOpenHelper = (mContext instanceof SandboxContext) ? oldHelper - : createDatabaseHelper(true /* forMigration */, targetDbName); + mOpenHelper = createDatabaseHelper(true /* forMigration */, targetDbName); try { // This is the current grid we have, given by the mContext DeviceGridState srcDeviceState = new DeviceGridState(mContext); @@ -763,10 +757,6 @@ public class ModelDbController { * string will be "EMPTY_DATABASE_CREATED@minimal.db". */ private ConstantItem getEmptyDbCreatedKey(String dbName) { - if (mContext instanceof SandboxContext) { - return LauncherPrefs.nonRestorableItem(EMPTY_DATABASE_CREATED, - false /* default value */, EncryptionType.ENCRYPTED); - } String key = TextUtils.equals(dbName, LauncherFiles.LAUNCHER_DB) ? EMPTY_DATABASE_CREATED : EMPTY_DATABASE_CREATED + "@" + dbName; return LauncherPrefs.backedUpItem(key, false /* default value */, EncryptionType.ENCRYPTED); diff --git a/src/com/android/launcher3/model/ModelDelegate.java b/src/com/android/launcher3/model/ModelDelegate.java index 5a2aef0ce9..52a2188ca2 100644 --- a/src/com/android/launcher3/model/ModelDelegate.java +++ b/src/com/android/launcher3/model/ModelDelegate.java @@ -23,62 +23,45 @@ import android.content.pm.ShortcutInfo; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; -import com.android.launcher3.LauncherAppState; -import com.android.launcher3.R; +import com.android.launcher3.LauncherModel; +import com.android.launcher3.dagger.ApplicationContext; import com.android.launcher3.shortcuts.ShortcutKey; -import com.android.launcher3.util.PackageManagerHelper; -import com.android.launcher3.util.ResourceBasedOverride; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.Map; +import javax.inject.Inject; + /** * Class to extend LauncherModel functionality to provide extra data */ -public class ModelDelegate implements ResourceBasedOverride { - - /** - * Creates and initializes a new instance of the delegate - */ - public static ModelDelegate newInstance( - Context context, LauncherAppState app, PackageManagerHelper pmHelper, - AllAppsList appsList, BgDataModel dataModel, boolean isPrimaryInstance) { - ModelDelegate delegate = Overrides.getObject( - ModelDelegate.class, context, R.string.model_delegate_class); - delegate.init(app, pmHelper, appsList, dataModel, isPrimaryInstance); - return delegate; - } +public class ModelDelegate { protected final Context mContext; - protected PackageManagerHelper mPmHelper; - protected LauncherAppState mApp; + protected LauncherModel mModel; protected AllAppsList mAppsList; protected BgDataModel mDataModel; - protected boolean mIsPrimaryInstance; - public ModelDelegate(Context context) { + @Inject + public ModelDelegate(@ApplicationContext Context context) { mContext = context; } /** * Initializes the object with the given params. */ - private void init(LauncherAppState app, PackageManagerHelper pmHelper, AllAppsList appsList, - BgDataModel dataModel, boolean isPrimaryInstance) { - this.mApp = app; - this.mPmHelper = pmHelper; + public void init(LauncherModel model, AllAppsList appsList, BgDataModel dataModel) { + this.mModel = model; this.mAppsList = appsList; this.mDataModel = dataModel; - this.mIsPrimaryInstance = isPrimaryInstance; } /** Called periodically to validate and update any data */ @WorkerThread public void validateData() { - if (hasShortcutsPermission(mApp.getContext()) - != mAppsList.hasShortcutHostPermission()) { - mApp.getModel().forceReload(); + if (hasShortcutsPermission(mContext) != mAppsList.hasShortcutHostPermission()) { + mModel.forceReload(); } } diff --git a/src/com/android/launcher3/model/ModelInitializer.kt b/src/com/android/launcher3/model/ModelInitializer.kt new file mode 100644 index 0000000000..735a52aac6 --- /dev/null +++ b/src/com/android/launcher3/model/ModelInitializer.kt @@ -0,0 +1,167 @@ +/* + * 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.model + +import android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED +import android.content.ComponentName +import android.content.Context +import android.content.SharedPreferences +import android.content.pm.LauncherApps +import android.content.pm.LauncherApps.ArchiveCompatibilityParams +import com.android.launcher3.BuildConfig +import com.android.launcher3.Flags +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.InvariantDeviceProfile.OnIDPChangeListener +import com.android.launcher3.LauncherModel +import com.android.launcher3.LauncherPrefs.Companion.getPrefs +import com.android.launcher3.Utilities +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.graphics.ThemeManager +import com.android.launcher3.graphics.ThemeManager.ThemeChangeListener +import com.android.launcher3.icons.IconCache +import com.android.launcher3.icons.LauncherIconProvider +import com.android.launcher3.icons.LauncherIcons.IconPool +import com.android.launcher3.notification.NotificationListener +import com.android.launcher3.pm.InstallSessionHelper +import com.android.launcher3.pm.UserCache +import com.android.launcher3.util.DaggerSingletonTracker +import com.android.launcher3.util.Executors.MODEL_EXECUTOR +import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR +import com.android.launcher3.util.SettingsCache +import com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI +import com.android.launcher3.util.SettingsCache.PRIVATE_SPACE_HIDE_WHEN_LOCKED_URI +import com.android.launcher3.util.SimpleBroadcastReceiver +import com.android.launcher3.widget.custom.CustomWidgetManager +import javax.inject.Inject + +/** Utility class for initializing all model callbacks */ +class ModelInitializer +@Inject +constructor( + @ApplicationContext private val context: Context, + private val iconPool: IconPool, + private val iconCache: IconCache, + private val idp: InvariantDeviceProfile, + private val themeManager: ThemeManager, + private val userCache: UserCache, + private val settingsCache: SettingsCache, + private val iconProvider: LauncherIconProvider, + private val customWidgetManager: CustomWidgetManager, + private val installSessionHelper: InstallSessionHelper, + private val lifeCycle: DaggerSingletonTracker, +) { + + fun initialize(model: LauncherModel) { + fun refreshAndReloadLauncher() { + iconPool.clear() + iconCache.updateIconParams(idp.fillResIconDpi, idp.iconBitmapSize) + model.forceReload() + } + + // IDP changes + val idpChangeListener = OnIDPChangeListener { modelChanged -> + if (modelChanged) refreshAndReloadLauncher() + } + idp.addOnChangeListener(idpChangeListener) + lifeCycle.addCloseable { idp.removeOnChangeListener(idpChangeListener) } + + // Theme changes + val themeChangeListener = ThemeChangeListener { refreshAndReloadLauncher() } + themeManager.addChangeListener(themeChangeListener) + lifeCycle.addCloseable { themeManager.removeChangeListener(themeChangeListener) } + + // System changes + val modelCallbacks = model.newModelCallbacks() + val launcherApps = context.getSystemService(LauncherApps::class.java)!! + launcherApps.registerCallback(modelCallbacks, MODEL_EXECUTOR.handler) + lifeCycle.addCloseable { launcherApps.unregisterCallback(modelCallbacks) } + + if (Utilities.ATLEAST_V && Flags.enableSupportForArchiving()) { + launcherApps.setArchiveCompatibility( + ArchiveCompatibilityParams().apply { + setEnableUnarchivalConfirmation(false) + setEnableIconOverlay(!Flags.useNewIconForArchivedApps()) + } + ) + } + + // Device profile policy changes + val dpUpdateReceiver = + SimpleBroadcastReceiver(context, UI_HELPER_EXECUTOR) { model.reloadStringCache() } + dpUpdateReceiver.register(ACTION_DEVICE_POLICY_RESOURCE_UPDATED) + lifeCycle.addCloseable { dpUpdateReceiver.unregisterReceiverSafely() } + + // Development helper + if (BuildConfig.IS_STUDIO_BUILD) { + val reloadReceiver = + SimpleBroadcastReceiver(context, UI_HELPER_EXECUTOR) { model.forceReload() } + reloadReceiver.register(Context.RECEIVER_EXPORTED, ACTION_FORCE_RELOAD) + lifeCycle.addCloseable { reloadReceiver.unregisterReceiverSafely() } + } + + // User changes + lifeCycle.addCloseable(userCache.addUserEventListener(model::onUserEvent)) + + // Private space settings changes + val psSettingsListener = SettingsCache.OnChangeListener { model.forceReload() } + settingsCache.register(PRIVATE_SPACE_HIDE_WHEN_LOCKED_URI, psSettingsListener) + lifeCycle.addCloseable { + settingsCache.unregister(PRIVATE_SPACE_HIDE_WHEN_LOCKED_URI, psSettingsListener) + } + + // Notification dots changes + val notificationChanges = + SettingsCache.OnChangeListener { dotsEnabled -> + if (dotsEnabled) + NotificationListener.requestRebind( + ComponentName(context, NotificationListener::class.java) + ) + } + settingsCache.register(NOTIFICATION_BADGING_URI, notificationChanges) + notificationChanges.onSettingsChanged(settingsCache.getValue(NOTIFICATION_BADGING_URI)) + lifeCycle.addCloseable { + settingsCache.unregister(NOTIFICATION_BADGING_URI, notificationChanges) + } + + // removable smartspace + if (Flags.enableSmartspaceRemovalToggle()) { + val smartSpacePrefChanges = + SharedPreferences.OnSharedPreferenceChangeListener { _, key -> + if (LoaderTask.SMARTSPACE_ON_HOME_SCREEN == key) model.forceReload() + } + getPrefs(context).registerOnSharedPreferenceChangeListener(smartSpacePrefChanges) + lifeCycle.addCloseable { + getPrefs(context).unregisterOnSharedPreferenceChangeListener(smartSpacePrefChanges) + } + } + + // Custom widgets + lifeCycle.addCloseable(customWidgetManager.addWidgetRefreshCallback(model::rebindCallbacks)) + + // Icon changes + lifeCycle.addCloseable( + iconProvider.registerIconChangeListener(model::onAppIconChanged, MODEL_EXECUTOR.handler) + ) + + // Install session changes + lifeCycle.addCloseable(installSessionHelper.registerInstallTracker(modelCallbacks)) + } + + companion object { + private const val ACTION_FORCE_RELOAD = "force-reload-launcher" + } +} diff --git a/src/com/android/launcher3/model/ModelTaskController.kt b/src/com/android/launcher3/model/ModelTaskController.kt index 40ea17d437..6e3e35ea1b 100644 --- a/src/com/android/launcher3/model/ModelTaskController.kt +++ b/src/com/android/launcher3/model/ModelTaskController.kt @@ -77,7 +77,7 @@ class ModelTaskController( } fun bindUpdatedWidgets(dataModel: BgDataModel) { - val widgetsByPackageItem = dataModel.widgetsModel.widgetsByPackageItem + val widgetsByPackageItem = dataModel.widgetsModel.widgetsByPackageItemForPicker val allWidgets = WidgetsListBaseEntriesBuilder(app.context).build(widgetsByPackageItem) val defaultWidgetsFilter = dataModel.widgetsModel.defaultWidgetsFilter diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java index d1eceb905a..3cdb2500e1 100644 --- a/src/com/android/launcher3/model/PackageUpdatedTask.java +++ b/src/com/android/launcher3/model/PackageUpdatedTask.java @@ -239,25 +239,31 @@ public class PackageUpdatedTask implements ModelUpdateTask { boolean isTargetValid = !cn.getClassName().equals( IconCache.EMPTY_CLASS_NAME); if (itemInfo.itemType == ITEM_TYPE_DEEP_SHORTCUT) { + int requestQuery = ShortcutRequest.PINNED; + if (Flags.restoreArchivedShortcuts()) { + // Avoid race condition where shortcut service has no record of + // unarchived shortcut being pinned after restore. + // Launcher should be source-of-truth for if shortcut is pinned. + requestQuery = ShortcutRequest.ALL; + } List shortcut = new ShortcutRequest(context, mUser) .forPackage(cn.getPackageName(), itemInfo.getDeepShortcutId()) - .query(ShortcutRequest.PINNED); - if (shortcut.isEmpty() - && !(Flags.restoreArchivedShortcuts() - && !itemInfo.isArchived()) - ) { + .query(requestQuery); + if (shortcut.isEmpty()) { isTargetValid = false; if (DEBUG) { - Log.d(TAG, "Pinned Shortcut not found for updated" - + " package=" + itemInfo.getTargetPackage()); - } - } else if (!shortcut.isEmpty()) { - if (DEBUG) { - Log.d(TAG, "Found pinned shortcut for updated" + Log.d(TAG, "Shortcut not found for updated" + " package=" + itemInfo.getTargetPackage() - + ", isTargetValid=" + isTargetValid); + + ", isArchived=" + itemInfo.isArchived()); + } + } else { + if (DEBUG) { + Log.d(TAG, "Found shortcut for updated" + + " package=" + itemInfo.getTargetPackage() + + ", isTargetValid=" + isTargetValid + + ", isArchived=" + itemInfo.isArchived()); } itemInfo.updateFromDeepShortcutInfo(shortcut.get(0), context); infoUpdated = true; diff --git a/src/com/android/launcher3/model/WidgetsModel.java b/src/com/android/launcher3/model/WidgetsModel.java index a17646556b..ab960d8169 100644 --- a/src/com/android/launcher3/model/WidgetsModel.java +++ b/src/com/android/launcher3/model/WidgetsModel.java @@ -70,6 +70,7 @@ public class WidgetsModel { private final Map> mWidgetsByPackageItem = new HashMap<>(); @Nullable private Predicate mDefaultWidgetsFilter = null; @Nullable private Predicate mPredictedWidgetsFilter = null; + @Nullable private WidgetValidityCheckForPicker mWidgetValidityCheckForPicker = null; /** * Returns all widgets keyed by their component key. @@ -87,13 +88,44 @@ public class WidgetsModel { } /** - * Returns widgets grouped by the package item that they should belong to. + * Returns widgets (eligible for display in picker) keyed by their component key. */ - public synchronized Map> getWidgetsByPackageItem() { - if (!WIDGETS_ENABLED) { + public synchronized Map getWidgetsByComponentKeyForPicker() { + if (!WIDGETS_ENABLED || mWidgetValidityCheckForPicker == null) { return Collections.emptyMap(); } - return new HashMap<>(mWidgetsByPackageItem); + + return mWidgetsByPackageItem.values().stream() + .flatMap(Collection::stream).distinct() + .filter(widgetItem -> mWidgetValidityCheckForPicker.test(widgetItem)) + .collect(Collectors.toMap( + widget -> new ComponentKey(widget.componentName, widget.user), + Function.identity() + )); + } + + /** + * Returns widgets (displayable in the widget picker) grouped by the package item that + * they should belong to. + */ + public synchronized Map> getWidgetsByPackageItemForPicker() { + if (!WIDGETS_ENABLED || mWidgetValidityCheckForPicker == null) { + return Collections.emptyMap(); + } + + return mWidgetsByPackageItem.entrySet().stream() + .collect( + Collectors.toMap( + Map.Entry::getKey, + entry -> entry.getValue().stream() + .filter(widgetItem -> + mWidgetValidityCheckForPicker.test(widgetItem)) + .collect(Collectors.toList()) + ) + ) + .entrySet().stream() + .filter(entry -> !entry.getValue().isEmpty()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); } /** @@ -181,6 +213,9 @@ public class WidgetsModel { Log.d(TAG, "addWidgetsAndShortcuts, widgetsShortcuts#=" + rawWidgetsShortcuts.size()); } + // Refresh the validity checker with latest app state. + mWidgetValidityCheckForPicker = new WidgetValidityCheckForPicker(app); + // Temporary cache for {@link PackageItemInfos} to avoid having to go through // {@link mPackageItemInfos} to locate the key to be used for {@link #mWidgetsList} PackageItemInfoCache packageItemInfoCache = new PackageItemInfoCache(); @@ -195,7 +230,6 @@ public class WidgetsModel { // add and update. mWidgetsByPackageItem.putAll(rawWidgetsShortcuts.stream() - .filter(new WidgetValidityCheck(app)) .filter(new WidgetFlagCheck()) .flatMap(widgetItem -> getPackageUserKeys(app.getContext(), widgetItem).stream() .map(key -> new Pair<>(packageItemInfoCache.getOrCreate(key), widgetItem))) @@ -270,12 +304,15 @@ public class WidgetsModel { return packageUserKeys; } - private static class WidgetValidityCheck implements Predicate { + /** + * Checks if widgets are eligible for displaying in widget picker / tray. + */ + private static class WidgetValidityCheckForPicker implements Predicate { private final InvariantDeviceProfile mIdp; private final AppFilter mAppFilter; - WidgetValidityCheck(LauncherAppState app) { + WidgetValidityCheckForPicker(LauncherAppState app) { mIdp = app.getInvariantDeviceProfile(); mAppFilter = new AppFilter(app.getContext()); } @@ -310,6 +347,10 @@ public class WidgetsModel { } } + /** + * Checks if certain widgets that are available behind flag can be used across all surfaces in + * launcher. + */ private static class WidgetFlagCheck implements Predicate { private static final String BUBBLES_SHORTCUT_WIDGET = diff --git a/src/com/android/launcher3/model/WorkspaceItemProcessor.kt b/src/com/android/launcher3/model/WorkspaceItemProcessor.kt index 3919eb76dd..99f2837dd0 100644 --- a/src/com/android/launcher3/model/WorkspaceItemProcessor.kt +++ b/src/com/android/launcher3/model/WorkspaceItemProcessor.kt @@ -194,29 +194,35 @@ class WorkspaceItemProcessor( if (intent.`package` == null) { intent.`package` = targetPkg } - val isPreArchived = appInfoWrapper.isArchived() && c.restoreFlag != 0 + + val isPreArchivedShortcut = + Flags.restoreArchivedShortcuts() && + appInfoWrapper.isArchived() && + c.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT && + c.restoreFlag != 0 // else if cn == null => can't infer much, leave it // else if !validPkg => could be restored icon or missing sd-card when { - !TextUtils.isEmpty(targetPkg) && (!validTarget || isPreArchived) -> { + !TextUtils.isEmpty(targetPkg) && (!validTarget || isPreArchivedShortcut) -> { // Points to a valid app (superset of cn != null) but the apk // is not available. when { - c.restoreFlag != 0 || isPreArchived -> { + c.restoreFlag != 0 || isPreArchivedShortcut -> { // Package is not yet available but might be // installed later. FileLog.d( TAG, "package not yet restored: $targetPkg, itemType=${c.itemType}" + - "isPreArchived=$isPreArchived, restoreFlag=${c.restoreFlag}", + ", isPreArchivedShortcut=$isPreArchivedShortcut" + + ", restoreFlag=${c.restoreFlag}", ) tempPackageKey.update(targetPkg, c.user) when { c.hasRestoreFlag(WorkspaceItemInfo.FLAG_RESTORE_STARTED) -> { // Restore has started once. } - installingPkgs.containsKey(tempPackageKey) || isPreArchived -> { + installingPkgs.containsKey(tempPackageKey) || isPreArchivedShortcut -> { // App restore has started. Update the flag c.restoreFlag = c.restoreFlag or WorkspaceItemInfo.FLAG_RESTORE_STARTED @@ -268,7 +274,7 @@ class WorkspaceItemProcessor( ) validTarget = false } - if (validTarget && !isPreArchived) { + if (validTarget && !isPreArchivedShortcut) { FileLog.d( TAG, "valid target true, marking restored: $targetPkg," + @@ -283,7 +289,7 @@ class WorkspaceItemProcessor( when { c.restoreFlag != 0 -> { // Already verified above that user is same as default user - info = c.getRestoredItemInfo(intent, isPreArchived) + info = c.getRestoredItemInfo(intent, isPreArchivedShortcut) } c.itemType == Favorites.ITEM_TYPE_APPLICATION -> info = c.getAppShortcutInfo(intent, allowMissingTarget, useLowResIcon, false) diff --git a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java index ff40f30bba..b60b8cc670 100644 --- a/src/com/android/launcher3/model/data/ItemInfoWithIcon.java +++ b/src/com/android/launcher3/model/data/ItemInfoWithIcon.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.os.Process; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.Flags; @@ -44,6 +45,7 @@ public abstract class ItemInfoWithIcon extends ItemInfo { /** * The bitmap for the application icon */ + @NonNull public BitmapInfo bitmap = BitmapInfo.LOW_RES_INFO; /** diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java index a691e45097..37f51899aa 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java @@ -16,6 +16,7 @@ package com.android.launcher3.pageindicators; +import static com.android.launcher3.Flags.enableLauncherVisualRefresh; import static com.android.launcher3.config.FeatureFlags.FOLDABLE_SINGLE_PAGE; import android.animation.Animator; @@ -57,8 +58,8 @@ import com.android.launcher3.util.Themes; public class PageIndicatorDots extends View implements Insettable, PageIndicator { private static final float SHIFT_PER_ANIMATION = 0.5f; - private static final float SHIFT_THRESHOLD = 0.1f; - private static final long ANIMATION_DURATION = 150; + private static final float SHIFT_THRESHOLD = (enableLauncherVisualRefresh() ? 0.5f : 0.2f); + private static final long ANIMATION_DURATION = (enableLauncherVisualRefresh() ? 200 : 150); private static final int PAGINATION_FADE_DELAY = ViewConfiguration.getScrollDefaultDelay(); private static final int PAGINATION_FADE_IN_DURATION = 83; private static final int PAGINATION_FADE_OUT_DURATION = 167; @@ -78,6 +79,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator // This value approximately overshoots to 1.5 times the original size. private static final float ENTER_ANIMATION_OVERSHOOT_TENSION = 4.9f; + // This is used to optimize the onDraw method by not constructing a new RectF each draw. private static final RectF sTempRect = new RectF(); private static final FloatProperty CURRENT_POSITION = @@ -93,7 +95,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator obj.invalidate(); obj.invalidateOutline(); } - }; + }; private static final IntProperty PAGINATION_ALPHA = new IntProperty("pagination_alpha") { @@ -111,6 +113,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator private final Handler mDelayedPaginationFadeHandler = new Handler(Looper.getMainLooper()); private final float mDotRadius; + private final float mGapWidth; private final float mCircleGap; private final boolean mIsRtl; @@ -130,6 +133,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator * 1.0 => Active dot is at position 1 */ private float mCurrentPosition; + private int mLastPosition; private float mFinalPosition; private boolean mIsScrollPaused; @VisibleForTesting @@ -157,7 +161,10 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator mPaginationPaint.setStyle(Style.FILL); mPaginationPaint.setColor(Themes.getAttrColor(context, R.attr.pageIndicatorDotColor)); mDotRadius = getResources().getDimension(R.dimen.page_indicator_dot_size) / 2; - mCircleGap = DOT_GAP_FACTOR * mDotRadius; + mGapWidth = getResources().getDimension(R.dimen.page_indicator_gap_width); + mCircleGap = (enableLauncherVisualRefresh()) + ? mDotRadius * 2 + mGapWidth + : DOT_GAP_FACTOR * mDotRadius; setOutlineProvider(new MyOutlineProver()); mIsRtl = Utilities.isRtl(getResources()); } @@ -188,29 +195,40 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator mTotalScroll = totalScroll; - int scrollPerPage = totalScroll / (mNumPages - 1); - int pageToLeft = scrollPerPage == 0 ? 0 : currentScroll / scrollPerPage; - int pageToLeftScroll = pageToLeft * scrollPerPage; - int pageToRightScroll = pageToLeftScroll + scrollPerPage; + if (enableLauncherVisualRefresh()) { + float scrollPerPage = (float) totalScroll / (mNumPages - 1); + float position = currentScroll / scrollPerPage; + animateToPosition(Math.round(position)); - float scrollThreshold = SHIFT_THRESHOLD * scrollPerPage; - if (currentScroll < pageToLeftScroll + scrollThreshold) { - // scroll is within the left page's threshold - animateToPosition(pageToLeft); - if (mShouldAutoHide) { - hideAfterDelay(); - } - } else if (currentScroll > pageToRightScroll - scrollThreshold) { - // scroll is far enough from left page to go to the right page - animateToPosition(pageToLeft + 1); - if (mShouldAutoHide) { + float delta = Math.abs((int) position - position); + if (mShouldAutoHide && (delta < 0.1 || delta > 0.9)) { hideAfterDelay(); } } else { - // scroll is between left and right page - animateToPosition(pageToLeft + SHIFT_PER_ANIMATION); - if (mShouldAutoHide) { - mDelayedPaginationFadeHandler.removeCallbacksAndMessages(null); + int scrollPerPage = totalScroll / (mNumPages - 1); + int pageToLeft = scrollPerPage == 0 ? 0 : currentScroll / scrollPerPage; + int pageToLeftScroll = pageToLeft * scrollPerPage; + int pageToRightScroll = pageToLeftScroll + scrollPerPage; + + float scrollThreshold = SHIFT_THRESHOLD * scrollPerPage; + if (currentScroll < pageToLeftScroll + scrollThreshold) { + // scroll is within the left page's threshold + animateToPosition(pageToLeft); + if (mShouldAutoHide) { + hideAfterDelay(); + } + } else if (currentScroll > pageToRightScroll - scrollThreshold) { + // scroll is far enough from left page to go to the right page + animateToPosition(pageToLeft + 1); + if (mShouldAutoHide) { + hideAfterDelay(); + } + } else { + // scroll is between left and right page + animateToPosition(pageToLeft + SHIFT_PER_ANIMATION); + if (mShouldAutoHide) { + mDelayedPaginationFadeHandler.removeCallbacksAndMessages(null); + } } } } @@ -283,15 +301,23 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator private void animateToPosition(float position) { mFinalPosition = position; - if (Math.abs(mCurrentPosition - mFinalPosition) < SHIFT_THRESHOLD) { + if (!enableLauncherVisualRefresh() + && Math.abs(mCurrentPosition - mFinalPosition) < SHIFT_THRESHOLD) { mCurrentPosition = mFinalPosition; } - if (mAnimator == null && Float.compare(mCurrentPosition, mFinalPosition) != 0) { - float positionForThisAnim = mCurrentPosition > mFinalPosition ? - mCurrentPosition - SHIFT_PER_ANIMATION : mCurrentPosition + SHIFT_PER_ANIMATION; + if (mAnimator == null && Float.compare(mCurrentPosition, position) != 0) { + float positionForThisAnim = enableLauncherVisualRefresh() + ? position + : (mCurrentPosition > mFinalPosition + ? mCurrentPosition - SHIFT_PER_ANIMATION + : mCurrentPosition + SHIFT_PER_ANIMATION); mAnimator = ObjectAnimator.ofFloat(this, CURRENT_POSITION, positionForThisAnim); mAnimator.addListener(new AnimationCycleListener()); mAnimator.setDuration(ANIMATION_DURATION); + if (enableLauncherVisualRefresh()) { + mLastPosition = (int) mCurrentPosition; + mAnimator.setInterpolator(new OvershootInterpolator()); + } mAnimator.start(); } } @@ -314,6 +340,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator invalidate(); } + // TODO(b/394355070): Verify Folder Entry Animation works correctly with visual updates public void playEntryAnimation() { int count = mEntryAnimationRadiusFactors.length; if (count == 0) { @@ -391,6 +418,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + // TODO(b/394355070): Verify Folder Entry Animation works correctly with visual updates // Add extra spacing of mDotRadius on all sides so than entry animation could be run. int width = MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY ? MeasureSpec.getSize(widthMeasureSpec) : (int) ((mNumPages * 3 + 2) * mDotRadius); @@ -410,17 +438,14 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator return; } - // Draw all page indicators; float circleGap = mCircleGap; - float startX = ((float) getWidth() / 2) - - (mCircleGap * (((float) mNumPages - 1) / 2)) - - mDotRadius; - - float x = startX + mDotRadius; + float x = ((float) getWidth() / 2) - (mCircleGap * ((float) mNumPages - 1) / 2); float y = getHeight() / 2; if (mEntryAnimationRadiusFactors != null) { // During entry animation, only draw the circles + // TODO(b/394355070): Verify Folder Entry Animation works correctly - visual updates + if (mIsRtl) { x = getWidth() - x; circleGap = -circleGap; @@ -432,18 +457,84 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator x += circleGap; } } else { + // Save the current alpha value, so we can reset to it again after drawing the dots int alpha = mPaginationPaint.getAlpha(); - // Here we draw the dots - mPaginationPaint.setAlpha((int) (alpha * DOT_ALPHA_FRACTION)); - for (int i = 0; i < mNumPages; i++) { - canvas.drawCircle(x, y, mDotRadius, mPaginationPaint); - x += circleGap; + if (enableLauncherVisualRefresh()) { + int nonActiveAlpha = (int) (alpha * DOT_ALPHA_FRACTION); + + float diameter = 2 * mDotRadius; + sTempRect.top = y - mDotRadius; + sTempRect.bottom = y + mDotRadius; + sTempRect.left = x - diameter; + + float posDif = Math.abs(mLastPosition - mCurrentPosition); + float boundedPosition = (posDif > 1) + ? Math.round(mCurrentPosition) + : mCurrentPosition; + float bounceProgress = (posDif > 1) ? posDif - 1 : 0; + float bounceAdjustment = Math.abs(mCurrentPosition - boundedPosition) * diameter; + + // Here we draw the dots, one at a time from the left-most dot to the right-most dot + // 1.0 => 000000 000000111111 000000 + // 1.3 => 000000 0000001111 11000000 + // 1.6 => 000000 00000011 1111000000 + // 2.0 => 000000 000000 111111000000 + for (int i = 0; i < mNumPages; i++) { + mPaginationPaint.setAlpha(nonActiveAlpha); + float delta = Math.abs(boundedPosition - i); + if (delta <= SHIFT_THRESHOLD) { + mPaginationPaint.setAlpha(alpha); + } + + // If boundedPosition is 3.3, both 3 and 4 should enter this condition. + // If boundedPosition is 3, only 3 should enter this condition. + if (delta < 1) { + sTempRect.right = sTempRect.left + diameter + ((1 - delta) * diameter); + + // While the animation is shifting the active pagination dots size from + // the previously active one, to the newly active dot, there is no bounce + // adjustment. The bounce happens in the "Overshoot" phase of the animation. + // mLastPosition is used to determine when the currentPosition is just + // leaving the page, or if it is in the overshoot phase. + if (boundedPosition == i && bounceProgress != 0) { + if (mLastPosition < mCurrentPosition) { + sTempRect.left -= bounceAdjustment; + } else { + sTempRect.right += bounceAdjustment; + } + } + } else { + sTempRect.right = sTempRect.left + diameter; + + if (mLastPosition == i && bounceProgress != 0) { + if (mLastPosition > mCurrentPosition) { + sTempRect.left += bounceAdjustment; + } else { + sTempRect.right -= bounceAdjustment; + } + } + } + canvas.drawRoundRect(sTempRect, mDotRadius, mDotRadius, mPaginationPaint); + + // TODO(b/394355070) Verify RTL experience works correctly with visual updates + sTempRect.left = sTempRect.right + mGapWidth; + } + } else { + // Here we draw the dots + mPaginationPaint.setAlpha((int) (alpha * DOT_ALPHA_FRACTION)); + for (int i = 0; i < mNumPages; i++) { + canvas.drawCircle(x, y, mDotRadius, mPaginationPaint); + x += circleGap; + } + + // Here we draw the current page indicator + mPaginationPaint.setAlpha(alpha); + canvas.drawRoundRect(getActiveRect(), mDotRadius, mDotRadius, mPaginationPaint); } - // Here we draw the current page indicator + // Reset the alpha so it doesn't become progressively more transparent each onDraw call mPaginationPaint.setAlpha(alpha); - canvas.drawRoundRect(getActiveRect(), mDotRadius, mDotRadius, mPaginationPaint); } } @@ -499,6 +590,7 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator @Override public void getOutline(View view, Outline outline) { if (mEntryAnimationRadiusFactors == null) { + // TODO(b/394355070): Verify Outline works correctly with visual updates RectF activeRect = getActiveRect(); outline.setRoundRect( (int) activeRect.left, diff --git a/src/com/android/launcher3/pm/InstallSessionTracker.java b/src/com/android/launcher3/pm/InstallSessionTracker.java index b9c928c50b..7451ce2630 100644 --- a/src/com/android/launcher3/pm/InstallSessionTracker.java +++ b/src/com/android/launcher3/pm/InstallSessionTracker.java @@ -34,13 +34,15 @@ import androidx.annotation.WorkerThread; import com.android.launcher3.Flags; import com.android.launcher3.util.PackageUserKey; +import com.android.launcher3.util.SafeCloseable; import java.lang.ref.WeakReference; import java.util.Objects; @SuppressWarnings("NewApi") @WorkerThread -public class InstallSessionTracker extends PackageInstaller.SessionCallback { +public class InstallSessionTracker extends PackageInstaller.SessionCallback implements + SafeCloseable { public static final String TAG = "InstallSessionTracker"; @@ -196,7 +198,8 @@ public class InstallSessionTracker extends PackageInstaller.SessionCallback { } } - public void unregister() { + @Override + public void close() { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { mInstaller.unregisterSessionCallback(this); } else { diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java index 8a5e388c50..318b3ceffa 100644 --- a/src/com/android/launcher3/popup/PopupDataProvider.java +++ b/src/com/android/launcher3/popup/PopupDataProvider.java @@ -23,20 +23,27 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.launcher3.BubbleTextView; +import com.android.launcher3.allapps.ActivityAllAppsContainerView; import com.android.launcher3.dot.DotInfo; +import com.android.launcher3.dot.FolderDotInfo; +import com.android.launcher3.folder.Folder; +import com.android.launcher3.folder.FolderIcon; +import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.notification.NotificationKeyData; import com.android.launcher3.notification.NotificationListener; import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.util.LauncherBindableItemsContainer.ItemOperator; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.ShortcutUtil; +import com.android.launcher3.views.ActivityContext; import java.io.PrintWriter; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Consumer; import java.util.function.Predicate; /** @@ -47,19 +54,49 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan private static final boolean LOGD = false; private static final String TAG = "PopupDataProvider"; - private final Consumer> mNotificationDotsChangeListener; + private final ActivityContext mContext; + + /** Maps packages to their DotInfo's . */ + private final Map mPackageUserToDotInfos = new HashMap<>(); /** Maps launcher activity components to a count of how many shortcuts they have. */ private HashMap mDeepShortcutMap = new HashMap<>(); - /** Maps packages to their DotInfo's . */ - private Map mPackageUserToDotInfos = new HashMap<>(); - public PopupDataProvider(Consumer> notificationDotsChangeListener) { - mNotificationDotsChangeListener = notificationDotsChangeListener; + public PopupDataProvider(ActivityContext context) { + mContext = context; } private void updateNotificationDots(Predicate updatedDots) { - mNotificationDotsChangeListener.accept(updatedDots); + final PackageUserKey packageUserKey = new PackageUserKey(null, null); + Predicate matcher = info -> !packageUserKey.updateFromItemInfo(info) + || updatedDots.test(packageUserKey); + + ItemOperator op = (info, v) -> { + if (v instanceof BubbleTextView && info != null && matcher.test(info)) { + ((BubbleTextView) v).applyDotState(info, true /* animate */); + } else if (v instanceof FolderIcon icon + && info instanceof FolderInfo fi && fi.anyMatch(matcher)) { + FolderDotInfo folderDotInfo = new FolderDotInfo(); + for (ItemInfo si : fi.getContents()) { + folderDotInfo.addDotInfo(getDotInfoForItem(si)); + } + icon.setDotInfo(folderDotInfo); + } + + // process all the shortcuts + return false; + }; + + mContext.getContent().mapOverItems(op); + Folder folder = Folder.getOpen(mContext); + if (folder != null) { + folder.iterateOverItems(op); + } + + ActivityAllAppsContainerView appsView = mContext.getAppsView(); + if (appsView != null) { + appsView.getAppsStore().updateNotificationDots(updatedDots); + } } @Override diff --git a/src/com/android/launcher3/popup/PopupPopulator.java b/src/com/android/launcher3/popup/PopupPopulator.java index b7480116f9..bc5064d87a 100644 --- a/src/com/android/launcher3/popup/PopupPopulator.java +++ b/src/com/android/launcher3/popup/PopupPopulator.java @@ -110,13 +110,16 @@ public class PopupPopulator { public static Runnable createUpdateRunnable( final T context, final ItemInfo originalInfo, - final Handler uiHandler, final PopupContainerWithArrow container, - final List shortcutViews) { + final Handler uiHandler, + final PopupContainerWithArrow container, + final List shortcutViews + ) { final ComponentName activity = originalInfo.getTargetComponent(); final UserHandle user = originalInfo.user; + final String targetPackage = originalInfo.getTargetPackage(); return () -> { ApplicationInfoWrapper infoWrapper = - new ApplicationInfoWrapper(context, originalInfo.getTargetPackage(), user); + new ApplicationInfoWrapper(context, targetPackage, user); List shortcuts = new ShortcutRequest(context, user) .withContainer(activity) .query(ShortcutRequest.PUBLISHED); diff --git a/src/com/android/launcher3/provider/RestoreDbTask.java b/src/com/android/launcher3/provider/RestoreDbTask.java index 34c9117f1f..23941bb1e6 100644 --- a/src/com/android/launcher3/provider/RestoreDbTask.java +++ b/src/com/android/launcher3/provider/RestoreDbTask.java @@ -51,6 +51,7 @@ import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; +import com.android.launcher3.Flags; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherFiles; @@ -130,9 +131,11 @@ public class RestoreDbTask { removeOldDBs(context, oldPhoneFileName); // The idp before this contains data about the old phone, after this it becomes the idp // of the current phone. - FileLog.d(TAG, "Resetting IDP to default for restore dest device"); - idp.reset(context); - trySettingPreviousGridAsCurrent(context, idp, oldPhoneFileName, previousDbs); + if (!Flags.oneGridSpecs()) { + FileLog.d(TAG, "Resetting IDP to default for restore dest device"); + idp.reset(context); + trySettingPreviousGridAsCurrent(context, idp, oldPhoneFileName, previousDbs); + } } @@ -535,7 +538,7 @@ public class RestoreDbTask { } logFavoritesTable(controller.getDb(), "launcher db after remap widget ids", null, null); - LauncherAppState.INSTANCE.executeIfCreated(app -> app.getModel().forceReload()); + LauncherAppState.INSTANCE.get(context).getModel().reloadIfActive(); } private static void logDatabaseWidgetInfo(ModelDbController controller) { diff --git a/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt b/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt index e4c50f08b1..2d1a5f5a36 100644 --- a/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt +++ b/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt @@ -18,6 +18,7 @@ package com.android.launcher3.recyclerview import android.content.Context import android.util.Log +import android.view.ContextThemeWrapper import android.view.InflateException import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting.Companion.PROTECTED @@ -33,8 +34,6 @@ import com.android.launcher3.util.Executors.MAIN_EXECUTOR import com.android.launcher3.util.Executors.VIEW_PREINFLATION_EXECUTOR import com.android.launcher3.util.Themes import com.android.launcher3.views.ActivityContext -import com.android.launcher3.views.ActivityContext.ActivityContextDelegate -import java.lang.IllegalStateException const val PREINFLATE_ICONS_ROW_COUNT = 4 const val EXTRA_ICONS_COUNT = 2 @@ -80,11 +79,9 @@ class AllAppsRecyclerViewPool : RecycledViewPool() where T : Context, T : Act // create a separate AssetManager obj internally to avoid lock contention with // AssetManager obj that is associated with the launcher context on the main thread. val allAppsPreInflationContext = - ActivityContextDelegate( - context.createConfigurationContext(context.resources.configuration), - Themes.getActivityThemeRes(context), - context, - ) + ContextThemeWrapper(context, Themes.getActivityThemeRes(context)).apply { + applyOverrideConfiguration(context.resources.configuration) + } // Because we perform onCreateViewHolder() on worker thread, we need a separate // adapter/inflator object as they are not thread-safe. Note that the adapter diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java index c20d6553b2..fd8b0e70b9 100644 --- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java +++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java @@ -16,6 +16,7 @@ package com.android.launcher3.secondarydisplay; import static com.android.launcher3.util.WallpaperThemeManager.setWallpaperDependentTheme; +import static com.android.window.flags.Flags.enableTaskbarConnectedDisplays; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -28,6 +29,7 @@ import android.view.View.OnClickListener; import android.view.ViewAnimationUtils; import android.view.inputmethod.InputMethodManager; +import androidx.annotation.NonNull; import androidx.annotation.UiThread; import com.android.launcher3.AbstractFloatingView; @@ -56,7 +58,6 @@ import com.android.launcher3.popup.PopupContainerWithArrow; import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.touch.ItemClickHandler.ItemClickProxy; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.IntSet; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.Themes; @@ -82,7 +83,6 @@ public class SecondaryDisplayLauncher extends BaseActivity private boolean mAppDrawerShown = false; private StringCache mStringCache; - private boolean mBindingItems = false; private SecondaryDisplayPredictions mSecondaryDisplayPredictions; private final int[] mTempXY = new int[2]; @@ -124,10 +124,13 @@ public class SecondaryDisplayLauncher extends BaseActivity mDragLayer = findViewById(R.id.drag_layer); mAppsView = findViewById(R.id.apps_view); mAppsButton = findViewById(R.id.all_apps_button); + // TODO (b/391965805): Replace this flag with DesktopExperiences flag. + if (enableTaskbarConnectedDisplays()) { + mAppsButton.setVisibility(View.INVISIBLE); + } mDragController.addDragListener(this); - mPopupDataProvider = new PopupDataProvider( - mAppsView.getAppsStore()::updateNotificationDots); + mPopupDataProvider = new PopupDataProvider(this); mModel.addCallbacksAndLoad(this); } @@ -243,7 +246,9 @@ public class SecondaryDisplayLauncher extends BaseActivity @Override public void onAnimationEnd(Animator animation) { mAppsView.setVisibility(View.INVISIBLE); - mAppsButton.setVisibility(View.VISIBLE); + // TODO (b/391965805): Replace this flag with DesktopExperiences flag. + mAppsButton.setVisibility( + enableTaskbarConnectedDisplays() ? View.INVISIBLE : View.VISIBLE); mAppsView.getSearchUiManager().resetSearch(); } }); @@ -253,20 +258,9 @@ public class SecondaryDisplayLauncher extends BaseActivity @Override public void startBinding() { - mBindingItems = true; mDragController.cancelDrag(); } - @Override - public boolean isBindingItems() { - return mBindingItems; - } - - @Override - public void finishBindingItems(IntSet pagesBoundFirst) { - mBindingItems = false; - } - @Override public void bindDeepShortcutMap(HashMap deepShortcutMap) { mPopupDataProvider.setDeepShortcutMap(deepShortcutMap); @@ -299,6 +293,8 @@ public class SecondaryDisplayLauncher extends BaseActivity mStringCache = cache; } + @Override + @NonNull public PopupDataProvider getPopupDataProvider() { return mPopupDataProvider; } diff --git a/src/com/android/launcher3/shapes/ShapesProvider.kt b/src/com/android/launcher3/shapes/ShapesProvider.kt index 463c81623f..03e30d8f77 100644 --- a/src/com/android/launcher3/shapes/ShapesProvider.kt +++ b/src/com/android/launcher3/shapes/ShapesProvider.kt @@ -16,201 +16,71 @@ package com.android.launcher3.shapes +import androidx.annotation.VisibleForTesting import com.android.launcher3.Flags as LauncherFlags import com.android.systemui.shared.Flags object ShapesProvider { - val folderShapes = - if (LauncherFlags.enableLauncherIconShapes()) { - mapOf( - "clover" to - "M 39.616 4" + - "C 46.224 6.87 53.727 6.87 60.335 4" + - "L 63.884 2.459" + - "C 85.178 -6.789 106.789 14.822 97.541 36.116" + - "L 96 39.665" + - "C 93.13 46.273 93.13 53.776 96 60.384" + - "L 97.541 63.934" + - "C 106.789 85.227 85.178 106.839 63.884 97.591" + - "L 60.335 96.049" + - "C 53.727 93.179 46.224 93.179 39.616 96.049" + - "L 36.066 97.591" + - "C 14.773 106.839 -6.839 85.227 2.409 63.934" + - "L 3.951 60.384" + - "C 6.821 53.776 6.821 46.273 3.951 39.665" + - "L 2.409 36.116" + - "C -6.839 14.822 14.773 -6.789 36.066 2.459" + - "Z", - "complexClover" to - "M 49.85 6.764" + - "L 50.013 6.971" + - "L 50.175 6.764" + - "C 53.422 2.635 58.309 0.207 63.538 0.207" + - "C 65.872 0.207 68.175 0.692 70.381 1.648" + - "L 71.79 2.264" + - "L 71.792 2.265" + - "A 3.46 3.46 0 0 0 74.515 2.265" + - "L 74.517 2.264" + - "L 75.926 1.652" + - "A 17.1 17.1 0 0 1 82.769 0.207" + - "C 88.495 0.207 93.824 3.117 97.022 7.989" + - "C 100.21 12.848 100.697 18.712 98.36 24.087" + - "L 97.749 25.496" + - "V 25.497" + - "A 3.45 3.45 0 0 0 97.749 28.222" + - "V 28.223" + - "L 98.36 29.632" + - "C 100.697 35.007 100.207 40.871 97.022 45.73" + - "A 17.5 17.5 0 0 1 93.264 49.838" + - "L 93.06 50" + - "L 93.264 50.162" + - "A 17.5 17.5 0 0 1 97.022 54.27" + - "C 100.21 59.129 100.697 64.993 98.36 70.368" + - "V 71.778" + - "A 3.45 3.45 0 0 0 97.749 74.503" + - "V 74.504" + - "L 98.36 75.913" + - "C 100.697 81.288 100.207 87.152 97.022 92.011" + - "C 93.824 96.883 88.495 99.793 82.769 99.793" + - "C 80.435 99.793 78.132 99.308 75.926 98.348" + - "L 74.517 97.736" + - "H 74.515" + - "A 3.5 3.5 0 0 0 73.153 97.455" + - "C 72.682 97.455 72.225 97.552 71.792 97.736" + - "H 71.79" + - "L 70.381 98.348" + - "A 17.1 17.1 0 0 1 63.538 99.793" + - "C 58.309 99.793 53.422 97.365 50.175 93.236" + - "L 50.013 93.029" + - "L 49.85 93.236" + - "C 46.603 97.365 41.717 99.793 36.488 99.793" + - "C 34.154 99.793 31.851 99.308 29.645 98.348" + - "L 28.236 97.736" + - "H 28.234" + - "A 3.5 3.5 0 0 0 26.872 97.455" + - "C 26.401 97.455 25.944 97.552 25.511 97.736" + - "H 25.509" + - "L 24.1 98.348" + - "A 17.1 17.1 0 0 1 17.257 99.793" + - "C 11.53 99.793 6.202 96.883 3.004 92.011" + - "C -0.181 87.152 -0.671 81.288 1.661 75.913" + - "L 2.277 74.504" + - "V 74.503" + - "A 3.45 3.45 0 0 0 2.277 71.778" + - "V 71.777" + - "L 1.665 70.368" + - "C -0.671 64.993 -0.181 59.129 3.004 54.274" + - "A 17.5 17.5 0 0 1 6.761 50.162" + - "L 6.965 50" + - "L 6.761 49.838" + - "A 17.5 17.5 0 0 1 3.004 45.73" + - "C -0.181 40.871 -0.671 35.007 1.665 29.632" + - "L 2.277 28.223" + - "V 28.222" + - "A 3.45 3.45 0 0 0 2.277 25.497" + - "V 25.496" + - "L 1.665 24.087" + - "C -0.671 18.712 -0.181 12.848 3.004 7.994" + - "V 7.993" + - "C 6.202 3.117 11.53 0.207 17.257 0.207" + - "C 19.591 0.207 21.894 0.692 24.1 1.652" + - "L 25.509 2.264" + - "L 25.511 2.265" + - "A 3.46 3.46 0 0 0 28.234 2.265" + - "L 28.236 2.264" + - "L 29.645 1.652" + - "A 17.1 17.1 0 0 1 36.488 0.207" + - "C 41.717 0.207 46.603 2.635 49.85 6.764" + - "Z", - "arch" to - "M 50 0" + - "L 72.5 0" + - "A 27.5 27.5 0 0 1 100 27.5" + - "L 100 86.67" + - "A 13.33 13.33 0 0 1 86.67 100" + - "L 13.33 100" + - "A 13.33 13.33 0 0 1 0 86.67" + - "L 0 27.5" + - "A 27.5 27.5 0 0 1 27.5 0" + - "Z", - "square" to - "M 50 0" + - "L 83.4 0" + - "A 16.6 16.6 0 0 1 100 16.6" + - "L 100 83.4" + - "A 16.6 16.6 0 0 1 83.4 100" + - "L 16.6 100" + - "A 16.6 16.6 0 0 1 0 83.4" + - "L 0 16.6" + - "A 16.6 16.6 0 0 1 16.6 0" + - "Z", - ) - } else { - mapOf("circle" to "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0") - } + private const val FOLDER_CLOVER_PATH = + "M 39.616 4 C 46.224 6.87 53.727 6.87 60.335 4 L 63.884 2.459 C 85.178 -6.789 106.789 14.822 97.541 36.116 L 96 39.665 C 93.13 46.273 93.13 53.776 96 60.384 L 97.541 63.934 C 106.789 85.227 85.178 106.839 63.884 97.591 L 60.335 96.049 C 53.727 93.179 46.224 93.179 39.616 96.049 L 36.066 97.591 C 14.773 106.839 -6.839 85.227 2.409 63.934 L 3.951 60.384 C 6.821 53.776 6.821 46.273 3.951 39.665 L 2.409 36.116 C -6.839 14.822 14.773 -6.789 36.066 2.459 Z" + private const val FOLDER_COMPLEX_CLOVER_PATH = + "M 49.85 6.764 L 50.013 6.971 L 50.175 6.764 C 53.422 2.635 58.309 0.207 63.538 0.207 C 65.872 0.207 68.175 0.692 70.381 1.648 L 71.79 2.264 L 71.792 2.265 A 3.46 3.46 0 0 0 74.515 2.265 L 74.517 2.264 L 75.926 1.652 A 17.1 17.1 0 0 1 82.769 0.207 C 88.495 0.207 93.824 3.117 97.022 7.989 C 100.21 12.848 100.697 18.712 98.36 24.087 L 97.749 25.496 V 25.497 A 3.45 3.45 0 0 0 97.749 28.222 V 28.223 L 98.36 29.632 C 100.697 35.007 100.207 40.871 97.022 45.73 A 17.5 17.5 0 0 1 93.264 49.838 L 93.06 50 L 93.264 50.162 A 17.5 17.5 0 0 1 97.022 54.27 C 100.21 59.129 100.697 64.993 98.36 70.368 V 71.778 A 3.45 3.45 0 0 0 97.749 74.503 V 74.504 L 98.36 75.913 C 100.697 81.288 100.207 87.152 97.022 92.011 C 93.824 96.883 88.495 99.793 82.769 99.793 C 80.435 99.793 78.132 99.308 75.926 98.348 L 74.517 97.736 H 74.515 A 3.5 3.5 0 0 0 73.153 97.455 C 72.682 97.455 72.225 97.552 71.792 97.736 H 71.79 L 70.381 98.348 A 17.1 17.1 0 0 1 63.538 99.793 C 58.309 99.793 53.422 97.365 50.175 93.236 L 50.013 93.029 L 49.85 93.236 C 46.603 97.365 41.717 99.793 36.488 99.793 C 34.154 99.793 31.851 99.308 29.645 98.348 L 28.236 97.736 H 28.234 A 3.5 3.5 0 0 0 26.872 97.455 C 26.401 97.455 25.944 97.552 25.511 97.736 H 25.509 L 24.1 98.348 A 17.1 17.1 0 0 1 17.257 99.793 C 11.53 99.793 6.202 96.883 3.004 92.011 C -0.181 87.152 -0.671 81.288 1.661 75.913 L 2.277 74.504 V 74.503 A 3.45 3.45 0 0 0 2.277 71.778 V 71.777 L 1.665 70.368 C -0.671 64.993 -0.181 59.129 3.004 54.274 A 17.5 17.5 0 0 1 6.761 50.162 L 6.965 50 L 6.761 49.838 A 17.5 17.5 0 0 1 3.004 45.73 C -0.181 40.871 -0.671 35.007 1.665 29.632 L 2.277 28.223 V 28.222 A 3.45 3.45 0 0 0 2.277 25.497 V 25.496 L 1.665 24.087 C -0.671 18.712 -0.181 12.848 3.004 7.994 V 7.993 C 6.202 3.117 11.53 0.207 17.257 0.207 C 19.591 0.207 21.894 0.692 24.1 1.652 L 25.509 2.264 L 25.511 2.265 A 3.46 3.46 0 0 0 28.234 2.265 L 28.236 2.264 L 29.645 1.652 A 17.1 17.1 0 0 1 36.488 0.207 C 41.717 0.207 46.603 2.635 49.85 6.764 Z" + private const val FOLDER_ARCH_PATH = + "M 50 0 L 72.5 0 A 27.5 27.5 0 0 1 100 27.5 L 100 86.67 A 13.33 13.33 0 0 1 86.67 100 L 13.33 100 A 13.33 13.33 0 0 1 0 86.67 L 0 27.5 A 27.5 27.5 0 0 1 27.5 0 Z" + private const val FOLDER_SQUARE_PATH = + "M 50 0 L 83.4 0 A 16.6 16.6 0 0 1 100 16.6 L 100 83.4 A 16.6 16.6 0 0 1 83.4 100 L 16.6 100 A 16.6 16.6 0 0 1 0 83.4 L 0 16.6 A 16.6 16.6 0 0 1 16.6 0 Z" + private const val CIRCLE_PATH = "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + private const val SQUARE_PATH = + "M53.689 0.82 L53.689 .82 C67.434 .82 74.306 .82 79.758 2.978 87.649 6.103 93.897 12.351 97.022 20.242 99.18 25.694 99.18 32.566 99.18 46.311 V53.689 C99.18 67.434 99.18 74.306 97.022 79.758 93.897 87.649 87.649 93.897 79.758 97.022 74.306 99.18 67.434 99.18 53.689 99.18 H46.311 C32.566 99.18 25.694 99.18 20.242 97.022 12.351 93.897 6.103 87.649 2.978 79.758 .82 74.306 .82 67.434 .82 53.689 L.82 46.311 C.82 32.566 .82 25.694 2.978 20.242 6.103 12.351 12.351 6.103 20.242 2.978 25.694 .82 32.566 .82 46.311 .82Z" + private const val FOUR_SIDED_COOKIE_PATH = + "M39.888,4.517C46.338 7.319 53.662 7.319 60.112 4.517L63.605 3C84.733 -6.176 106.176 15.268 97 36.395L95.483 39.888C92.681 46.338 92.681 53.662 95.483 60.112L97 63.605C106.176 84.732 84.733 106.176 63.605 97L60.112 95.483C53.662 92.681 46.338 92.681 39.888 95.483L36.395 97C15.267 106.176 -6.176 84.732 3 63.605L4.517 60.112C7.319 53.662 7.319 46.338 4.517 39.888L3 36.395C -6.176 15.268 15.267 -6.176 36.395 3Z" + private const val SEVEN_SIDED_COOKIE_PATH = + "M35.209 4.878C36.326 3.895 36.884 3.404 37.397 3.006 44.82 -2.742 55.18 -2.742 62.603 3.006 63.116 3.404 63.674 3.895 64.791 4.878 65.164 5.207 65.351 5.371 65.539 5.529 68.167 7.734 71.303 9.248 74.663 9.932 74.902 9.981 75.147 10.025 75.637 10.113 77.1 10.375 77.831 10.506 78.461 10.66 87.573 12.893 94.032 21.011 94.176 30.412 94.186 31.062 94.151 31.805 94.08 33.293 94.057 33.791 94.045 34.04 94.039 34.285 93.958 37.72 94.732 41.121 96.293 44.18 96.404 44.399 96.522 44.618 96.759 45.056 97.467 46.366 97.821 47.021 98.093 47.611 102.032 56.143 99.727 66.266 92.484 72.24 91.983 72.653 91.381 73.089 90.177 73.961 89.774 74.254 89.572 74.4 89.377 74.548 86.647 76.626 84.477 79.353 83.063 82.483 82.962 82.707 82.865 82.936 82.671 83.395 82.091 84.766 81.8 85.451 81.51 86.033 77.31 94.44 67.977 98.945 58.801 96.994 58.166 96.859 57.451 96.659 56.019 96.259 55.54 96.125 55.3 96.058 55.063 95.998 51.74 95.154 48.26 95.154 44.937 95.998 44.699 96.058 44.46 96.125 43.981 96.259 42.549 96.659 41.834 96.859 41.199 96.994 32.023 98.945 22.69 94.44 18.49 86.033 18.2 85.451 17.909 84.766 17.329 83.395 17.135 82.936 17.038 82.707 16.937 82.483 15.523 79.353 13.353 76.626 10.623 74.548 10.428 74.4 10.226 74.254 9.823 73.961 8.619 73.089 8.017 72.653 7.516 72.24 .273 66.266 -2.032 56.143 1.907 47.611 2.179 47.021 2.533 46.366 3.241 45.056 3.478 44.618 3.596 44.399 3.707 44.18 5.268 41.121 6.042 37.72 5.961 34.285 5.955 34.04 5.943 33.791 5.92 33.293 5.849 31.805 5.814 31.062 5.824 30.412 5.968 21.011 12.427 12.893 21.539 10.66 22.169 10.506 22.9 10.375 24.363 10.113 24.853 10.025 25.098 9.981 25.337 9.932 28.697 9.248 31.833 7.734 34.461 5.529 34.649 5.371 34.836 5.207 35.209 4.878Z" + private const val ARCH_PATH = + "M50 0C77.614 0 100 22.386 100 50C100 85.471 100 86.476 99.9 87.321 99.116 93.916 93.916 99.116 87.321 99.9 86.476 100 85.471 100 83.46 100H16.54C14.529 100 13.524 100 12.679 99.9 6.084 99.116 .884 93.916 .1 87.321 0 86.476 0 85.471 0 83.46L0 50C0 22.386 22.386 0 50 0Z" + @VisibleForTesting const val CIRCLE_KEY = "circle" + @VisibleForTesting const val SQUARE_KEY = "square" + @VisibleForTesting const val FOUR_SIDED_COOKIE_KEY = "four_sided_cookie" + @VisibleForTesting const val SEVEN_SIDED_COOKIE_KEY = "seven_sided_cookie" + @VisibleForTesting const val ARCH_KEY = "arch" val iconShapes = if (Flags.newCustomizationPickerUi() && LauncherFlags.enableLauncherIconShapes()) { - mapOf( - "circle" to - IconShapeModel( - key = "circle", - title = "circle", - pathString = "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0", - folderPathString = folderShapes["clover"]!!, - ), - "square" to - IconShapeModel( - key = "square", - title = "square", - pathString = - "M53.689 0.82 L53.689 .82 C67.434 .82 74.306 .82 79.758 2.978 87.649 6.103 93.897 12.351 97.022 20.242 99.18 25.694 99.18 32.566 99.18 46.311 V53.689 C99.18 67.434 99.18 74.306 97.022 79.758 93.897 87.649 87.649 93.897 79.758 97.022 74.306 99.18 67.434 99.18 53.689 99.18 H46.311 C32.566 99.18 25.694 99.18 20.242 97.022 12.351 93.897 6.103 87.649 2.978 79.758 .82 74.306 .82 67.434 .82 53.689 L.82 46.311 C.82 32.566 .82 25.694 2.978 20.242 6.103 12.351 12.351 6.103 20.242 2.978 25.694 .82 32.566 .82 46.311 .82Z", - folderShapes["square"]!!, - ), - "four_sided_cookie" to - IconShapeModel( - key = "four_sided_cookie", - title = "4 sided cookie", - pathString = - "M39.888,4.517C46.338 7.319 53.662 7.319 60.112 4.517L63.605 3C84.733 -6.176 106.176 15.268 97 36.395L95.483 39.888C92.681 46.338 92.681 53.662 95.483 60.112L97 63.605C106.176 84.732 84.733 106.176 63.605 97L60.112 95.483C53.662 92.681 46.338 92.681 39.888 95.483L36.395 97C15.267 106.176 -6.176 84.732 3 63.605L4.517 60.112C7.319 53.662 7.319 46.338 4.517 39.888L3 36.395C -6.176 15.268 15.267 -6.176 36.395 3Z", - folderPathString = folderShapes["complexClover"]!!, - iconScale = 72f / 83.4f, - ), - "seven_sided_cookie" to - IconShapeModel( - key = "seven_sided_cookie", - title = "7 sided cookie", - pathString = - "M35.209 4.878C36.326 3.895 36.884 3.404 37.397 3.006 44.82 -2.742 55.18 -2.742 62.603 3.006 63.116 3.404 63.674 3.895 64.791 4.878 65.164 5.207 65.351 5.371 65.539 5.529 68.167 7.734 71.303 9.248 74.663 9.932 74.902 9.981 75.147 10.025 75.637 10.113 77.1 10.375 77.831 10.506 78.461 10.66 87.573 12.893 94.032 21.011 94.176 30.412 94.186 31.062 94.151 31.805 94.08 33.293 94.057 33.791 94.045 34.04 94.039 34.285 93.958 37.72 94.732 41.121 96.293 44.18 96.404 44.399 96.522 44.618 96.759 45.056 97.467 46.366 97.821 47.021 98.093 47.611 102.032 56.143 99.727 66.266 92.484 72.24 91.983 72.653 91.381 73.089 90.177 73.961 89.774 74.254 89.572 74.4 89.377 74.548 86.647 76.626 84.477 79.353 83.063 82.483 82.962 82.707 82.865 82.936 82.671 83.395 82.091 84.766 81.8 85.451 81.51 86.033 77.31 94.44 67.977 98.945 58.801 96.994 58.166 96.859 57.451 96.659 56.019 96.259 55.54 96.125 55.3 96.058 55.063 95.998 51.74 95.154 48.26 95.154 44.937 95.998 44.699 96.058 44.46 96.125 43.981 96.259 42.549 96.659 41.834 96.859 41.199 96.994 32.023 98.945 22.69 94.44 18.49 86.033 18.2 85.451 17.909 84.766 17.329 83.395 17.135 82.936 17.038 82.707 16.937 82.483 15.523 79.353 13.353 76.626 10.623 74.548 10.428 74.4 10.226 74.254 9.823 73.961 8.619 73.089 8.017 72.653 7.516 72.24 .273 66.266 -2.032 56.143 1.907 47.611 2.179 47.021 2.533 46.366 3.241 45.056 3.478 44.618 3.596 44.399 3.707 44.18 5.268 41.121 6.042 37.72 5.961 34.285 5.955 34.04 5.943 33.791 5.92 33.293 5.849 31.805 5.814 31.062 5.824 30.412 5.968 21.011 12.427 12.893 21.539 10.66 22.169 10.506 22.9 10.375 24.363 10.113 24.853 10.025 25.098 9.981 25.337 9.932 28.697 9.248 31.833 7.734 34.461 5.529 34.649 5.371 34.836 5.207 35.209 4.878Z", - folderPathString = folderShapes["clover"]!!, - iconScale = 72f / 80f, - ), - "arch" to - IconShapeModel( - key = "arch", - title = "arch", - pathString = - "M50 0C77.614 0 100 22.386 100 50C100 85.471 100 86.476 99.9 87.321 99.116 93.916 93.916 99.116 87.321 99.9 86.476 100 85.471 100 83.46 100H16.54C14.529 100 13.524 100 12.679 99.9 6.084 99.116 .884 93.916 .1 87.321 0 86.476 0 85.471 0 83.46L0 50C0 22.386 22.386 0 50 0Z", - folderPathString = folderShapes["arch"]!!, - ), - "sunny" to - IconShapeModel( - key = "sunny", - title = "sunny", - pathString = - "M42.846 4.873C46.084 -.531 53.916 -.531 57.154 4.873L60.796 10.951C62.685 14.103 66.414 15.647 69.978 14.754L76.851 13.032C82.962 11.5 88.5 17.038 86.968 23.149L85.246 30.022C84.353 33.586 85.897 37.315 89.049 39.204L95.127 42.846C100.531 46.084 100.531 53.916 95.127 57.154L89.049 60.796C85.897 62.685 84.353 66.414 85.246 69.978L86.968 76.851C88.5 82.962 82.962 88.5 76.851 86.968L69.978 85.246C66.414 84.353 62.685 85.898 60.796 89.049L57.154 95.127C53.916 100.531 46.084 100.531 42.846 95.127L39.204 89.049C37.315 85.898 33.586 84.353 30.022 85.246L23.149 86.968C17.038 88.5 11.5 82.962 13.032 76.851L14.754 69.978C15.647 66.414 14.103 62.685 10.951 60.796L4.873 57.154C -.531 53.916 -.531 46.084 4.873 42.846L10.951 39.204C14.103 37.315 15.647 33.586 14.754 30.022L13.032 23.149C11.5 17.038 17.038 11.5 23.149 13.032L30.022 14.754C33.586 15.647 37.315 14.103 39.204 10.951L42.846 4.873Z", - folderPathString = folderShapes["clover"]!!, - iconScale = 72f / 92f, - ), + arrayOf( + IconShapeModel( + key = CIRCLE_KEY, + title = "circle", + pathString = CIRCLE_PATH, + folderPathString = FOLDER_CLOVER_PATH, + ), + IconShapeModel( + key = SQUARE_KEY, + title = "square", + pathString = SQUARE_PATH, + folderPathString = FOLDER_SQUARE_PATH, + ), + IconShapeModel( + key = FOUR_SIDED_COOKIE_KEY, + title = "4 sided cookie", + pathString = FOUR_SIDED_COOKIE_PATH, + folderPathString = FOLDER_COMPLEX_CLOVER_PATH, + iconScale = 72f / 83.4f, + ), + IconShapeModel( + key = SEVEN_SIDED_COOKIE_KEY, + title = "7 sided cookie", + pathString = SEVEN_SIDED_COOKIE_PATH, + folderPathString = FOLDER_CLOVER_PATH, + iconScale = 72f / 80f, + ), + IconShapeModel( + key = ARCH_KEY, + title = "arch", + pathString = ARCH_PATH, + folderPathString = FOLDER_ARCH_PATH, + ), ) } else { - mapOf( - "circle" to - IconShapeModel( - key = "circle", - title = "circle", - pathString = "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0", - ) - ) + arrayOf(IconShapeModel(key = CIRCLE_KEY, title = "circle", pathString = CIRCLE_PATH)) } } diff --git a/src/com/android/launcher3/testing/TestInformationProvider.java b/src/com/android/launcher3/testing/TestInformationProvider.java index 17b472a473..4b592e7627 100644 --- a/src/com/android/launcher3/testing/TestInformationProvider.java +++ b/src/com/android/launcher3/testing/TestInformationProvider.java @@ -16,61 +16,40 @@ package com.android.launcher3.testing; -import android.content.ContentProvider; -import android.content.ContentValues; -import android.database.Cursor; -import android.net.Uri; +import android.content.Context; import android.os.Bundle; import android.util.Log; -import com.android.launcher3.Utilities; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; -public class TestInformationProvider extends ContentProvider { +import com.android.launcher3.Utilities; +import com.android.launcher3.util.ContentProviderProxy; + +public class TestInformationProvider extends ContentProviderProxy { private static final String TAG = "TestInformationProvider"; + @Nullable @Override - public boolean onCreate() { - return true; - } - - @Override - public int update(Uri uri, ContentValues contentValues, String s, String[] strings) { - return 0; - } - - @Override - public int delete(Uri uri, String s, String[] strings) { - return 0; - } - - @Override - public Uri insert(Uri uri, ContentValues contentValues) { - return null; - } - - @Override - public String getType(Uri uri) { - return null; - } - - @Override - public Cursor query(Uri uri, String[] strings, String s, String[] strings1, String s1) { - return null; - } - - @Override - public Bundle call(String method, String arg, Bundle extras) { + public ProxyProvider getProxy(@NonNull Context context) { if (Utilities.isRunningInTestHarness()) { - TestInformationHandler handler = TestInformationHandler.newInstance(getContext()); - handler.init(getContext()); + return new ProxyProvider() { + @Nullable + @Override + public Bundle call(@NonNull String method, @Nullable String arg, + @Nullable Bundle extras) { + TestInformationHandler handler = TestInformationHandler.newInstance(context); + handler.init(context); - Bundle response = handler.call(method, arg, extras); - if (response == null) { - Log.e(TAG, "Couldn't handle method: " + method + "; current handler=" - + handler.getClass().getSimpleName()); - } - return response; + Bundle response = handler.call(method, arg, extras); + if (response == null) { + Log.e(TAG, "Couldn't handle method: " + method + "; current handler=" + + handler.getClass().getSimpleName()); + } + return response; + } + }; } return null; } diff --git a/src/com/android/launcher3/touch/AllAppsSwipeController.java b/src/com/android/launcher3/touch/AllAppsSwipeController.java index 107bcc1226..2cc4909712 100644 --- a/src/com/android/launcher3/touch/AllAppsSwipeController.java +++ b/src/com/android/launcher3/touch/AllAppsSwipeController.java @@ -207,6 +207,11 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { } config.setInterpolator(ANIM_WORKSPACE_SCALE, DECELERATED_EASE); config.setInterpolator(ANIM_DEPTH, DECELERATED_EASE); + if (launcher.getDeviceProfile().isPhone) { + config.setInterpolator(ANIM_WORKSPACE_FADE, INSTANT); + config.setInterpolator(ANIM_HOTSEAT_FADE, INSTANT); + config.animFlags |= StateAnimationConfig.SKIP_DEPTH_CONTROLLER; + } } else { if (config.isUserControlled()) { config.setInterpolator(ANIM_DEPTH, Interpolators.reverse(BLUR_MANUAL)); @@ -248,6 +253,11 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { } config.setInterpolator(ANIM_WORKSPACE_SCALE, DECELERATED_EASE); config.setInterpolator(ANIM_DEPTH, DECELERATED_EASE); + if (launcher.getDeviceProfile().isPhone) { + config.setInterpolator(ANIM_WORKSPACE_FADE, FINAL_FRAME); + config.setInterpolator(ANIM_HOTSEAT_FADE, FINAL_FRAME); + config.animFlags |= StateAnimationConfig.SKIP_DEPTH_CONTROLLER; + } } else { config.setInterpolator(ANIM_DEPTH, config.isUserControlled() ? BLUR_MANUAL : BLUR_ATOMIC); diff --git a/src/com/android/launcher3/util/ApiWrapper.java b/src/com/android/launcher3/util/ApiWrapper.java index 56337b08e1..0510d591e4 100644 --- a/src/com/android/launcher3/util/ApiWrapper.java +++ b/src/com/android/launcher3/util/ApiWrapper.java @@ -216,6 +216,13 @@ public class ApiWrapper { return 0; } + /** + * Checks if the shortcut is using an icon with file or URI source + */ + public boolean isFileDrawable(@NonNull ShortcutInfo shortcutInfo) { + return false; + } + private static class NoopDrawable extends ColorDrawable { @Override public int getIntrinsicHeight() { diff --git a/src/com/android/launcher3/util/ContentProviderProxy.kt b/src/com/android/launcher3/util/ContentProviderProxy.kt new file mode 100644 index 0000000000..db693db7ff --- /dev/null +++ b/src/com/android/launcher3/util/ContentProviderProxy.kt @@ -0,0 +1,86 @@ +/* + * 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.util + +import android.content.ContentProvider +import android.content.ContentValues +import android.content.Context +import android.database.Cursor +import android.net.Uri +import android.os.Bundle + +/** Wrapper around [ContentProvider] which allows delegating all calls to an interface */ +abstract class ContentProviderProxy : ContentProvider() { + + override fun onCreate() = true + + override fun delete(uri: Uri, selection: String?, selectionArgs: Array?): Int = + checkGetProxy()?.delete(uri, selection, selectionArgs) ?: 0 + + /** Do not route this call through proxy as it doesn't generally require initializing objects */ + override fun getType(uri: Uri): String? = null + + override fun insert(uri: Uri, values: ContentValues?): Uri? = + checkGetProxy()?.insert(uri, values) + + override fun query( + uri: Uri, + projection: Array?, + selection: String?, + selectionArgs: Array?, + sortOrder: String?, + ): Cursor? = checkGetProxy()?.query(uri, projection, selection, selectionArgs, sortOrder) + + override fun update( + uri: Uri, + values: ContentValues?, + selection: String?, + selectionArgs: Array?, + ): Int = checkGetProxy()?.update(uri, values, selection, selectionArgs) ?: 0 + + override fun call(method: String, arg: String?, extras: Bundle?): Bundle? = + checkGetProxy()?.call(method, arg, extras) + + private fun checkGetProxy(): ProxyProvider? = context?.let { getProxy(it) } + + abstract fun getProxy(ctx: Context): ProxyProvider? + + /** Interface for handling the actual content provider calls */ + interface ProxyProvider { + + fun delete(uri: Uri, selection: String?, selectionArgs: Array?): Int = 0 + + fun insert(uri: Uri, values: ContentValues?): Uri? = null + + fun query( + uri: Uri, + projection: Array?, + selection: String?, + selectionArgs: Array?, + sortOrder: String?, + ): Cursor? = null + + fun update( + uri: Uri, + values: ContentValues?, + selection: String?, + selectionArgs: Array?, + ): Int = 0 + + fun call(method: String, arg: String?, extras: Bundle?): Bundle? = null + } +} diff --git a/src/com/android/launcher3/util/DaggerSingletonObject.java b/src/com/android/launcher3/util/DaggerSingletonObject.java index a245761fb7..a4bd30a193 100644 --- a/src/com/android/launcher3/util/DaggerSingletonObject.java +++ b/src/com/android/launcher3/util/DaggerSingletonObject.java @@ -24,8 +24,7 @@ import com.android.launcher3.dagger.LauncherComponentProvider; import java.util.function.Function; /** - * A class to provide DaggerSingleton objects in a traditional way for - * {@link MainThreadInitializedObject}. + * A class to provide DaggerSingleton objects in a traditional way. * We should delete this class at the end and use @Inject to get dagger provided singletons. */ diff --git a/src/com/android/launcher3/util/DaggerSingletonTracker.java b/src/com/android/launcher3/util/DaggerSingletonTracker.java index b7a88dbf44..34b376091e 100644 --- a/src/com/android/launcher3/util/DaggerSingletonTracker.java +++ b/src/com/android/launcher3/util/DaggerSingletonTracker.java @@ -45,7 +45,7 @@ public class DaggerSingletonTracker implements SafeCloseable { * Adds the SafeCloseable Singletons to the mLauncherAppSingletons list. * This helps to track the singletons and close them appropriately. * See {@link DaggerSingletonTracker#close()} and - * {@link MainThreadInitializedObject.SandboxContext#onDestroy()} + * {@link SandboxContext#onDestroy()} */ public void addCloseable(SafeCloseable closeable) { MAIN_EXECUTOR.execute(() -> { diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java index 376a61e12c..52f88876cf 100644 --- a/src/com/android/launcher3/util/DisplayController.java +++ b/src/com/android/launcher3/util/DisplayController.java @@ -18,6 +18,7 @@ package com.android.launcher3.util; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; +import static com.android.launcher3.Flags.enableOverviewOnConnectedDisplays; import static com.android.launcher3.InvariantDeviceProfile.TYPE_MULTI_DISPLAY; import static com.android.launcher3.InvariantDeviceProfile.TYPE_PHONE; import static com.android.launcher3.InvariantDeviceProfile.TYPE_TABLET; @@ -42,9 +43,11 @@ import android.hardware.display.DisplayManager; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; +import android.util.SparseArray; import android.view.Display; import androidx.annotation.AnyThread; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; import androidx.annotation.VisibleForTesting; @@ -63,8 +66,10 @@ import com.android.launcher3.util.window.WindowManagerProxy.DesktopVisibilityLis import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -78,8 +83,7 @@ import javax.inject.Inject; */ @SuppressLint("NewApi") @LauncherAppSingleton -public class DisplayController implements ComponentCallbacks, - DesktopVisibilityListener { +public class DisplayController implements DesktopVisibilityListener { private static final String TAG = "DisplayController"; private static final boolean DEBUG = false; @@ -99,29 +103,29 @@ public class DisplayController implements ComponentCallbacks, public static final int CHANGE_NAVIGATION_MODE = 1 << 4; public static final int CHANGE_TASKBAR_PINNING = 1 << 5; public static final int CHANGE_DESKTOP_MODE = 1 << 6; + public static final int CHANGE_SHOW_LOCKED_TASKBAR = 1 << 7; public static final int CHANGE_ALL = CHANGE_ACTIVE_SCREEN | CHANGE_ROTATION | CHANGE_DENSITY | CHANGE_SUPPORTED_BOUNDS | CHANGE_NAVIGATION_MODE - | CHANGE_TASKBAR_PINNING | CHANGE_DESKTOP_MODE; + | CHANGE_TASKBAR_PINNING | CHANGE_DESKTOP_MODE | CHANGE_SHOW_LOCKED_TASKBAR; private static final String ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED"; private static final String TARGET_OVERLAY_PACKAGE = "android"; private final WindowManagerProxy mWMProxy; - // Null for SDK < S - private final Context mWindowContext; + private final @ApplicationContext Context mAppContext; // The callback in this listener updates DeviceProfile, which other listeners might depend on private DisplayInfoChangeListener mPriorityListener; - private final CopyOnWriteArrayList mListeners = - new CopyOnWriteArrayList<>(); + + private final SparseArray mPerDisplayInfo = + new SparseArray<>(); // We will register broadcast receiver on main thread to ensure not missing changes on // TARGET_OVERLAY_PACKAGE and ACTION_OVERLAY_CHANGED. private final SimpleBroadcastReceiver mReceiver; - private Info mInfo; private boolean mDestroyed = false; @Inject @@ -129,18 +133,20 @@ public class DisplayController implements ComponentCallbacks, WindowManagerProxy wmProxy, LauncherPrefs prefs, DaggerSingletonTracker lifecycle) { + mAppContext = context; mWMProxy = wmProxy; if (enableTaskbarPinning()) { LauncherPrefChangeListener prefListener = key -> { + Info info = getInfo(); boolean isTaskbarPinningChanged = TASKBAR_PINNING_KEY.equals(key) - && mInfo.mIsTaskbarPinned != prefs.get(TASKBAR_PINNING); + && info.mIsTaskbarPinned != prefs.get(TASKBAR_PINNING); boolean isTaskbarPinningDesktopModeChanged = TASKBAR_PINNING_DESKTOP_MODE_KEY.equals(key) - && mInfo.mIsTaskbarPinnedInDesktopMode != prefs.get( + && info.mIsTaskbarPinnedInDesktopMode != prefs.get( TASKBAR_PINNING_IN_DESKTOP_MODE); if (isTaskbarPinningChanged || isTaskbarPinningDesktopModeChanged) { - notifyConfigChange(); + notifyConfigChange(DEFAULT_DISPLAY); } }; @@ -150,23 +156,49 @@ public class DisplayController implements ComponentCallbacks, prefListener, TASKBAR_PINNING, TASKBAR_PINNING_IN_DESKTOP_MODE)); } - Display display = context.getSystemService(DisplayManager.class) - .getDisplay(DEFAULT_DISPLAY); - mWindowContext = context.createWindowContext(display, TYPE_APPLICATION, null); - mWindowContext.registerComponentCallbacks(this); + DisplayManager displayManager = context.getSystemService(DisplayManager.class); + Display defaultDisplay = displayManager.getDisplay(DEFAULT_DISPLAY); + PerDisplayInfo defaultPerDisplayInfo = getOrCreatePerDisplayInfo(defaultDisplay); // Initialize navigation mode change listener mReceiver = new SimpleBroadcastReceiver(context, MAIN_EXECUTOR, this::onIntent); mReceiver.registerPkgActions(TARGET_OVERLAY_PACKAGE, ACTION_OVERLAY_CHANGED); - mInfo = new Info(mWindowContext, wmProxy, - wmProxy.estimateInternalDisplayBounds(mWindowContext)); wmProxy.registerDesktopVisibilityListener(this); - FileLog.i(TAG, "(CTOR) perDisplayBounds: " + mInfo.mPerDisplayBounds); + FileLog.i(TAG, "(CTOR) perDisplayBounds: " + + defaultPerDisplayInfo.mInfo.mPerDisplayBounds); + + if (enableOverviewOnConnectedDisplays()) { + final DisplayManager.DisplayListener displayListener = + new DisplayManager.DisplayListener() { + @Override + public void onDisplayAdded(int displayId) { + getOrCreatePerDisplayInfo(displayManager.getDisplay(displayId)); + } + + @Override + public void onDisplayChanged(int displayId) { + } + + @Override + public void onDisplayRemoved(int displayId) { + removePerDisplayInfo(displayId); + } + }; + displayManager.registerDisplayListener(displayListener, MAIN_EXECUTOR.getHandler()); + lifecycle.addCloseable(() -> { + displayManager.unregisterDisplayListener(displayListener); + }); + // Add any PerDisplayInfos for already-connected displays. + Arrays.stream(displayManager.getDisplays()) + .forEach((it) -> + getOrCreatePerDisplayInfo( + displayManager.getDisplay(it.getDisplayId()))); + } lifecycle.addCloseable(() -> { mDestroyed = true; - mWindowContext.unregisterComponentCallbacks(this); + defaultPerDisplayInfo.cleanup(); mReceiver.unregisterReceiverSafely(); wmProxy.unregisterDesktopVisibilityListener(this); }); @@ -211,6 +243,13 @@ public class DisplayController implements ComponentCallbacks, return INSTANCE.get(context).getInfo().isPinnedTaskbar(); } + /** + * Returns whether the taskbar is pinned in gesture navigation mode. + */ + public static boolean isInDesktopMode(Context context) { + return INSTANCE.get(context).getInfo().isInDesktopMode(); + } + /** * Returns whether the taskbar is forced to be pinned when home is visible. */ @@ -228,9 +267,7 @@ public class DisplayController implements ComponentCallbacks, @Override public void onIsInDesktopModeChanged(int displayId, boolean isInDesktopModeAndNotInOverview) { - if (DEFAULT_DISPLAY == displayId) { - notifyConfigChange(); - } + notifyConfigChange(displayId); } /** @@ -253,60 +290,88 @@ public class DisplayController implements ComponentCallbacks, } if (ACTION_OVERLAY_CHANGED.equals(intent.getAction())) { Log.d(TAG, "Overlay changed, notifying listeners"); - notifyConfigChange(); + notifyConfigChange(DEFAULT_DISPLAY); } } + @VisibleForTesting + public void onConfigurationChanged(Configuration config) { + onConfigurationChanged(config, DEFAULT_DISPLAY); + } + @UiThread - @Override - public final void onConfigurationChanged(Configuration config) { + private void onConfigurationChanged(Configuration config, int displayId) { Log.d(TASKBAR_NOT_DESTROYED_TAG, "DisplayController#onConfigurationChanged: " + config); - if (config.densityDpi != mInfo.densityDpi - || config.fontScale != mInfo.fontScale - || !mInfo.mScreenSizeDp.equals( - new PortraitSize(config.screenHeightDp, config.screenWidthDp)) - || mWindowContext.getDisplay().getRotation() != mInfo.rotation - || mWMProxy.showLockedTaskbarOnHome(mWindowContext) - != mInfo.showLockedTaskbarOnHome() - || mWMProxy.showDesktopTaskbarForFreeformDisplay(mWindowContext) - != mInfo.showDesktopTaskbarForFreeformDisplay()) { - notifyConfigChange(); + PerDisplayInfo perDisplayInfo = mPerDisplayInfo.get(displayId); + Context windowContext = perDisplayInfo.mWindowContext; + Info info = perDisplayInfo.mInfo; + if (config.densityDpi != info.densityDpi + || config.fontScale != info.fontScale + || !info.mScreenSizeDp.equals( + new PortraitSize(config.screenHeightDp, config.screenWidthDp)) + || windowContext.getDisplay().getRotation() != info.rotation + || mWMProxy.showLockedTaskbarOnHome(windowContext) + != info.showLockedTaskbarOnHome() + || mWMProxy.showDesktopTaskbarForFreeformDisplay(windowContext) + != info.showDesktopTaskbarForFreeformDisplay()) { + notifyConfigChange(displayId); } } - @Override - public final void onLowMemory() { } - public void setPriorityListener(DisplayInfoChangeListener listener) { mPriorityListener = listener; } public void addChangeListener(DisplayInfoChangeListener listener) { - mListeners.add(listener); + addChangeListenerForDisplay(listener, DEFAULT_DISPLAY); } public void removeChangeListener(DisplayInfoChangeListener listener) { - mListeners.remove(listener); + removeChangeListenerForDisplay(listener, DEFAULT_DISPLAY); + } + + public void addChangeListenerForDisplay(DisplayInfoChangeListener listener, int displayId) { + PerDisplayInfo perDisplayInfo = mPerDisplayInfo.get(displayId); + if (perDisplayInfo != null) { + perDisplayInfo.addListener(listener); + } + } + + public void removeChangeListenerForDisplay(DisplayInfoChangeListener listener, int displayId) { + PerDisplayInfo perDisplayInfo = mPerDisplayInfo.get(displayId); + if (perDisplayInfo != null) { + perDisplayInfo.removeListener(listener); + } } public Info getInfo() { - return mInfo; + return mPerDisplayInfo.get(DEFAULT_DISPLAY).mInfo; + } + + public @Nullable Info getInfoForDisplay(int displayId) { + if (enableOverviewOnConnectedDisplays()) { + PerDisplayInfo perDisplayInfo = mPerDisplayInfo.get(displayId); + if (perDisplayInfo != null) { + return perDisplayInfo.mInfo; + } else { + return null; + } + } else { + return getInfo(); + } } @AnyThread public void notifyConfigChange() { - Info oldInfo = mInfo; + notifyConfigChange(DEFAULT_DISPLAY); + } - Context displayInfoContext = mWindowContext; - Info newInfo = new Info(displayInfoContext, mWMProxy, oldInfo.mPerDisplayBounds); - - if (newInfo.densityDpi != oldInfo.densityDpi || newInfo.fontScale != oldInfo.fontScale - || newInfo.getNavigationMode() != oldInfo.getNavigationMode()) { - // Cache may not be valid anymore, recreate without cache - newInfo = new Info(displayInfoContext, mWMProxy, - mWMProxy.estimateInternalDisplayBounds(displayInfoContext)); - } + @AnyThread + public void notifyConfigChange(int displayId) { + notifyConfigChangeForDisplay(displayId); + } + private int calculateChange(Info oldInfo, Info newInfo) { int change = 0; if (!newInfo.normalizedDisplayInfo.equals(oldInfo.normalizedDisplayInfo)) { change |= CHANGE_ACTIVE_SCREEN; @@ -328,34 +393,82 @@ public class DisplayController implements ComponentCallbacks, } if ((newInfo.mIsTaskbarPinned != oldInfo.mIsTaskbarPinned) || (newInfo.mIsTaskbarPinnedInDesktopMode - != oldInfo.mIsTaskbarPinnedInDesktopMode) + != oldInfo.mIsTaskbarPinnedInDesktopMode) || newInfo.isPinnedTaskbar() != oldInfo.isPinnedTaskbar()) { change |= CHANGE_TASKBAR_PINNING; } if (newInfo.mIsInDesktopMode != oldInfo.mIsInDesktopMode) { change |= CHANGE_DESKTOP_MODE; } + if (newInfo.mShowLockedTaskbarOnHome != oldInfo.mShowLockedTaskbarOnHome) { + change |= CHANGE_SHOW_LOCKED_TASKBAR; + } if (DEBUG) { Log.d(TAG, "handleInfoChange - change: " + getChangeFlagsString(change)); } + return change; + } - if (change != 0) { - mInfo = newInfo; - final int flags = change; - MAIN_EXECUTOR.execute(() -> notifyChange(displayInfoContext, flags)); + private Info getNewInfo(Info oldInfo, Context displayInfoContext) { + Info newInfo = new Info(displayInfoContext, mWMProxy, oldInfo.mPerDisplayBounds); + + if (newInfo.densityDpi != oldInfo.densityDpi || newInfo.fontScale != oldInfo.fontScale + || newInfo.getNavigationMode() != oldInfo.getNavigationMode()) { + // Cache may not be valid anymore, recreate without cache + newInfo = new Info(displayInfoContext, mWMProxy, + mWMProxy.estimateInternalDisplayBounds(displayInfoContext)); + } + return newInfo; + } + + @AnyThread + public void notifyConfigChangeForDisplay(int displayId) { + PerDisplayInfo perDisplayInfo = mPerDisplayInfo.get(displayId); + if (perDisplayInfo == null) return; + Info oldInfo = perDisplayInfo.mInfo; + final Info newInfo = getNewInfo(oldInfo, perDisplayInfo.mWindowContext); + final int flags = calculateChange(oldInfo, newInfo); + if (flags != 0) { + MAIN_EXECUTOR.execute(() -> { + perDisplayInfo.mInfo = newInfo; + if (displayId == DEFAULT_DISPLAY && mPriorityListener != null) { + mPriorityListener.onDisplayInfoChanged(perDisplayInfo.mWindowContext, newInfo, + flags); + } + perDisplayInfo.notifyListeners(newInfo, flags); + }); } } - private void notifyChange(Context context, int flags) { - if (mPriorityListener != null) { - mPriorityListener.onDisplayInfoChanged(context, mInfo, flags); + private PerDisplayInfo getOrCreatePerDisplayInfo(Display display) { + int displayId = display.getDisplayId(); + PerDisplayInfo perDisplayInfo = mPerDisplayInfo.get(displayId); + if (perDisplayInfo != null) { + return perDisplayInfo; } + if (DEBUG) { + Log.d(TAG, + String.format("getOrCreatePerDisplayInfo - no cached value found for %d", + displayId)); + } + Context windowContext = mAppContext.createWindowContext(display, TYPE_APPLICATION, null); + Info info = new Info(windowContext, mWMProxy, + mWMProxy.estimateInternalDisplayBounds(windowContext)); + perDisplayInfo = new PerDisplayInfo(displayId, windowContext, info); + mPerDisplayInfo.put(displayId, perDisplayInfo); + return perDisplayInfo; + } - int count = mListeners.size(); - for (int i = 0; i < count; i++) { - mListeners.get(i).onDisplayInfoChanged(context, mInfo, flags); - } + /** + * Clean up resources for the given display id. + * @param displayId The display id + */ + void removePerDisplayInfo(int displayId) { + PerDisplayInfo info = mPerDisplayInfo.get(displayId); + if (info == null) return; + info.cleanup(); + mPerDisplayInfo.remove(displayId); } public static class Info { @@ -493,6 +606,13 @@ public class DisplayController implements ComponentCallbacks, return navigationMode == NavigationMode.NO_BUTTON && !isTransientTaskbar(); } + /** + * Returns whether the taskbar is in desktop mode. + */ + public boolean isInDesktopMode() { + return mIsInDesktopMode; + } + /** * Returns {@code true} if the bounds represent a tablet. */ @@ -575,6 +695,7 @@ public class DisplayController implements ComponentCallbacks, appendFlag(result, change, CHANGE_NAVIGATION_MODE, "CHANGE_NAVIGATION_MODE"); appendFlag(result, change, CHANGE_TASKBAR_PINNING, "CHANGE_TASKBAR_VARIANT"); appendFlag(result, change, CHANGE_DESKTOP_MODE, "CHANGE_DESKTOP_MODE"); + appendFlag(result, change, CHANGE_SHOW_LOCKED_TASKBAR, "CHANGE_SHOW_LOCKED_TASKBAR"); return result.toString(); } @@ -582,20 +703,29 @@ public class DisplayController implements ComponentCallbacks, * Dumps the current state information */ public void dump(PrintWriter pw) { - Info info = mInfo; - pw.println("DisplayController.Info:"); - pw.println(" normalizedDisplayInfo=" + info.normalizedDisplayInfo); - pw.println(" rotation=" + info.rotation); - pw.println(" fontScale=" + info.fontScale); - pw.println(" densityDpi=" + info.densityDpi); - pw.println(" navigationMode=" + info.getNavigationMode().name()); - pw.println(" isTaskbarPinned=" + info.mIsTaskbarPinned); - pw.println(" isTaskbarPinnedInDesktopMode=" + info.mIsTaskbarPinnedInDesktopMode); - pw.println(" isInDesktopMode=" + info.mIsInDesktopMode); - pw.println(" currentSize=" + info.currentSize); - info.mPerDisplayBounds.forEach((key, value) -> pw.println( - " perDisplayBounds - " + key + ": " + value)); - pw.println(" isTransientTaskbar=" + info.isTransientTaskbar()); + int count = mPerDisplayInfo.size(); + for (int i = 0; i < count; ++i) { + int displayId = mPerDisplayInfo.keyAt(i); + Info info = getInfoForDisplay(displayId); + if (info == null) { + continue; + } + pw.println(String.format(Locale.ENGLISH, "DisplayController.Info (displayId=%d):", + displayId)); + pw.println(" normalizedDisplayInfo=" + info.normalizedDisplayInfo); + pw.println(" rotation=" + info.rotation); + pw.println(" fontScale=" + info.fontScale); + pw.println(" densityDpi=" + info.densityDpi); + pw.println(" navigationMode=" + info.getNavigationMode().name()); + pw.println(" isTaskbarPinned=" + info.mIsTaskbarPinned); + pw.println(" isTaskbarPinnedInDesktopMode=" + info.mIsTaskbarPinnedInDesktopMode); + pw.println(" isInDesktopMode=" + info.mIsInDesktopMode); + pw.println(" showLockedTaskbarOnHome=" + info.showLockedTaskbarOnHome()); + pw.println(" currentSize=" + info.currentSize); + info.mPerDisplayBounds.forEach((key, value) -> pw.println( + " perDisplayBounds - " + key + ": " + value)); + pw.println(" isTransientTaskbar=" + info.isTransientTaskbar()); + } } /** @@ -623,4 +753,47 @@ public class DisplayController implements ComponentCallbacks, } } + private class PerDisplayInfo implements ComponentCallbacks { + final int mDisplayId; + final CopyOnWriteArrayList mListeners = + new CopyOnWriteArrayList<>(); + final Context mWindowContext; + Info mInfo; + + PerDisplayInfo(int displayId, Context windowContext, Info info) { + this.mDisplayId = displayId; + this.mWindowContext = windowContext; + this.mInfo = info; + windowContext.registerComponentCallbacks(this); + } + + void addListener(DisplayInfoChangeListener listener) { + mListeners.add(listener); + } + + void removeListener(DisplayInfoChangeListener listener) { + mListeners.remove(listener); + } + + void notifyListeners(Info info, int flags) { + int count = mListeners.size(); + for (int i = 0; i < count; ++i) { + mListeners.get(i).onDisplayInfoChanged(mWindowContext, info, flags); + } + } + + @Override + public void onConfigurationChanged(@NonNull Configuration newConfig) { + DisplayController.this.onConfigurationChanged(newConfig, mDisplayId); + } + + @Override + public void onLowMemory() {} + + void cleanup() { + mWindowContext.unregisterComponentCallbacks(this); + mListeners.clear(); + } + } + } diff --git a/src/com/android/launcher3/util/Executors.java b/src/com/android/launcher3/util/Executors.java index c622b71108..296fc8ad27 100644 --- a/src/com/android/launcher3/util/Executors.java +++ b/src/com/android/launcher3/util/Executors.java @@ -16,8 +16,8 @@ package com.android.launcher3.util; import static android.os.Process.THREAD_PRIORITY_BACKGROUND; +import static android.os.Process.THREAD_PRIORITY_FOREGROUND; -import android.os.HandlerThread; import android.os.Looper; import android.os.Process; @@ -51,21 +51,20 @@ public class Executors { /** * An {@link LooperExecutor} to be used with async task where order is important. */ - public static final LooperExecutor ORDERED_BG_EXECUTOR = new LooperExecutor( - createAndStartNewLooper("BackgroundExecutor", THREAD_PRIORITY_BACKGROUND)); + public static final LooperExecutor ORDERED_BG_EXECUTOR = + new LooperExecutor("BackgroundExecutor", THREAD_PRIORITY_BACKGROUND); /** * Returns the executor for running tasks on the main thread. */ public static final LooperExecutor MAIN_EXECUTOR = - new LooperExecutor(Looper.getMainLooper()); + new LooperExecutor(Looper.getMainLooper(), THREAD_PRIORITY_FOREGROUND); /** * A background executor for using time sensitive actions where user is waiting for response. */ public static final LooperExecutor UI_HELPER_EXECUTOR = - new LooperExecutor( - createAndStartNewLooper("UiThreadHelper", Process.THREAD_PRIORITY_FOREGROUND)); + new LooperExecutor("UiThreadHelper", Process.THREAD_PRIORITY_FOREGROUND); /** A background executor to preinflate views. */ @@ -74,27 +73,10 @@ public class Executors { new SimpleThreadFactory( "preinflate-allapps-icons", THREAD_PRIORITY_BACKGROUND)); - /** - * Utility method to get a started handler thread statically - */ - public static Looper createAndStartNewLooper(String name) { - return createAndStartNewLooper(name, Process.THREAD_PRIORITY_DEFAULT); - } - - /** - * Utility method to get a started handler thread statically with the provided priority - */ - public static Looper createAndStartNewLooper(String name, int priority) { - HandlerThread thread = new HandlerThread(name, priority); - thread.start(); - return thread.getLooper(); - } - /** * Executor used for running Launcher model related tasks (eg loading icons or updated db) */ - public static final LooperExecutor MODEL_EXECUTOR = - new LooperExecutor(createAndStartNewLooper("launcher-loader")); + public static final LooperExecutor MODEL_EXECUTOR = new LooperExecutor("launcher-loader"); /** * Returns and caches a single thread executor for a given package. @@ -102,9 +84,7 @@ public class Executors { * @param packageName Package associated with the executor. */ public static LooperExecutor getPackageExecutor(String packageName) { - return PACKAGE_EXECUTORS.computeIfAbsent( - packageName, p -> new LooperExecutor( - createAndStartNewLooper(p, Process.THREAD_PRIORITY_DEFAULT))); + return PACKAGE_EXECUTORS.computeIfAbsent(packageName, LooperExecutor::new); } /** diff --git a/quickstep/src/com/android/quickstep/recents/usecase/GetThumbnailUseCase.kt b/src/com/android/launcher3/util/KFloatProperty.kt similarity index 53% rename from quickstep/src/com/android/quickstep/recents/usecase/GetThumbnailUseCase.kt rename to src/com/android/launcher3/util/KFloatProperty.kt index b9e9e026bc..55792415f7 100644 --- a/quickstep/src/com/android/quickstep/recents/usecase/GetThumbnailUseCase.kt +++ b/src/com/android/launcher3/util/KFloatProperty.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 The Android Open Source Project + * 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. @@ -14,13 +14,17 @@ * limitations under the License. */ -package com.android.quickstep.recents.usecase +package com.android.launcher3.util -import android.graphics.Bitmap -import com.android.quickstep.recents.data.RecentTasksRepository +import android.util.FloatProperty +import kotlin.reflect.KMutableProperty1 -/** Use case for retrieving thumbnail. */ -class GetThumbnailUseCase(private val taskRepository: RecentTasksRepository) { - /** Returns the latest thumbnail associated with [taskId] if loaded, or null otherwise */ - fun run(taskId: Int): Bitmap? = taskRepository.getCurrentThumbnailById(taskId)?.thumbnail +/** Maps any Kotlin mutable property (var) to [FloatProperty]. */ +class KFloatProperty(private val kProperty: KMutableProperty1) : + FloatProperty(kProperty.name) { + override fun get(target: T) = kProperty.get(target) + + override fun setValue(target: T, value: Float) { + kProperty.set(target, value) + } } diff --git a/src/com/android/launcher3/util/LauncherBindableItemsContainer.java b/src/com/android/launcher3/util/LauncherBindableItemsContainer.java deleted file mode 100644 index 20e3eafcfb..0000000000 --- a/src/com/android/launcher3/util/LauncherBindableItemsContainer.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2021 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.util; - -import android.view.View; - -import com.android.launcher3.BubbleTextView; -import com.android.launcher3.apppairs.AppPairIcon; -import com.android.launcher3.folder.Folder; -import com.android.launcher3.folder.FolderIcon; -import com.android.launcher3.model.data.AppPairInfo; -import com.android.launcher3.model.data.FolderInfo; -import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.views.ActivityContext; -import com.android.launcher3.widget.PendingAppWidgetHostView; - -import java.util.Set; - -/** - * Interface representing a container which can bind Launcher items with some utility methods - */ -public interface LauncherBindableItemsContainer { - - /** - * Called to update workspace items as a result of - * {@link com.android.launcher3.model.BgDataModel.Callbacks#bindItemsUpdated(Set)} - */ - default void updateContainerItems(Set updates, ActivityContext context) { - ItemOperator op = (info, v) -> { - if (v instanceof BubbleTextView shortcut - && info instanceof WorkspaceItemInfo wii - && updates.contains(info)) { - shortcut.applyFromWorkspaceItem(wii); - } else if (info instanceof FolderInfo && v instanceof FolderIcon folderIcon) { - folderIcon.updatePreviewItems(updates::contains); - } else if (info instanceof AppPairInfo && v instanceof AppPairIcon appPairIcon) { - appPairIcon.maybeRedrawForWorkspaceUpdate(updates::contains); - } else if (v instanceof PendingAppWidgetHostView pendingView - && updates.contains(info)) { - pendingView.applyState(); - pendingView.postProviderAvailabilityCheck(); - } - - // Iterate all items - return false; - }; - - mapOverItems(op); - Folder openFolder = Folder.getOpen(context); - if (openFolder != null) { - openFolder.iterateOverItems(op); - } - } - - /** - * Map the operator over the shortcuts and widgets. - * - * @param op the operator to map over the shortcuts - */ - void mapOverItems(ItemOperator op); - - interface ItemOperator { - /** - * Process the next itemInfo, possibly with side-effect on the next item. - * - * @param info info for the shortcut - * @param view view for the shortcut - * @return true if done, false to continue the map - */ - boolean evaluate(ItemInfo info, View view); - } -} diff --git a/src/com/android/launcher3/util/LauncherBindableItemsContainer.kt b/src/com/android/launcher3/util/LauncherBindableItemsContainer.kt new file mode 100644 index 0000000000..16617962bd --- /dev/null +++ b/src/com/android/launcher3/util/LauncherBindableItemsContainer.kt @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2021 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.util + +import android.view.View +import com.android.launcher3.BubbleTextView +import com.android.launcher3.apppairs.AppPairIcon +import com.android.launcher3.folder.Folder +import com.android.launcher3.folder.FolderIcon +import com.android.launcher3.model.data.AppPairInfo +import com.android.launcher3.model.data.FolderInfo +import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo +import com.android.launcher3.views.ActivityContext +import com.android.launcher3.widget.PendingAppWidgetHostView + +/** Interface representing a container which can bind Launcher items with some utility methods */ +interface LauncherBindableItemsContainer { + + /** + * Called to update workspace items as a result of {@link + * com.android.launcher3.model.BgDataModel.Callbacks#bindItemsUpdated(Set)} + */ + fun updateContainerItems(updates: Set, context: ActivityContext) { + val op = ItemOperator { info, v -> + when { + v is BubbleTextView && info is WorkspaceItemInfo && updates.contains(info) -> + v.applyFromWorkspaceItem(info) + v is FolderIcon && info is FolderInfo -> v.updatePreviewItems(updates::contains) + v is AppPairIcon && info is AppPairInfo -> + v.maybeRedrawForWorkspaceUpdate(updates::contains) + v is PendingAppWidgetHostView && updates.contains(info) -> { + v.applyState() + v.postProviderAvailabilityCheck() + } + } + + // Iterate all items + false + } + + mapOverItems(op) + Folder.getOpen(context)?.iterateOverItems(op) + } + + /** Map the [op] over the shortcuts and widgets. */ + fun mapOverItems(op: ItemOperator) + + fun interface ItemOperator { + + /** + * Process the next itemInfo, possibly with side-effect on the next item. + * + * @param info info for the shortcut + * @param view view for the shortcut + * @return true if done, false to continue the map + */ + fun evaluate(info: ItemInfo?, view: View): Boolean + } +} diff --git a/src/com/android/launcher3/util/LooperExecutor.java b/src/com/android/launcher3/util/LooperExecutor.java deleted file mode 100644 index 3a8a13c8bb..0000000000 --- a/src/com/android/launcher3/util/LooperExecutor.java +++ /dev/null @@ -1,118 +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.util; - -import android.os.Handler; -import android.os.HandlerThread; -import android.os.Looper; -import android.os.Process; - -import java.util.List; -import java.util.concurrent.AbstractExecutorService; -import java.util.concurrent.TimeUnit; - -/** - * Extension of {@link AbstractExecutorService} which executed on a provided looper. - */ -public class LooperExecutor extends AbstractExecutorService { - - private final Handler mHandler; - - public LooperExecutor(Looper looper) { - mHandler = new Handler(looper); - } - - public Handler getHandler() { - return mHandler; - } - - @Override - public void execute(Runnable runnable) { - if (getHandler().getLooper() == Looper.myLooper()) { - runnable.run(); - } else { - getHandler().post(runnable); - } - } - - /** - * Same as execute, but never runs the action inline. - */ - public void post(Runnable runnable) { - getHandler().post(runnable); - } - - /** - * Not supported and throws an exception when used. - */ - @Override - @Deprecated - public void shutdown() { - throw new UnsupportedOperationException(); - } - - /** - * Not supported and throws an exception when used. - */ - @Override - @Deprecated - public List shutdownNow() { - throw new UnsupportedOperationException(); - } - - @Override - public boolean isShutdown() { - return false; - } - - @Override - public boolean isTerminated() { - return false; - } - - /** - * Not supported and throws an exception when used. - */ - @Override - @Deprecated - public boolean awaitTermination(long l, TimeUnit timeUnit) { - throw new UnsupportedOperationException(); - } - - /** - * Returns the thread for this executor - */ - public Thread getThread() { - return getHandler().getLooper().getThread(); - } - - /** - * Returns the looper for this executor - */ - public Looper getLooper() { - return getHandler().getLooper(); - } - - /** - * Set the priority of a thread, based on Linux priorities. - * @param priority Linux priority level, from -20 for highest scheduling priority - * to 19 for lowest scheduling priority. - * @see Process#setThreadPriority(int, int) - */ - public void setThreadPriority(int priority) { - Process.setThreadPriority(((HandlerThread) getThread()).getThreadId(), priority); - } -} diff --git a/src/com/android/launcher3/util/LooperExecutor.kt b/src/com/android/launcher3/util/LooperExecutor.kt new file mode 100644 index 0000000000..6ff528d264 --- /dev/null +++ b/src/com/android/launcher3/util/LooperExecutor.kt @@ -0,0 +1,118 @@ +/* + * 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.util + +import android.os.Handler +import android.os.HandlerThread +import android.os.Looper +import android.os.Process +import android.os.Process.THREAD_PRIORITY_FOREGROUND +import androidx.annotation.IntDef +import java.util.concurrent.AbstractExecutorService +import java.util.concurrent.TimeUnit +import kotlin.annotation.AnnotationRetention.SOURCE + +/** Extension of [AbstractExecutorService] which executed on a provided looper. */ +class LooperExecutor(looper: Looper, private val defaultPriority: Int) : AbstractExecutorService() { + val handler: Handler = Handler(looper) + + @JvmOverloads + constructor( + name: String, + defaultPriority: Int = Process.THREAD_PRIORITY_DEFAULT, + ) : this(createAndStartNewLooper(name, defaultPriority), defaultPriority) + + /** Returns the thread for this executor */ + val thread: Thread + get() = handler.looper.thread + + /** Returns the looper for this executor */ + val looper: Looper + get() = handler.looper + + @ElevationCaller private var elevationFlags: Int = 0 + + override fun execute(runnable: Runnable) { + if (handler.looper == Looper.myLooper()) { + runnable.run() + } else { + handler.post(runnable) + } + } + + /** Same as execute, but never runs the action inline. */ + fun post(runnable: Runnable) { + handler.post(runnable) + } + + @Deprecated("Not supported and throws an exception when used") + override fun shutdown() { + throw UnsupportedOperationException() + } + + @Deprecated("Not supported and throws an exception when used.") + override fun shutdownNow(): List { + throw UnsupportedOperationException() + } + + override fun isShutdown() = false + + override fun isTerminated() = false + + @Deprecated("Not supported and throws an exception when used.") + override fun awaitTermination(l: Long, timeUnit: TimeUnit): Boolean { + throw UnsupportedOperationException() + } + + /** + * Increases the priority of the thread for the [caller]. Multiple calls with same caller are + * ignored. The priority is reset once wall callers have restored priority + */ + fun elevatePriority(@ElevationCaller caller: Int) { + val wasElevated = elevationFlags != 0 + elevationFlags = elevationFlags.or(caller) + if (elevationFlags != 0 && !wasElevated) + Process.setThreadPriority( + (thread as HandlerThread).threadId, + THREAD_PRIORITY_FOREGROUND, + ) + } + + /** Restores to default priority if it was previously elevated */ + fun restorePriority(@ElevationCaller caller: Int) { + val wasElevated = elevationFlags != 0 + elevationFlags = elevationFlags.and(caller.inv()) + if (elevationFlags == 0 && wasElevated) + Process.setThreadPriority((thread as HandlerThread).threadId, defaultPriority) + } + + @Retention(SOURCE) + @IntDef(value = [CALLER_LOADER_TASK, CALLER_ICON_CACHE], flag = true) + annotation class ElevationCaller + + companion object { + /** Utility method to get a started handler thread statically with the provided priority */ + @JvmOverloads + @JvmStatic + fun createAndStartNewLooper( + name: String, + priority: Int = Process.THREAD_PRIORITY_DEFAULT, + ): Looper = HandlerThread(name, priority).apply { start() }.looper + + const val CALLER_LOADER_TASK = 1 shl 0 + const val CALLER_ICON_CACHE = 1 shl 1 + } +} diff --git a/src/com/android/launcher3/util/MainThreadInitializedObject.java b/src/com/android/launcher3/util/MainThreadInitializedObject.java deleted file mode 100644 index 356a5517e2..0000000000 --- a/src/com/android/launcher3/util/MainThreadInitializedObject.java +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright (C) 2018 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.util; - -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; - -import android.content.Context; -import android.os.Looper; -import android.util.Log; - -import androidx.annotation.UiThread; -import androidx.annotation.VisibleForTesting; - -import com.android.launcher3.LauncherApplication; -import com.android.launcher3.util.ResourceBasedOverride.Overrides; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ExecutionException; -import java.util.function.Consumer; - -/** - * Utility class for defining singletons which are initiated on main thread. - * - * TODO(b/361850561): Do not delete MainThreadInitializedObject until we find a way to - * unregister and understand how singleton objects are destroyed in dagger graph. - */ -public class MainThreadInitializedObject { - - private final ObjectProvider mProvider; - private T mValue; - - public MainThreadInitializedObject(ObjectProvider provider) { - mProvider = provider; - } - - public T get(Context context) { - Context app = context.getApplicationContext(); - if (app instanceof ObjectSandbox sc) { - return sc.getObject(this); - } - - if (mValue == null) { - if (Looper.myLooper() == Looper.getMainLooper()) { - mValue = TraceHelper.allowIpcs("main.thread.object", () -> mProvider.get(app)); - } else { - try { - return MAIN_EXECUTOR.submit(() -> get(context)).get(); - } catch (InterruptedException|ExecutionException e) { - throw new RuntimeException(e); - } - } - } - return mValue; - } - - /** - * Executes the callback is the value is already created - * @return true if the callback was executed, false otherwise - */ - public boolean executeIfCreated(Consumer callback) { - T v = mValue; - if (v != null) { - callback.accept(v); - return true; - } else { - return false; - } - } - - @VisibleForTesting - public void initializeForTesting(T value) { - mValue = value; - } - - /** - * Initializes a provider based on resource overrides - */ - public static MainThreadInitializedObject - forOverride(Class clazz, int resourceId) { - return new MainThreadInitializedObject<>(c -> Overrides.getObject(clazz, c, resourceId)); - } - - public interface ObjectProvider { - - T get(Context context); - } - - /** Sandbox for isolating {@link MainThreadInitializedObject} instances from Launcher. */ - public interface ObjectSandbox { - - /** - * Find a cached object from mObjectMap if we have already created one. If not, generate - * an object using the provider. - */ - T getObject(MainThreadInitializedObject object); - - - /** - * Put a value into cache, can be used to put mocked MainThreadInitializedObject - * instances. - */ - void putObject(MainThreadInitializedObject object, T value); - - /** - * Returns whether this sandbox should cleanup all objects when its destroyed or leave it - * to the GC. - * These objects can have listeners attached to the system server and mey not be able to get - * GCed themselves when running on a device. - * Some environments like Robolectric tear down the whole system at the end of the test, - * so manual cleanup may not be required. - */ - default boolean shouldCleanUpOnDestroy() { - return true; - } - - @UiThread - default T createObject(MainThreadInitializedObject object) { - return object.mProvider.get((Context) this); - } - } - - /** - * Abstract Context which allows custom implementations for - * {@link MainThreadInitializedObject} providers - */ - public static class SandboxContext extends LauncherApplication implements ObjectSandbox { - - private static final String TAG = "SandboxContext"; - - private final Map mObjectMap = new HashMap<>(); - private final ArrayList mOrderedObjects = new ArrayList<>(); - - private final Object mDestroyLock = new Object(); - private boolean mDestroyed = false; - - public SandboxContext(Context base) { - attachBaseContext(base); - } - - @Override - public Context getApplicationContext() { - return this; - } - - @Override - public boolean shouldCleanUpOnDestroy() { - return (getBaseContext().getApplicationContext() instanceof ObjectSandbox os) - ? os.shouldCleanUpOnDestroy() : true; - } - - public void onDestroy() { - if (shouldCleanUpOnDestroy()) { - cleanUpObjects(); - } - } - - protected void cleanUpObjects() { - getAppComponent().getDaggerSingletonTracker().close(); - synchronized (mDestroyLock) { - // Destroy in reverse order - for (int i = mOrderedObjects.size() - 1; i >= 0; i--) { - mOrderedObjects.get(i).close(); - } - mDestroyed = true; - } - } - - @Override - public T getObject(MainThreadInitializedObject object) { - synchronized (mDestroyLock) { - if (mDestroyed) { - Log.e(TAG, "Static object access with a destroyed context"); - } - T t = (T) mObjectMap.get(object); - if (t != null) { - return t; - } - if (Looper.myLooper() == Looper.getMainLooper()) { - t = createObject(object); - mObjectMap.put(object, t); - mOrderedObjects.add(t); - return t; - } - } - - try { - return MAIN_EXECUTOR.submit(() -> getObject(object)).get(); - } catch (InterruptedException | ExecutionException e) { - throw new RuntimeException(e); - } - } - - @Override - public void putObject( - MainThreadInitializedObject object, T value) { - mObjectMap.put(object, value); - } - } -} diff --git a/src/com/android/launcher3/util/MultiPropertyDelegate.kt b/src/com/android/launcher3/util/MultiPropertyDelegate.kt new file mode 100644 index 0000000000..837a586045 --- /dev/null +++ b/src/com/android/launcher3/util/MultiPropertyDelegate.kt @@ -0,0 +1,30 @@ +/* + * 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.util + +import kotlin.reflect.KProperty + +/** Delegate Kotlin mutable property (var) to a property in [MultiPropertyFactory] */ +class MultiPropertyDelegate(private val property: MultiPropertyFactory<*>.MultiProperty) { + constructor(factory: MultiPropertyFactory<*>, enum: Enum<*>) : this(factory[enum.ordinal]) + + operator fun getValue(thisRef: Any?, kProperty: KProperty<*>): Float = property.value + + operator fun setValue(thisRef: Any?, kProperty: KProperty<*>, value: Float) { + property.value = value + } +} diff --git a/src/com/android/launcher3/util/SandboxContext.kt b/src/com/android/launcher3/util/SandboxContext.kt new file mode 100644 index 0000000000..c6224e2327 --- /dev/null +++ b/src/com/android/launcher3/util/SandboxContext.kt @@ -0,0 +1,56 @@ +/* + * 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.util + +import android.content.Context +import com.android.launcher3.LauncherApplication + +/** Abstract Context which allows custom implementations for dagger components. */ +open class SandboxContext(base: Context?) : LauncherApplication() { + init { + base?.let { attachBaseContext(it) } + } + + override fun getApplicationContext(): Context { + return this + } + + /** + * Returns whether this sandbox should cleanup all objects when its destroyed or leave it to the + * GC. These objects can have listeners attached to the system server and mey not be able to get + * GCed themselves when running on a device. Some environments like Robolectric tear down the + * whole system at the end of the test, so manual cleanup may not be required. + */ + open fun shouldCleanUpOnDestroy(): Boolean { + return (getBaseContext().getApplicationContext() as? SandboxContext) + ?.shouldCleanUpOnDestroy() ?: true + } + + fun onDestroy() { + if (shouldCleanUpOnDestroy()) { + cleanUpObjects() + } + } + + open protected fun cleanUpObjects() { + appComponent.daggerSingletonTracker.close() + } + + companion object { + private const val TAG = "SandboxContext" + } +} diff --git a/src/com/android/launcher3/util/SplitConfigurationOptions.java b/src/com/android/launcher3/util/SplitConfigurationOptions.java index 44a7c6fa74..e1ef77a00a 100644 --- a/src/com/android/launcher3/util/SplitConfigurationOptions.java +++ b/src/com/android/launcher3/util/SplitConfigurationOptions.java @@ -127,10 +127,10 @@ public final class SplitConfigurationOptions { /** This rect represents the actual gap between the two apps */ public final Rect visualDividerBounds; // This class is orientation-agnostic, so we compute both for later use - public final float topTaskPercent; - public final float leftTaskPercent; - public final float dividerWidthPercent; - public final float dividerHeightPercent; + private final float topTaskPercent; + private final float leftTaskPercent; + private final float dividerWidthPercent; + private final float dividerHeightPercent; public final int snapPosition; /** @@ -190,6 +190,39 @@ public final class SplitConfigurationOptions { dividerHeightPercent = visualDividerBounds.height() / totalHeight; } + /** + * Returns the percentage size of the left/top task (compared to the full width/height of + * the split pair). E.g. if the left task is 4 units wide, the divider is 2 units, and the + * right task is 4 units, this method will return 0.4f. + */ + public float getLeftTopTaskPercent() { + // topTaskPercent and leftTaskPercent are defined at creation time, and are not updated + // on device rotate, so we have to check appsStackedVertically to return the right + // creation-time measurements. + return appsStackedVertically ? topTaskPercent : leftTaskPercent; + } + + /** + * Returns the percentage size of the divider's thickness (compared to the full width/height + * of the split pair). E.g. if the left task is 4 units wide, the divider is 2 units, and + * the right task is 4 units, this method will return 0.2f. + */ + public float getDividerPercent() { + // dividerHeightPercent and dividerWidthPercent are defined at creation time, and are + // not updated on device rotate, so we have to check appsStackedVertically to return + // the right creation-time measurements. + return appsStackedVertically ? dividerHeightPercent : dividerWidthPercent; + } + + /** + * Returns the percentage size of the right/bottom task (compared to the full width/height + * of the split pair). E.g. if the left task is 4 units wide, the divider is 2 units, and + * the right task is 4 units, this method will return 0.4f. + */ + public float getRightBottomTaskPercent() { + return 1 - (getLeftTopTaskPercent() + getDividerPercent()); + } + @Override public String toString() { return "LeftTop: " + leftTopBounds + ", taskId: " + leftTopTaskId + "\n" diff --git a/src/com/android/launcher3/util/window/WindowManagerProxy.java b/src/com/android/launcher3/util/window/WindowManagerProxy.java index 647d170340..11f0bc21b9 100644 --- a/src/com/android/launcher3/util/window/WindowManagerProxy.java +++ b/src/com/android/launcher3/util/window/WindowManagerProxy.java @@ -509,7 +509,17 @@ public class WindowManagerProxy { * @param isInDesktopModeAndNotInOverview True if a desktop is currently active on the given * display, and Overview is currently inactive. */ - void onIsInDesktopModeChanged(int displayId, boolean isInDesktopModeAndNotInOverview); + default void onIsInDesktopModeChanged(int displayId, + boolean isInDesktopModeAndNotInOverview) { + } + + /** + * Called whenever the conditions that allow the creation of desks change. + * + * @param canCreateDesks whether it is possible to create new desks. + */ + default void onCanCreateDesksChanged(boolean canCreateDesks) { + } } } diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java index 81968fce58..30af58616c 100644 --- a/src/com/android/launcher3/views/ActivityContext.java +++ b/src/com/android/launcher3/views/ActivityContext.java @@ -43,7 +43,6 @@ import android.os.IBinder; import android.os.Process; import android.os.UserHandle; import android.util.Log; -import android.view.ContextThemeWrapper; import android.view.Display; import android.view.LayoutInflater; import android.view.View; @@ -81,6 +80,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.util.ActivityOptionsWrapper; import com.android.launcher3.util.ApplicationInfoWrapper; +import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.SplitConfigurationOptions; @@ -102,10 +102,6 @@ public interface ActivityContext { return false; } - default DotInfo getDotInfoForItem(ItemInfo info) { - return null; - } - default AccessibilityDelegate getAccessibilityDelegate() { return null; } @@ -194,6 +190,14 @@ public interface ActivityContext { return null; } + /** + * Returns the primary content of this context + */ + @NonNull + default LauncherBindableItemsContainer getContent() { + return op -> { }; + } + /** * The all apps container, if it exists in this context. */ @@ -271,11 +275,6 @@ public interface ActivityContext { */ default void applyOverwritesToLogItem(LauncherAtom.ItemInfo.Builder itemInfoBuilder) { } - /** Returns {@code true} if items are currently being bound within this context. */ - default boolean isBindingItems() { - return false; - } - default View.OnClickListener getItemOnClickListener() { return v -> { // No op. @@ -287,9 +286,13 @@ public interface ActivityContext { return v -> false; } - @Nullable + @NonNull default PopupDataProvider getPopupDataProvider() { - return null; + return new PopupDataProvider(this); + } + + default DotInfo getDotInfoForItem(ItemInfo info) { + return getPopupDataProvider().getDotInfoForItem(info); } /** @@ -552,21 +555,10 @@ public interface ActivityContext { static T lookupContextNoThrow(Context context) { if (context instanceof ActivityContext) { return (T) context; - } else if (context instanceof ActivityContextDelegate acd) { - return (T) acd.mDelegate; - } else if (context instanceof ContextWrapper) { - return lookupContextNoThrow(((ContextWrapper) context).getBaseContext()); + } else if (context instanceof ContextWrapper cw) { + return lookupContextNoThrow(cw.getBaseContext()); } else { return null; } } - - class ActivityContextDelegate extends ContextThemeWrapper { - public final ActivityContext mDelegate; - - public ActivityContextDelegate(Context base, int themeResId, ActivityContext delegate) { - super(base, themeResId); - mDelegate = delegate; - } - } } diff --git a/src/com/android/launcher3/views/ClipIconView.java b/src/com/android/launcher3/views/ClipIconView.java index f90a3e4dd1..a295d6b52e 100644 --- a/src/com/android/launcher3/views/ClipIconView.java +++ b/src/com/android/launcher3/views/ClipIconView.java @@ -20,6 +20,7 @@ import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; import static com.android.launcher3.Utilities.boundToRange; import static com.android.launcher3.Utilities.mapToRange; import static com.android.launcher3.anim.AnimatorListeners.forEndCallback; +import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION; import static java.lang.Math.max; @@ -44,10 +45,11 @@ import androidx.annotation.Nullable; import androidx.core.util.Consumer; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Flags; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.dragndrop.FolderAdaptiveIcon; -import com.android.launcher3.graphics.IconShape; +import com.android.launcher3.graphics.ThemeManager; /** * A view used to draw both layers of an {@link AdaptiveIconDrawable}. @@ -67,6 +69,7 @@ public class ClipIconView extends View implements ClipPathView { private boolean mIsAdaptiveIcon = false; private ValueAnimator mRevealAnimator; + private float mIconScale; private final Rect mStartRevealRect = new Rect(); private final Rect mEndRevealRect = new Rect(); @@ -172,9 +175,12 @@ public class ClipIconView extends View implements ClipPathView { mTaskCornerRadius = cornerRadius / scale; if (mIsAdaptiveIcon) { - if (!isOpening && progress >= shapeProgressStart) { + final ThemeManager themeManager = ThemeManager.INSTANCE.get(getContext()); + mIconScale = themeManager.getIconState().getIconScale(); + if ((!isOpening || Flags.enableLauncherIconShapes()) + && progress >= shapeProgressStart) { if (mRevealAnimator == null) { - mRevealAnimator = IconShape.INSTANCE.get(getContext()).getShape() + mRevealAnimator = themeManager.getIconShape() .createRevealAnimator(this, mStartRevealRect, mOutline, mTaskCornerRadius, !isOpening); mRevealAnimator.addListener(forEndCallback(() -> mRevealAnimator = null)); @@ -258,8 +264,7 @@ public class ClipIconView extends View implements ClipPathView { mStartRevealRect.set(0, 0, originalWidth, originalHeight); if (!isFolderIcon) { - Utilities.scaleRectAboutCenter(mStartRevealRect, - IconShape.INSTANCE.get(getContext()).getNormalizationScale()); + Utilities.scaleRectAboutCenter(mStartRevealRect, ICON_VISIBLE_AREA_FACTOR); } if (dp.isLandscape) { @@ -309,17 +314,24 @@ public class ClipIconView extends View implements ClipPathView { @Override public void draw(Canvas canvas) { - int count = canvas.save(); + int count1 = canvas.save(); if (mClipPath != null) { canvas.clipPath(mClipPath); } - super.draw(canvas); + int count2 = canvas.save(); + float iconCenterX = + (mFinalDrawableBounds.right - mFinalDrawableBounds.left) / 2f * mIconScale; + float iconCenterY = + (mFinalDrawableBounds.bottom - mFinalDrawableBounds.top) / 2f * mIconScale; + canvas.scale(mIconScale, mIconScale, iconCenterX, iconCenterY); if (mBackground != null) { mBackground.draw(canvas); } if (mForeground != null) { mForeground.draw(canvas); } + canvas.restoreToCount(count2); + super.draw(canvas); if (mTaskViewArtist != null) { canvas.saveLayerAlpha( 0, @@ -333,7 +345,7 @@ public class ClipIconView extends View implements ClipPathView { canvas.scale(drawScale, drawScale); mTaskViewArtist.taskViewDrawCallback.accept(canvas); } - canvas.restoreToCount(count); + canvas.restoreToCount(count1); } void recycle() { diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java index 22857b1f40..5b3abc383a 100644 --- a/src/com/android/launcher3/views/FloatingIconView.java +++ b/src/com/android/launcher3/views/FloatingIconView.java @@ -55,7 +55,7 @@ import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.graphics.PreloadIconDrawable; import com.android.launcher3.icons.FastBitmapDrawable; -import com.android.launcher3.icons.LauncherIcons; +import com.android.launcher3.icons.IconNormalizer; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.popup.SystemShortcut; @@ -463,10 +463,7 @@ public class FloatingIconView extends FrameLayout implements Rect bounds = new Rect(0, 0, (int) position.width() + blurSizeOutline, (int) position.height() + blurSizeOutline); bounds.inset(blurSizeOutline / 2, blurSizeOutline / 2); - - try (LauncherIcons li = LauncherIcons.obtain(l)) { - Utilities.scaleRectAboutCenter(bounds, li.getNormalizer().getScale(drawable)); - } + Utilities.scaleRectAboutCenter(bounds, IconNormalizer.ICON_VISIBLE_AREA_FACTOR); bounds.inset( (int) (-bounds.width() * AdaptiveIconDrawable.getExtraInsetFraction()), diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java index b07d8076ec..7a44c6ac89 100644 --- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java @@ -79,7 +79,8 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView private Runnable mAutoAdvanceRunnable; private long mDeferUpdatesUntilMillis = 0; - RemoteViews mLastRemoteViews; + private RemoteViews mLastRemoteViews; + private boolean mReapplyOnResumeUpdates = false; private boolean mTrackingWidgetUpdate = false; @@ -138,11 +139,11 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView TRACE_METHOD_NAME + getAppWidgetInfo().provider, getAppWidgetId()); mTrackingWidgetUpdate = false; } - if (isDeferringUpdates()) { - mLastRemoteViews = remoteViews; + mLastRemoteViews = remoteViews; + mReapplyOnResumeUpdates = isDeferringUpdates(); + if (mReapplyOnResumeUpdates) { return; } - mLastRemoteViews = null; super.updateAppWidget(remoteViews); @@ -150,6 +151,18 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView checkIfAutoAdvance(); } + @Override + public void onViewAdded(View child) { + super.onViewAdded(child); + mReapplyOnResumeUpdates |= isDeferringUpdates(); + } + + @Override + public void onViewRemoved(View child) { + super.onViewRemoved(child); + mReapplyOnResumeUpdates |= isDeferringUpdates(); + } + private boolean checkScrollableRecursively(ViewGroup viewGroup) { if (viewGroup instanceof AdapterView) { return true; @@ -204,18 +217,16 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView * {@link #updateAppWidget} and apply any deferred updates. */ public void endDeferringUpdates() { - RemoteViews remoteViews; mDeferUpdatesUntilMillis = 0; - remoteViews = mLastRemoteViews; - - if (remoteViews != null) { - updateAppWidget(remoteViews); + if (mReapplyOnResumeUpdates) { + updateAppWidget(mLastRemoteViews); } } + @Override public boolean onInterceptTouchEvent(MotionEvent ev) { if (ev.getAction() == MotionEvent.ACTION_DOWN) { - BaseDragLayer dragLayer = mActivityContext.getDragLayer(); + BaseDragLayer dragLayer = mActivityContext.getDragLayer(); if (mIsScrollable) { dragLayer.requestDisallowInterceptTouchEvent(true); } @@ -225,6 +236,7 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView return mLongPressHelper.hasPerformedLongPress(); } + @Override public boolean onTouchEvent(MotionEvent ev) { mLongPressHelper.onTouchEvent(ev); // We want to keep receiving though events to be able to cancel long press on ACTION_UP diff --git a/src/com/android/launcher3/widget/picker/OWNERS b/src/com/android/launcher3/widget/picker/OWNERS index 6aabbfa119..991193f799 100644 --- a/src/com/android/launcher3/widget/picker/OWNERS +++ b/src/com/android/launcher3/widget/picker/OWNERS @@ -6,7 +6,6 @@ set noparent # # Widget Picker OWNERS -zakcohen@google.com shamalip@google.com wvk@google.com diff --git a/src/com/android/launcher3/widget/picker/WidgetRecommendationCategoryProvider.java b/src/com/android/launcher3/widget/picker/WidgetRecommendationCategoryProvider.java index f8dc6b0bb2..8f34fe3572 100644 --- a/src/com/android/launcher3/widget/picker/WidgetRecommendationCategoryProvider.java +++ b/src/com/android/launcher3/widget/picker/WidgetRecommendationCategoryProvider.java @@ -35,19 +35,7 @@ import com.android.launcher3.util.ResourceBasedOverride; * own implementation. Method {@code getWidgetRecommendationCategory} is called per widget to get * the category.

*/ -public class WidgetRecommendationCategoryProvider implements ResourceBasedOverride { - private static final String TAG = "WidgetRecommendationCategoryProvider"; - - /** - * Retrieve instance of this object that can be overridden in runtime based on the build - * variant of the application. - */ - public static WidgetRecommendationCategoryProvider newInstance(Context context) { - Preconditions.assertWorkerThread(); - return Overrides.getObject( - WidgetRecommendationCategoryProvider.class, context.getApplicationContext(), - R.string.widget_recommendation_category_provider_class); - } +public class WidgetRecommendationCategoryProvider { /** * Returns a {@link WidgetRecommendationCategory} for the provided widget item that can be used diff --git a/tests/Android.bp b/tests/Android.bp index 4bc654c7d0..fc08e86284 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -168,6 +168,7 @@ filegroup { "src/**/*Test.java", "src/**/*Test.kt", "src/**/RoboApiWrapper.kt", + "src/**/EventsRule.kt", "multivalentTests/src/**/*Test.java", "multivalentTests/src/**/*Test.kt", ], diff --git a/tests/Launcher3Tests.xml b/tests/Launcher3Tests.xml index 56dd6a44a0..da86357e97 100644 --- a/tests/Launcher3Tests.xml +++ b/tests/Launcher3Tests.xml @@ -62,6 +62,7 @@ diff --git a/tests/multivalentTests/shared/com/android/launcher3/testing/OWNERS b/tests/multivalentTests/shared/com/android/launcher3/testing/OWNERS new file mode 100644 index 0000000000..02e8ebcaba --- /dev/null +++ b/tests/multivalentTests/shared/com/android/launcher3/testing/OWNERS @@ -0,0 +1,4 @@ +vadimt@google.com +sunnygoyal@google.com +winsonc@google.com +hyunyoungs@google.com diff --git a/tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt b/tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt index 9d42e1ba3c..ad6afcf1ac 100644 --- a/tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt @@ -35,8 +35,8 @@ import com.android.launcher3.testing.shared.ResourceUtils import com.android.launcher3.util.AllModulesMinusWMProxy import com.android.launcher3.util.DisplayController import com.android.launcher3.util.FakePrefsModule -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext import com.android.launcher3.util.NavigationMode +import com.android.launcher3.util.SandboxContext import com.android.launcher3.util.WindowBounds import com.android.launcher3.util.rule.TestStabilityRule import com.android.launcher3.util.rule.setFlags @@ -294,6 +294,8 @@ abstract class AbstractDeviceProfileTest { gridName: String? = GRID_NAME.defaultValue, ) { setFlagsRule.setFlags(true, Flags.FLAG_ENABLE_TWOLINE_TOGGLE) + // TODO: re-enable as part of b/396211437 + setFlagsRule.setFlags(false, Flags.FLAG_ENABLE_LAUNCHER_ICON_SHAPES) val windowsBounds = perDisplayBoundsCache[displayInfo]!! val realBounds = windowsBounds[rotation] whenever(windowManagerProxy.getDisplayInfo(any())).thenReturn(displayInfo) @@ -362,7 +364,13 @@ abstract class AbstractDeviceProfileTest { context.assets.open("dumpTests/$fileName").bufferedReader().use(BufferedReader::readText) private fun writeToDevice(context: Context, fileName: String, content: String) { - File(context.getDir("dumpTests", Context.MODE_PRIVATE), fileName).writeText(content) + val dir = + File(context.filesDir, "dumpTests").also { + if (!it.exists()) { + it.mkdirs() + } + } + File(dir, fileName).writeText(content) } protected fun Float.dpToPx(): Float { diff --git a/tests/multivalentTests/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt b/tests/multivalentTests/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt index 060c28c8e2..f855c51f8e 100644 --- a/tests/multivalentTests/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt @@ -71,7 +71,7 @@ abstract class FakeInvariantDeviceProfileTest { inv, info, context.appComponent.wmProxy, - context.appComponent.iconShape, + context.appComponent.themeManager, windowBounds, SparseArray(), /*isMultiWindowMode=*/ false, diff --git a/tests/multivalentTests/src/com/android/launcher3/LauncherPrefsTest.kt b/tests/multivalentTests/src/com/android/launcher3/LauncherPrefsTest.kt index 4aeef2e671..da9cc8635d 100644 --- a/tests/multivalentTests/src/com/android/launcher3/LauncherPrefsTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/LauncherPrefsTest.kt @@ -24,12 +24,18 @@ import com.android.launcher3.LauncherPrefs.Companion.BOOT_AWARE_PREFS_KEY import com.google.common.truth.Truth.assertThat import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import org.junit.Assert.assertThrows import org.junit.Test import org.junit.runner.RunWith private val TEST_BOOLEAN_ITEM = LauncherPrefs.nonRestorableItem("1", false) private val TEST_STRING_ITEM = LauncherPrefs.nonRestorableItem("2", "( ͡❛ ͜ʖ ͡❛)") private val TEST_INT_ITEM = LauncherPrefs.nonRestorableItem("3", -1) +private val TEST_FLOAT_ITEM = LauncherPrefs.nonRestorableItem("4", -1f) +private val TEST_LONG_ITEM = LauncherPrefs.nonRestorableItem("5", -1L) +private val TEST_SET_ITEM = LauncherPrefs.nonRestorableItem("6", setOf()) +private val TEST_HASHSET_ITEM = LauncherPrefs.nonRestorableItem("7", hashSetOf()) + private val TEST_CONTEXTUAL_ITEM = ContextualItem("4", true, { true }, EncryptionType.ENCRYPTED, Boolean::class.java) @@ -143,6 +149,17 @@ class LauncherPrefsTest { } } + @Test + fun whenItemType_isInvalid_thenThrowException() { + val badItem = LauncherPrefs.nonRestorableItem("8", mapOf()) + with(launcherPrefs) { + assertThrows(IllegalArgumentException::class.java) { + putSync(badItem.to(badItem.defaultValue)) + } + assertThrows(IllegalArgumentException::class.java) { get(badItem) } + } + } + @Test fun put_storesListOfItemsInLauncherPrefs_successfully() { with(launcherPrefs) { @@ -150,9 +167,32 @@ class LauncherPrefsTest { TEST_STRING_ITEM.to(TEST_STRING_ITEM.defaultValue), TEST_INT_ITEM.to(TEST_INT_ITEM.defaultValue), TEST_BOOLEAN_ITEM.to(TEST_BOOLEAN_ITEM.defaultValue), + TEST_FLOAT_ITEM.to(TEST_FLOAT_ITEM.defaultValue), + TEST_LONG_ITEM.to(TEST_LONG_ITEM.defaultValue), + TEST_SET_ITEM.to(TEST_SET_ITEM.defaultValue), + TEST_HASHSET_ITEM.to(TEST_HASHSET_ITEM.defaultValue), + ) + assertThat( + has( + TEST_STRING_ITEM, + TEST_INT_ITEM, + TEST_BOOLEAN_ITEM, + TEST_FLOAT_ITEM, + TEST_LONG_ITEM, + TEST_SET_ITEM, + TEST_HASHSET_ITEM, + ) + ) + .isTrue() + remove( + TEST_STRING_ITEM, + TEST_INT_ITEM, + TEST_BOOLEAN_ITEM, + TEST_FLOAT_ITEM, + TEST_LONG_ITEM, + TEST_SET_ITEM, + TEST_HASHSET_ITEM, ) - assertThat(has(TEST_BOOLEAN_ITEM, TEST_INT_ITEM, TEST_STRING_ITEM)).isTrue() - remove(TEST_STRING_ITEM, TEST_INT_ITEM, TEST_BOOLEAN_ITEM) } } diff --git a/tests/multivalentTests/src/com/android/launcher3/graphics/IconShapeTest.kt b/tests/multivalentTests/src/com/android/launcher3/graphics/ShapeDelegateTest.kt similarity index 93% rename from tests/multivalentTests/src/com/android/launcher3/graphics/IconShapeTest.kt rename to tests/multivalentTests/src/com/android/launcher3/graphics/ShapeDelegateTest.kt index 311676a34b..7e38f0e0ea 100644 --- a/tests/multivalentTests/src/com/android/launcher3/graphics/IconShapeTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/graphics/ShapeDelegateTest.kt @@ -28,13 +28,13 @@ import android.view.View import androidx.core.graphics.PathParser import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import com.android.launcher3.graphics.IconShape.Circle -import com.android.launcher3.graphics.IconShape.Companion.AREA_CALC_SIZE -import com.android.launcher3.graphics.IconShape.Companion.AREA_DIFF_THRESHOLD -import com.android.launcher3.graphics.IconShape.Companion.areaDiffCalculator -import com.android.launcher3.graphics.IconShape.Companion.pickBestShape -import com.android.launcher3.graphics.IconShape.GenericPathShape -import com.android.launcher3.graphics.IconShape.RoundedSquare +import com.android.launcher3.graphics.ShapeDelegate.Circle +import com.android.launcher3.graphics.ShapeDelegate.Companion.AREA_CALC_SIZE +import com.android.launcher3.graphics.ShapeDelegate.Companion.AREA_DIFF_THRESHOLD +import com.android.launcher3.graphics.ShapeDelegate.Companion.areaDiffCalculator +import com.android.launcher3.graphics.ShapeDelegate.Companion.pickBestShape +import com.android.launcher3.graphics.ShapeDelegate.GenericPathShape +import com.android.launcher3.graphics.ShapeDelegate.RoundedSquare import com.android.launcher3.icons.GraphicsUtils import com.android.launcher3.views.ClipPathView import com.google.common.truth.Truth.assertThat @@ -43,7 +43,7 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) -class IconShapeTest { +class ShapeDelegateTest { @Test fun `areaDiffCalculator increases with outwards shape`() { diff --git a/tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java b/tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java index 9026748f60..0aaf4d7c40 100644 --- a/tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/icons/IconCacheTest.java @@ -56,7 +56,7 @@ import androidx.annotation.Nullable; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.LauncherAppState; import com.android.launcher3.icons.cache.CachingLogic; import com.android.launcher3.icons.cache.IconCacheUpdateHandler; import com.android.launcher3.icons.cache.LauncherActivityCachingLogic; @@ -69,11 +69,13 @@ import com.android.launcher3.shortcuts.ShortcutKey; import com.android.launcher3.util.ApplicationInfoWrapper; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.PackageUserKey; +import com.android.launcher3.util.SandboxApplication; import com.google.common.truth.Truth; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -85,20 +87,18 @@ import java.util.Set; @RunWith(AndroidJUnit4.class) public class IconCacheTest { - private Context mContext; + @Rule public SandboxApplication mContext = new SandboxApplication(); + private IconCache mIconCache; private ComponentName mMyComponent; @Before public void setup() { - mContext = getInstrumentation().getTargetContext(); mMyComponent = new ComponentName(mContext, SettingsActivity.class); // In memory icon cache - mIconCache = new IconCache(mContext, - InvariantDeviceProfile.INSTANCE.get(mContext), null, - new LauncherIconProvider(mContext)); + mIconCache = LauncherAppState.getInstance(mContext).getIconCache(); } @After diff --git a/tests/multivalentTests/src/com/android/launcher3/icons/mono/MonoIconThemeControllerTest.kt b/tests/multivalentTests/src/com/android/launcher3/icons/mono/MonoIconThemeControllerTest.kt index 12c14fb3a2..2c9cb2feb7 100644 --- a/tests/multivalentTests/src/com/android/launcher3/icons/mono/MonoIconThemeControllerTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/icons/mono/MonoIconThemeControllerTest.kt @@ -38,6 +38,7 @@ import com.android.launcher3.util.LauncherMultivalentJUnit.Companion.isRunningIn import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.junit.Assume.assumeFalse +import org.junit.Assume.assumeTrue import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -77,6 +78,8 @@ class MonoIconThemeControllerTest { @EnableFlags(Flags.FLAG_FORCE_MONOCHROME_APP_ICONS) fun `createThemedBitmap when mono generation is enabled`() { ensureBitmapSerializationSupported() + // Make sure forced theme icon is enabled in BaseIconFactory + assumeTrue(iconFactory.shouldForceThemeIcon()) val icon = AdaptiveIconDrawable(ColorDrawable(Color.BLACK), null, null) assertNotNull( MonoIconThemeController().createThemedBitmap(icon, BitmapInfo.LOW_RES_INFO, iconFactory) diff --git a/tests/multivalentTests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.kt index ce0468270d..08b8f81c11 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.kt @@ -155,7 +155,7 @@ class AddWorkspaceItemsTaskTest : AbstractWorkspaceModelTest() { private fun verifyItemSpaceFinderCall(nonEmptyScreenIds: List, numberOfExpectedCall: Int) { verify(mWorkspaceItemSpaceFinder, times(numberOfExpectedCall)) .findSpaceForItem( - same(mAppState), + eq(mAppState), same(mModelHelper.bgDataModel), eq(IntArray.wrap(*nonEmptyScreenIds.toIntArray())), eq(IntArray()), diff --git a/tests/multivalentTests/src/com/android/launcher3/model/GridSizeMigrationTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/GridSizeMigrationTest.kt index adf38fea93..5607bb4641 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/GridSizeMigrationTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/GridSizeMigrationTest.kt @@ -275,36 +275,15 @@ class GridSizeMigrationTest { val readerGridA = DbReader(db, TMP_TABLE, context) val readerGridB = DbReader(db, TABLE_NAME, context) // migrate from A -> B - if (Flags.gridMigrationRefactor()) { - var gridSizeMigrationLogic = GridSizeMigrationLogic() - val idsInUse = mutableListOf() - gridSizeMigrationLogic.migrateHotseat( - 5, - idp.numDatabaseHotseatIcons, - readerGridA, - readerGridB, - dbHelper, - idsInUse, - ) - gridSizeMigrationLogic.migrateWorkspace( - readerGridA, - readerGridB, - dbHelper, - Point(idp.numColumns, idp.numRows), - idsInUse, - ) - } else { - GridSizeMigrationDBController.migrate( - dbHelper, - readerGridA, - readerGridB, - 5, - idp.numDatabaseHotseatIcons, - Point(idp.numColumns, idp.numRows), - DeviceGridState(context), - DeviceGridState(idp), - ) - } + migrateGrid( + dbHelper, + readerGridA, + readerGridB, + 5, + idp.numDatabaseHotseatIcons, + idp.numColumns, + idp.numRows, + ) // Check hotseat items in grid B var c = @@ -388,8 +367,8 @@ class GridSizeMigrationTest { locMap = parseLocMap(c) // Expected workspace items in grid A // _ _ _ _ _ - // _ _ _ _ 5 - // 9 _ 6 _ 7 + // 9 _ _ _ 5 + // _ _ 6 _ 7 // _ _ 8 _ _ // _ _ _ _ _ assertThat(locMap.size.toLong()).isEqualTo(5) @@ -399,7 +378,7 @@ class GridSizeMigrationTest { assertThat(locMap[testPackage7]).isEqualTo(Triple(0, 4, 2)) assertThat(locMap[testPackage8]).isEqualTo(Triple(0, 2, 3)) // Verify items that didn't exist in grid A are added in new screen - assertThat(locMap[testPackage9]).isEqualTo(Triple(0, 0, 2)) + assertThat(locMap[testPackage9]).isEqualTo(Triple(0, 0, 1)) // remove item from B db.delete(TMP_TABLE, "$_ID=7", null) @@ -493,37 +472,15 @@ class GridSizeMigrationTest { val readerGridA = DbReader(db, TMP_TABLE, context) val readerGridB = DbReader(db, TABLE_NAME, context) // migrate from A -> B - if (Flags.gridMigrationRefactor()) { - var gridSizeMigrationLogic = GridSizeMigrationLogic() - val idsInUse = mutableListOf() - gridSizeMigrationLogic.migrateHotseat( - 5, - idp.numDatabaseHotseatIcons, - readerGridA, - readerGridB, - dbHelper, - idsInUse, - ) - gridSizeMigrationLogic.migrateWorkspace( - readerGridA, - readerGridB, - dbHelper, - Point(idp.numColumns, idp.numRows), - idsInUse, - ) - } else { - GridSizeMigrationDBController.migrate( - dbHelper, - readerGridA, - readerGridB, - 5, - idp.numDatabaseHotseatIcons, - Point(idp.numColumns, idp.numRows), - DeviceGridState(context), - DeviceGridState(idp), - ) - } - + migrateGrid( + dbHelper, + readerGridA, + readerGridB, + 5, + idp.numDatabaseHotseatIcons, + idp.numColumns, + idp.numRows, + ) // Check hotseat items in grid B var c = db.query( @@ -597,6 +554,112 @@ class GridSizeMigrationTest { ) } + @Test + @Throws(Exception::class) + @EnableFlags(Flags.FLAG_GRID_MIGRATION_REFACTOR) + fun testMigrationToFullGridFlagOn() { + testMigrationToFullGrid() + } + + @Test + @Throws(Exception::class) + @DisableFlags(Flags.FLAG_GRID_MIGRATION_REFACTOR) + fun testHotseatMigrationToFullGridFlagOff() { + testMigrationToFullGrid() + } + + @Throws(Exception::class) + fun testMigrationToFullGrid() { + // Hotseat items in grid A + // 1 2 3 4 5 + addItem(ITEM_TYPE_APPLICATION, 0, CONTAINER_HOTSEAT, 0, 0, testPackage1, 1, TMP_TABLE) + addItem(ITEM_TYPE_DEEP_SHORTCUT, 1, CONTAINER_HOTSEAT, 0, 0, testPackage2, 2, TMP_TABLE) + addItem(ITEM_TYPE_DEEP_SHORTCUT, 2, CONTAINER_HOTSEAT, 0, 0, testPackage3, 3, TMP_TABLE) + addItem(ITEM_TYPE_APPLICATION, 3, CONTAINER_HOTSEAT, 0, 0, testPackage4, 4, TMP_TABLE) + addItem(ITEM_TYPE_APPLICATION, 4, CONTAINER_HOTSEAT, 0, 0, testPackage5, 5, TMP_TABLE) + + // Hotseat items in grid B + // 6 7 8 9 + addItem(ITEM_TYPE_DEEP_SHORTCUT, 0, CONTAINER_HOTSEAT, 0, 0, testPackage6) + addItem(ITEM_TYPE_DEEP_SHORTCUT, 1, CONTAINER_HOTSEAT, 0, 0, testPackage7) + addItem(ITEM_TYPE_APPLICATION, 2, CONTAINER_HOTSEAT, 0, 0, testPackage8) + addItem(ITEM_TYPE_APPLICATION, 3, CONTAINER_HOTSEAT, 0, 0, testPackage9) + + // Workspace items in grid A + // _ _ _ _ _ + // 6 _ _ _ _ + // _ _ _ _ _ + // _ _ _ _ _ + // _ _ _ _ _ + addItem(ITEM_TYPE_APPLICATION, 0, CONTAINER_DESKTOP, 0, 1, testPackage6, 6, TMP_TABLE) + + // Workspace items in grid B + // _ _ _ _ + // 1 2 3 4 + // _ _ _ _ + // _ _ _ _ + addItem(ITEM_TYPE_APPLICATION, 0, CONTAINER_DESKTOP, 0, 1, testPackage1) + addItem(ITEM_TYPE_APPLICATION, 0, CONTAINER_DESKTOP, 1, 1, testPackage2) + addItem(ITEM_TYPE_APPLICATION, 0, CONTAINER_DESKTOP, 2, 1, testPackage3) + addItem(ITEM_TYPE_APPLICATION, 0, CONTAINER_DESKTOP, 3, 1, testPackage4) + + idp.numDatabaseHotseatIcons = 4 + idp.numColumns = 4 + idp.numRows = 4 + val readerGridA = DbReader(db, TMP_TABLE, context) + val readerGridB = DbReader(db, TABLE_NAME, context) + + // migrate from A -> B + migrateGrid( + dbHelper, + readerGridA, + readerGridB, + 5, + idp.numDatabaseHotseatIcons, + idp.numColumns, + idp.numRows, + ) + + // Check hotseat items in grid B + var c = + db.query( + TABLE_NAME, + arrayOf(SCREEN, INTENT), + "container=$CONTAINER_HOTSEAT", + null, + SCREEN, + null, + null, + ) ?: throw IllegalStateException() + // Expected hotseat items in grid B + // 1 2 3 4 + verifyHotseat( + c, + mutableListOf(testPackage1, testPackage2, testPackage3, testPackage4).toList(), + 4, + ) + + // Check workspace items in grid B + c = + db.query( + TABLE_NAME, + arrayOf(SCREEN, CELLX, CELLY, INTENT), + "container=$CONTAINER_DESKTOP", + null, + null, + null, + null, + ) ?: throw IllegalStateException() + val locMap = parseLocMap(c) + // Expected workspace items in grid B + // _ _ _ _ + // 6 _ _ _ + // _ _ _ _ + // _ _ _ _ + assertThat(locMap.size.toLong()).isEqualTo(1) + assertThat(locMap[testPackage6]).isEqualTo(Triple(0, 0, 1)) + } + private fun migrateGrid( dbHelper: DatabaseHelper, srcReader: DbReader, @@ -621,7 +684,7 @@ class GridSizeMigrationTest { srcReader, destReader, dbHelper, - Point(idp.numColumns, idp.numRows), + Point(pointX, pointY), idsInUse, ) } else { diff --git a/tests/multivalentTests/src/com/android/launcher3/model/LoaderCursorTest.java b/tests/multivalentTests/src/com/android/launcher3/model/LoaderCursorTest.java index 11047fb8d4..ad408185b2 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/LoaderCursorTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/model/LoaderCursorTest.java @@ -70,6 +70,7 @@ import androidx.test.filters.SmallTest; import com.android.launcher3.Flags; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; +import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; @@ -258,7 +259,6 @@ public class LoaderCursorTest { initCursor(ITEM_TYPE_APPLICATION, "title"); assertTrue(mLoaderCursor.moveToNext()); WorkspaceItemInfo itemInfo = new WorkspaceItemInfo(); - itemInfo.bitmap = null; itemInfo.runtimeStatusFlags |= FLAG_ARCHIVED; Bitmap expectedBitmap = LauncherIcons.obtain(mContext) .createIconBitmap(decodeByteArray(sTestBlob, 0, sTestBlob.length)) @@ -289,7 +289,7 @@ public class LoaderCursorTest { initCursor(ITEM_TYPE_APPLICATION, "title"); assertTrue(mLoaderCursor.moveToNext()); WorkspaceItemInfo itemInfo = new WorkspaceItemInfo(); - itemInfo.bitmap = null; + BitmapInfo original = itemInfo.bitmap; itemInfo.runtimeStatusFlags |= FLAG_ARCHIVED; Intent intent = new Intent(); intent.setComponent(new ComponentName("package", "class")); @@ -297,7 +297,7 @@ public class LoaderCursorTest { // When mLoaderCursor.loadWorkspaceTitleAndIcon(false, false, itemInfo); // Then - assertThat(itemInfo.bitmap).isNull(); + assertThat(itemInfo.bitmap).isEqualTo(original); } @Test diff --git a/tests/multivalentTests/src/com/android/launcher3/model/WidgetsModelTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/WidgetsModelTest.kt index ae4ff042d5..d704195052 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/WidgetsModelTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/WidgetsModelTest.kt @@ -119,6 +119,11 @@ class WidgetsModelTest { // A widget in different package (none of that app's widgets are in widget // sections xml) createAppWidgetProviderInfo(AppBTestWidgetComponent), + // A widget in different app that is meant to be hidden from picker + createAppWidgetProviderInfo( + AppCPinOnlyTestWidgetComponent, + /*hideFromPicker=*/ true, + ), ) ) @@ -129,12 +134,13 @@ class WidgetsModelTest { } @Test - fun widgetsByPackage_treatsWidgetSectionsAsSeparatePackageItems() { + fun widgetsByPackageForPicker_treatsWidgetSectionsAsSeparatePackageItems() { loadWidgets() - val packages: Map> = underTest.widgetsByPackageItem + val packages: Map> = + underTest.widgetsByPackageItemForPicker - // expect 3 package items + // expect 3 package items (no app C as its widget is hidden from picker) // one for the custom section with widget from appA // one for package section for second widget from appA (that wasn't listed in xml) // and one for package section for appB @@ -167,6 +173,13 @@ class WidgetsModelTest { assertThat(appBPackageSection).hasSize(1) val widgetsInAppBSection = appBPackageSection.entries.first().value assertThat(widgetsInAppBSection).hasSize(1) + + // No App C's package section - as the only widget hosted by it is hidden in picker + val appCPackageSection = + packageSections.filter { + it.key.packageName == AppCPinOnlyTestWidgetComponent.packageName + } + assertThat(appCPackageSection).isEmpty() } @Test @@ -175,7 +188,29 @@ class WidgetsModelTest { val widgetsByComponentKey: Map = underTest.widgetsByComponentKey + // Has all widgets including ones not visible in picker + assertThat(widgetsByComponentKey).hasSize(4) + widgetsByComponentKey.forEach { entry -> + assertThat(entry.key).isEqualTo(entry.value as ComponentKey) + } + } + + @Test + fun widgetComponentMapForPicker_excludesWidgetsHiddenInPicker() { + loadWidgets() + + val widgetsByComponentKey: Map = + underTest.widgetsByComponentKeyForPicker + + // Has all widgets excluding the appC's widget. assertThat(widgetsByComponentKey).hasSize(3) + assertThat( + widgetsByComponentKey.filter { + it.key.componentName == AppCPinOnlyTestWidgetComponent + } + ) + .isEmpty() + // widgets mapped correctly widgetsByComponentKey.forEach { entry -> assertThat(entry.key).isEqualTo(entry.value as ComponentKey) } @@ -189,7 +224,7 @@ class WidgetsModelTest { } @Test - fun getWidgetsByPackageItem_returnsACopyOfMap() { + fun getWidgetsByPackageItemForPicker_returnsACopyOfMap() { loadWidgets() val latch = CountDownLatch(1) @@ -198,8 +233,8 @@ class WidgetsModelTest { // each "widgetsByPackageItem" read returns a different copy of the map held internally. // Modifying one shouldn't impact another. - for ((_, _) in underTest.widgetsByPackageItem.entries) { - underTest.widgetsByPackageItem.clear() + for ((_, _) in underTest.widgetsByPackageItemForPicker.entries) { + underTest.widgetsByPackageItemForPicker.clear() if (update) { // trigger update update = false // Similarly, model could update its code independently while a client is @@ -256,6 +291,9 @@ class WidgetsModelTest { private val AppBTestWidgetComponent: ComponentName = ComponentName.createRelative("com.test.package", "TestProvider") + private val AppCPinOnlyTestWidgetComponent: ComponentName = + ComponentName.createRelative("com.testC.package", "PinOnlyTestProvider") + private const val LOAD_WIDGETS_TIMEOUT_SECONDS = 2L } } diff --git a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt index 7a403e1826..a55d64ba4f 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt @@ -454,7 +454,7 @@ class WorkspaceItemProcessorTest { assertThat(mAllDeepShortcuts).isEmpty() verify(mockCursor) .markDeleted( - "Pinned shortcut not found from request. package=pkg, user=UserHandle{0}", + "Pinned shortcut not found from request. package=pkg, user=$mUserHandle", "shortcut_not_found", ) } @@ -513,7 +513,7 @@ class WorkspaceItemProcessorTest { verify(mockCursor, times(0)).checkAndAddItem(any(), any(), anyOrNull()) verify(mockCursor) .markDeleted( - "Pinned shortcut not found from request. package=pkg, user=UserHandle{0}", + "Pinned shortcut not found from request. package=pkg, user=$mUserHandle", "shortcut_not_found", ) } @@ -533,7 +533,7 @@ class WorkspaceItemProcessorTest { whenever(disabledMessage).thenReturn("") whenever(disabledReason).thenReturn(0) whenever(persons).thenReturn(EMPTY_PERSON_ARRAY) - whenever(userHandle).thenReturn(Process.myUserHandle()) + whenever(userHandle).thenReturn(mUserHandle) } mIconRequestInfos = mutableListOf() // Make sure shortcuts map has expected key from expected package @@ -565,7 +565,7 @@ class WorkspaceItemProcessorTest { mockBgDataModel = mock() mockCursor = mock().apply { - user = UserHandle(0) + user = mUserHandle itemType = ITEM_TYPE_FOLDER id = 1 container = 100 diff --git a/tests/multivalentTests/src/com/android/launcher3/pm/InstallSessionTrackerTest.kt b/tests/multivalentTests/src/com/android/launcher3/pm/InstallSessionTrackerTest.kt index 15a9964a5f..23c1da98c5 100644 --- a/tests/multivalentTests/src/com/android/launcher3/pm/InstallSessionTrackerTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/pm/InstallSessionTrackerTest.kt @@ -219,7 +219,7 @@ class InstallSessionTrackerTest { .whenever(launcherApps) .unregisterPackageInstallerSessionCallback(installSessionTracker) // When - installSessionTracker.unregister() + installSessionTracker.close() // Then verify(launcherApps).unregisterPackageInstallerSessionCallback(installSessionTracker) } diff --git a/tests/multivalentTests/src/com/android/launcher3/shapes/ShapesProviderTest.kt b/tests/multivalentTests/src/com/android/launcher3/shapes/ShapesProviderTest.kt index 2b8896ec9e..66b8be0229 100644 --- a/tests/multivalentTests/src/com/android/launcher3/shapes/ShapesProviderTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/shapes/ShapesProviderTest.kt @@ -22,7 +22,12 @@ import androidx.core.graphics.PathParser import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.launcher3.Flags.FLAG_ENABLE_LAUNCHER_ICON_SHAPES -import com.android.launcher3.graphics.IconShape.GenericPathShape +import com.android.launcher3.graphics.ShapeDelegate.GenericPathShape +import com.android.launcher3.shapes.ShapesProvider.ARCH_KEY +import com.android.launcher3.shapes.ShapesProvider.CIRCLE_KEY +import com.android.launcher3.shapes.ShapesProvider.FOUR_SIDED_COOKIE_KEY +import com.android.launcher3.shapes.ShapesProvider.SEVEN_SIDED_COOKIE_KEY +import com.android.launcher3.shapes.ShapesProvider.SQUARE_KEY import com.android.systemui.shared.Flags.FLAG_NEW_CUSTOMIZATION_PICKER_UI import org.junit.Rule import org.junit.Test @@ -37,90 +42,99 @@ class ShapesProviderTest { @Test @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) fun `verify valid path arch`() { - ShapesProvider.iconShapes["arch"]?.apply { - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } + ShapesProvider.iconShapes + .find { it.key == ARCH_KEY }!! + .run { + GenericPathShape(pathString) + PathParser.createPathFromPathData(pathString) + } } @Test @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) fun `verify valid path 4_sided_cookie`() { - ShapesProvider.iconShapes["4_sided_cookie"]?.apply { - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } + ShapesProvider.iconShapes + .find { it.key == FOUR_SIDED_COOKIE_KEY }!! + .run { + GenericPathShape(pathString) + PathParser.createPathFromPathData(pathString) + } } @Test @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) fun `verify valid path seven_sided_cookie`() { - ShapesProvider.iconShapes["seven_sided_cookie"]?.apply { - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } - } - - @Test - @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) - fun `verify valid path sunny`() { - ShapesProvider.iconShapes["sunny"]?.apply { - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } + ShapesProvider.iconShapes + .find { it.key == SEVEN_SIDED_COOKIE_KEY }!! + .run { + GenericPathShape(pathString) + PathParser.createPathFromPathData(pathString) + } } @Test @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) fun `verify valid path circle`() { - ShapesProvider.iconShapes["circle"]?.apply { - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } + ShapesProvider.iconShapes + .find { it.key == CIRCLE_KEY }!! + .run { + GenericPathShape(pathString) + PathParser.createPathFromPathData(pathString) + } } @Test @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) fun `verify valid path square`() { - ShapesProvider.iconShapes["square"]?.apply { - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } + ShapesProvider.iconShapes + .find { it.key == ARCH_KEY }!! + .run { + GenericPathShape(pathString) + PathParser.createPathFromPathData(pathString) + } } @Test @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) fun `verify valid folder path clover`() { - ShapesProvider.folderShapes["clover"]?.let { pathString -> - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } + ShapesProvider.iconShapes + .find { it.key == CIRCLE_KEY }!! + .run { + GenericPathShape(folderPathString) + PathParser.createPathFromPathData(folderPathString) + } } @Test @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) fun `verify valid folder path complexClover`() { - ShapesProvider.folderShapes["complexClover"]?.let { pathString -> - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } + ShapesProvider.iconShapes + .find { it.key == FOUR_SIDED_COOKIE_KEY }!! + .run { + GenericPathShape(folderPathString) + PathParser.createPathFromPathData(folderPathString) + } } @Test @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) fun `verify valid folder path arch`() { - ShapesProvider.folderShapes["arch"]?.let { pathString -> - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } + ShapesProvider.iconShapes + .find { it.key == ARCH_KEY }!! + .run { + GenericPathShape(folderPathString) + PathParser.createPathFromPathData(folderPathString) + } } @Test @EnableFlags(FLAG_ENABLE_LAUNCHER_ICON_SHAPES, FLAG_NEW_CUSTOMIZATION_PICKER_UI) fun `verify valid folder path square`() { - ShapesProvider.folderShapes["square"]?.let { pathString -> - GenericPathShape(pathString) - PathParser.createPathFromPathData(pathString) - } + ShapesProvider.iconShapes + .find { it.key == SQUARE_KEY }!! + .run { + GenericPathShape(folderPathString) + PathParser.createPathFromPathData(folderPathString) + } } } diff --git a/tests/multivalentTests/src/com/android/launcher3/util/DisplayControllerTest.kt b/tests/multivalentTests/src/com/android/launcher3/util/DisplayControllerTest.kt index aa1451b53a..0ecb38eb0f 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/DisplayControllerTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/util/DisplayControllerTest.kt @@ -34,6 +34,7 @@ import com.android.launcher3.dagger.LauncherAppSingleton import com.android.launcher3.util.DisplayController.CHANGE_DENSITY import com.android.launcher3.util.DisplayController.CHANGE_DESKTOP_MODE import com.android.launcher3.util.DisplayController.CHANGE_ROTATION +import com.android.launcher3.util.DisplayController.CHANGE_SHOW_LOCKED_TASKBAR import com.android.launcher3.util.DisplayController.CHANGE_TASKBAR_PINNING import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener import com.android.launcher3.util.LauncherModelHelper.SandboxModelContext @@ -209,8 +210,13 @@ class DisplayControllerTest { assertTrue(displayController.getInfo().isTransientTaskbar()) displayController.notifyConfigChange() + verify(displayInfoChangeListener) - .onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING)) + .onDisplayInfoChanged( + any(), + any(), + eq(CHANGE_TASKBAR_PINNING or CHANGE_SHOW_LOCKED_TASKBAR), + ) assertFalse(displayController.getInfo().isTransientTaskbar()) } @@ -227,7 +233,11 @@ class DisplayControllerTest { displayController.onConfigurationChanged(configuration) verify(displayInfoChangeListener) - .onDisplayInfoChanged(any(), any(), eq(CHANGE_TASKBAR_PINNING)) + .onDisplayInfoChanged( + any(), + any(), + eq(CHANGE_TASKBAR_PINNING or CHANGE_SHOW_LOCKED_TASKBAR), + ) assertFalse(displayController.getInfo().isTransientTaskbar()) } diff --git a/tests/multivalentTests/src/com/android/launcher3/util/LauncherModelHelper.java b/tests/multivalentTests/src/com/android/launcher3/util/LauncherModelHelper.java index 09b9a3bf7c..4458e8fb01 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/LauncherModelHelper.java +++ b/tests/multivalentTests/src/com/android/launcher3/util/LauncherModelHelper.java @@ -21,8 +21,8 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; -import static com.android.launcher3.util.TestUtil.runOnExecutorSync; import static com.android.launcher3.util.TestUtil.grantWriteSecurePermission; +import static com.android.launcher3.util.TestUtil.runOnExecutorSync; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -51,11 +51,11 @@ import androidx.test.core.app.ApplicationProvider; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; +import com.android.launcher3.dagger.LauncherBaseAppComponent; import com.android.launcher3.model.BgDataModel; import com.android.launcher3.model.BgDataModel.Callbacks; import com.android.launcher3.model.ModelDbController; import com.android.launcher3.testing.TestInformationProvider; -import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -266,14 +266,6 @@ public class LauncherModelHelper { mDbDir = new File(getCacheDir(), UUID.randomUUID().toString()); } - @Override - public T createObject(MainThreadInitializedObject object) { - if (object == LauncherAppState.INSTANCE) { - return (T) new LauncherAppState(this, null /* iconCacheFileName */); - } - return super.createObject(object); - } - @Override public File getDatabasePath(String name) { if (!mDbDir.exists()) { @@ -342,5 +334,10 @@ public class LauncherModelHelper { } return success; } + + @Override + public void initDaggerComponent(LauncherBaseAppComponent.Builder componentBuilder) { + super.initDaggerComponent(componentBuilder.iconsDbName(null)); + } } } diff --git a/tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt b/tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt index 547d05e198..ceefb0dced 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt +++ b/tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt @@ -1,6 +1,7 @@ package com.android.launcher3.util import android.content.ContentValues +import android.os.Process import com.android.launcher3.Flags import com.android.launcher3.LauncherModel import com.android.launcher3.LauncherSettings.Favorites @@ -66,7 +67,7 @@ object ModelTestExtensions { spanX: Int = 1, spanY: Int = 1, id: Int = 0, - profileId: Int = 0, + profileId: Int = Process.myUserHandle().identifier, tableName: String = Favorites.TABLE_NAME, appWidgetId: Int = -1, appWidgetSource: Int = -1, diff --git a/tests/multivalentTests/src/com/android/launcher3/util/SandboxApplication.kt b/tests/multivalentTests/src/com/android/launcher3/util/SandboxApplication.kt index 0da8891e47..2fa4cad61d 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/SandboxApplication.kt +++ b/tests/multivalentTests/src/com/android/launcher3/util/SandboxApplication.kt @@ -27,7 +27,6 @@ import android.os.UserHandle import android.view.Display import androidx.test.core.app.ApplicationProvider import com.android.launcher3.util.LauncherModelHelper.SandboxModelContext -import com.android.launcher3.util.MainThreadInitializedObject.ObjectSandbox import org.junit.Rule import org.junit.rules.ExternalResource import org.junit.rules.TestRule @@ -69,7 +68,7 @@ class SandboxApplication private constructor(private val base: SandboxApplicatio // Defer to the true application to decide whether to clean up. For instance, we do not want // to cleanup under Robolectric. val app = ApplicationProvider.getApplicationContext() - return if (app is ObjectSandbox) app.shouldCleanUpOnDestroy() else true + return (app as? SandboxContext)?.shouldCleanUpOnDestroy() ?: true } override fun apply(statement: Statement, description: Description): Statement { diff --git a/tests/multivalentTests/src/com/android/launcher3/util/SandboxApplicationTest.kt b/tests/multivalentTests/src/com/android/launcher3/util/SandboxApplicationTest.kt index d87a4063ec..8a21cff6a7 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/SandboxApplicationTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/util/SandboxApplicationTest.kt @@ -16,7 +16,6 @@ package com.android.launcher3.util -import android.content.Context import android.hardware.display.DisplayManager import android.view.Display import android.view.Display.DEFAULT_DISPLAY @@ -63,16 +62,4 @@ class SandboxApplicationTest { onDestroy() } } - - @Test - fun testGetObject_objectCreatesDisplayContext_isSandboxed() { - class TestSingleton(context: Context) : SafeCloseable { - override fun close() = Unit - - val displayContext = context.createDisplayContext(display) - } - - val displayContext = MainThreadInitializedObject { TestSingleton(it) }[app].displayContext - assertThat(displayContext.applicationContext).isEqualTo(app) - } } diff --git a/tests/multivalentTests/src/com/android/launcher3/util/TestSandboxModelContextWrapper.java b/tests/multivalentTests/src/com/android/launcher3/util/TestSandboxModelContextWrapper.java index 393282f442..8be13412e9 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/TestSandboxModelContextWrapper.java +++ b/tests/multivalentTests/src/com/android/launcher3/util/TestSandboxModelContextWrapper.java @@ -18,10 +18,9 @@ package com.android.launcher3.util; import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; -import static com.android.launcher3.util.MainThreadInitializedObject.SandboxContext; - import android.content.ContextWrapper; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.test.platform.app.InstrumentationRegistry; @@ -44,7 +43,7 @@ import java.util.concurrent.CountDownLatch; * There are 2 constructors in this class. The base context can be {@link SandboxContext} or * Instrumentation target context. * Using {@link SandboxContext} as base context allows custom implementations for - * MainThreadInitializedObject providers. + * providing objects in Dagger components. */ public class TestSandboxModelContextWrapper extends ActivityContextWrapper implements @@ -57,7 +56,7 @@ public class TestSandboxModelContextWrapper extends ActivityContextWrapper imple protected ActivityAllAppsContainerView mAppsView; - private final PopupDataProvider mPopupDataProvider = new PopupDataProvider(i -> {}); + private final PopupDataProvider mPopupDataProvider = new PopupDataProvider(this); private final WidgetPickerDataProvider mWidgetPickerDataProvider = new WidgetPickerDataProvider(); protected final UserCache mUserCache; @@ -80,7 +79,7 @@ public class TestSandboxModelContextWrapper extends ActivityContextWrapper imple mAllAppsStore = mAppsView.getAppsStore(); } - @Nullable + @NonNull @Override public PopupDataProvider getPopupDataProvider() { return mPopupDataProvider; diff --git a/tests/multivalentTests/src/com/android/launcher3/util/WidgetUtils.java b/tests/multivalentTests/src/com/android/launcher3/util/WidgetUtils.java index a87a208187..9fbd7ff311 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/WidgetUtils.java +++ b/tests/multivalentTests/src/com/android/launcher3/util/WidgetUtils.java @@ -15,6 +15,8 @@ */ package com.android.launcher3.util; +import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_HIDE_FROM_PICKER; + import android.appwidget.AppWidgetProviderInfo; import android.content.ComponentName; import android.content.Context; @@ -83,14 +85,30 @@ public class WidgetUtils { /** * Creates a {@link AppWidgetProviderInfo} for the provided component name + * + * @param cn component name of the appwidget provider + * @param hideFromPicker indicates if the widget should appear in widget picker */ - public static AppWidgetProviderInfo createAppWidgetProviderInfo(ComponentName cn) { + public static AppWidgetProviderInfo createAppWidgetProviderInfo(ComponentName cn, + boolean hideFromPicker) { ActivityInfo activityInfo = new ActivityInfo(); activityInfo.applicationInfo = new ApplicationInfo(); activityInfo.applicationInfo.uid = Process.myUid(); AppWidgetProviderInfo info = new AppWidgetProviderInfo(); + if (hideFromPicker) { + info.widgetFeatures = WIDGET_FEATURE_HIDE_FROM_PICKER; + } info.providerInfo = activityInfo; info.provider = cn; return info; } + + /** + * Creates a {@link AppWidgetProviderInfo} for the provided component name + * + * @param cn component name of the appwidget provider + */ + public static AppWidgetProviderInfo createAppWidgetProviderInfo(ComponentName cn) { + return createAppWidgetProviderInfo(cn, /*hideFromPicker=*/ false); + } } diff --git a/tests/multivalentTests/src/com/android/launcher3/widget/picker/OWNERS b/tests/multivalentTests/src/com/android/launcher3/widget/picker/OWNERS index 775b0c7d9b..716ab90043 100644 --- a/tests/multivalentTests/src/com/android/launcher3/widget/picker/OWNERS +++ b/tests/multivalentTests/src/com/android/launcher3/widget/picker/OWNERS @@ -5,7 +5,6 @@ set noparent # # Widget Picker OWNERS -zakcohen@google.com shamalip@google.com wvk@google.com diff --git a/tests/src/com/android/launcher3/allapps/KeyboardFocusTest.java b/tests/src/com/android/launcher3/allapps/KeyboardFocusTest.java index 1e21ee5b3a..44df5b8e0a 100644 --- a/tests/src/com/android/launcher3/allapps/KeyboardFocusTest.java +++ b/tests/src/com/android/launcher3/allapps/KeyboardFocusTest.java @@ -23,7 +23,6 @@ import androidx.test.filters.SmallTest; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.util.BaseLauncherActivityTest; -import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord; import com.android.launcher3.views.ActivityContext; import org.junit.Test; @@ -64,7 +63,6 @@ public class KeyboardFocusTest extends BaseLauncherActivityTest { } @Test - @ScreenRecord //b/378167329 public void testAllAppsExitSearchAndFocusSearchResults() { loadLauncherSync(); goToState(LauncherState.ALL_APPS); diff --git a/tests/src/com/android/launcher3/celllayout/integrationtest/events/TestEventsEmitterImplementation.kt b/tests/src/com/android/launcher3/celllayout/integrationtest/events/EventWaiter.kt similarity index 58% rename from tests/src/com/android/launcher3/celllayout/integrationtest/events/TestEventsEmitterImplementation.kt rename to tests/src/com/android/launcher3/celllayout/integrationtest/events/EventWaiter.kt index 5e062d0584..20ad60f11b 100644 --- a/tests/src/com/android/launcher3/celllayout/integrationtest/events/TestEventsEmitterImplementation.kt +++ b/tests/src/com/android/launcher3/celllayout/integrationtest/events/EventWaiter.kt @@ -16,9 +16,7 @@ package com.android.launcher3.celllayout.integrationtest.events -import android.util.Log -import com.android.launcher3.debug.TestEvent -import com.android.launcher3.debug.TestEventEmitter +import com.android.launcher3.debug.TestEventEmitter.TestEvent import java.util.concurrent.TimeUnit import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.runBlocking @@ -52,39 +50,3 @@ class EventWaiter(val eventToWait: TestEvent) { deferrable.complete(EventStatus.SUCCESS) } } - -class TestEventsEmitterImplementation() : TestEventEmitter { - companion object { - private const val TAG = "TestEvents" - } - - private val expectedEvents: ArrayDeque = ArrayDeque() - - fun createEventWaiter(expectedEvent: TestEvent): EventWaiter { - val eventWaiter = EventWaiter(expectedEvent) - expectedEvents.add(eventWaiter) - return eventWaiter - } - - private fun clearQueue() { - expectedEvents.clear() - } - - override fun sendEvent(event: TestEvent) { - Log.d(TAG, "Signal received $event") - Log.d(TAG, "Total expected events ${expectedEvents.size}") - if (expectedEvents.isEmpty()) return - val eventWaiter = expectedEvents.last() - if (eventWaiter.eventToWait == event) { - Log.d(TAG, "Removing $event") - expectedEvents.removeLast() - eventWaiter.terminate() - } else { - Log.d(TAG, "Not matching $event") - } - } - - override fun close() { - clearQueue() - } -} diff --git a/tests/src/com/android/launcher3/celllayout/integrationtest/events/EventsRule.kt b/tests/src/com/android/launcher3/celllayout/integrationtest/events/EventsRule.kt index fb61cedaa8..45eb5e1889 100644 --- a/tests/src/com/android/launcher3/celllayout/integrationtest/events/EventsRule.kt +++ b/tests/src/com/android/launcher3/celllayout/integrationtest/events/EventsRule.kt @@ -17,11 +17,15 @@ package com.android.launcher3.celllayout.integrationtest.events import android.content.Context -import com.android.launcher3.debug.TestEvent +import android.util.Log +import com.android.dx.mockito.inline.extended.ExtendedMockito.* +import com.android.dx.mockito.inline.extended.StaticMockitoSession import com.android.launcher3.debug.TestEventEmitter +import com.android.launcher3.debug.TestEventEmitter.TestEvent import org.junit.rules.TestRule import org.junit.runner.Description import org.junit.runners.model.Statement +import org.mockito.quality.Strictness /** * Rule to create EventWaiters to wait for events that happens on the Launcher. For reference look @@ -30,35 +34,65 @@ import org.junit.runners.model.Statement * Waiting for event should be used to prevent race conditions, it provides a more precise way of * waiting for events compared to [AbstractLauncherUiTest#waitForLauncherCondition]. * - * This class overrides the [TestEventEmitter] with [TestEventsEmitterImplementation] and makes sure - * to return the [TestEventEmitter] to the previous value when finished. + * This class mocks the static method [TestEventEmitter.sendEvent] */ class EventsRule(val context: Context) : TestRule { - private var prevEventEmitter: TestEventEmitter? = null + private val expectedEvents: ArrayDeque = ArrayDeque() - private val eventEmitter = TestEventsEmitterImplementation() + private lateinit var mockitoSession: StaticMockitoSession override fun apply(base: Statement, description: Description?): Statement { return object : Statement() { override fun evaluate() { - beforeTest() - base.evaluate() - afterTest() + try { + beforeTest() + base.evaluate() + } finally { + afterTest() + } } } } fun createEventWaiter(expectedEvent: TestEvent): EventWaiter { - return eventEmitter.createEventWaiter(expectedEvent) + val eventWaiter = EventWaiter(expectedEvent) + expectedEvents.add(eventWaiter) + return eventWaiter } private fun beforeTest() { - prevEventEmitter = TestEventEmitter.INSTANCE.get(context) - TestEventEmitter.INSTANCE.initializeForTesting(eventEmitter) + mockitoSession = + mockitoSession() + .strictness(Strictness.LENIENT) + .spyStatic(TestEventEmitter::class.java) + .startMocking() + + doAnswer { invocation -> + val event = (invocation.arguments[0] as TestEvent) + Log.d(TAG, "Signal received $event") + Log.d(TAG, "Total expected events ${expectedEvents.size}") + if (!expectedEvents.isEmpty()) { + val eventWaiter = expectedEvents.last() + if (eventWaiter.eventToWait == event) { + Log.d(TAG, "Removing $event") + expectedEvents.removeLast() + eventWaiter.terminate() + } else { + Log.d(TAG, "Not matching $event") + } + } + null + } + .`when` { TestEventEmitter.sendEvent(any()) } } private fun afterTest() { - TestEventEmitter.INSTANCE.initializeForTesting(prevEventEmitter) + mockitoSession.finishMocking() + expectedEvents.clear() + } + + companion object { + private const val TAG = "TestEvents" } } diff --git a/tests/src/com/android/launcher3/dragging/TaplUninstallRemoveTest.java b/tests/src/com/android/launcher3/dragging/TaplUninstallRemoveTest.java index f490bd6381..95d50764a4 100644 --- a/tests/src/com/android/launcher3/dragging/TaplUninstallRemoveTest.java +++ b/tests/src/com/android/launcher3/dragging/TaplUninstallRemoveTest.java @@ -36,6 +36,7 @@ import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; import com.android.launcher3.util.TestUtil; import com.android.launcher3.util.Wait; +import com.android.launcher3.util.rule.ScreenRecordRule; import org.junit.Test; @@ -126,6 +127,7 @@ public class TaplUninstallRemoveTest extends AbstractLauncherUiTest { * Adds three icons to the workspace and removes one of them by dragging to uninstall. */ @Test + @ScreenRecordRule.ScreenRecord // b/399756302 @PlatinumTest(focusArea = "launcher") public void uninstallWorkspaceIcon() throws IOException { Point[] gridPositions = TestUtil.getCornersAndCenterPositions(mLauncher); diff --git a/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt b/tests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt similarity index 97% rename from tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt rename to tests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt index 15accbda2a..c956395503 100644 --- a/tests/multivalentTests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt +++ b/tests/src/com/android/launcher3/folder/PreviewItemManagerTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 The Android Open Source Project + * 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. @@ -20,6 +20,7 @@ import android.R import android.os.Process import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn import com.android.launcher3.LauncherAppState import com.android.launcher3.LauncherPrefs import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_FOLDER @@ -61,11 +62,11 @@ import org.junit.rules.TestRule import org.junit.runner.Description import org.junit.runner.RunWith import org.junit.runners.model.Statement +import org.mockito.MockitoAnnotations 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 @@ -85,6 +86,7 @@ class PreviewItemManagerTest { @Before fun setup() { + MockitoAnnotations.initMocks(this) modelHelper = LauncherModelHelper() context = modelHelper.sandboxContext context.initDaggerComponent(DaggerPreviewItemManagerTestComponent.builder()) @@ -93,10 +95,8 @@ class PreviewItemManagerTest { } folderIcon = FolderIcon(ActivityContextWrapper(context)) - val app = spy(LauncherAppState.getInstance(context)) - iconCache = spy(app.iconCache) - doReturn(iconCache).whenever(app).iconCache - context.putObject(LauncherAppState.INSTANCE, app) + iconCache = LauncherAppState.INSTANCE[context].iconCache + spyOn(iconCache) doReturn(null).whenever(iconCache).updateIconInBackground(any(), any()) previewItemManager = PreviewItemManager(folderIcon) diff --git a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt index 8f64e841b8..582cf3c082 100644 --- a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt +++ b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt @@ -14,6 +14,7 @@ import android.provider.Settings import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.dx.mockito.inline.extended.ExtendedMockito +import com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn import com.android.launcher3.Flags import com.android.launcher3.LauncherAppState import com.android.launcher3.LauncherModel @@ -67,7 +68,6 @@ import org.mockito.kotlin.any import org.mockito.kotlin.anyOrNull import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock -import org.mockito.kotlin.spy import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import org.mockito.quality.Strictness @@ -92,7 +92,6 @@ class LoaderTaskTest { ) private lateinit var mockitoSession: MockitoSession - @Mock private lateinit var app: LauncherAppState @Mock private lateinit var bgAllAppsList: AllAppsList @Mock private lateinit var modelDelegate: ModelDelegate @Mock private lateinit var launcherBinder: BaseLauncherBinder @@ -108,6 +107,9 @@ class LoaderTaskTest { @get:Rule val setFlagsRule = SetFlagsRule() + private val app: LauncherAppState + get() = context.appComponent.launcherAppState + @Before fun setup() { MockitoAnnotations.initMocks(this) @@ -118,32 +120,28 @@ class LoaderTaskTest { .strictness(Strictness.LENIENT) .mockStatic(FirstScreenBroadcastHelper::class.java) .startMocking() - val idp = - context.appComponent.idp.apply { - numRows = 5 - numColumns = 6 - numDatabaseHotseatIcons = 5 - } - context.putObject(LauncherAppState.INSTANCE, app) - doReturn(TestViewHelpers.findWidgetProvider(false)) .`when`(context.spyService(AppWidgetManager::class.java)) .getAppWidgetInfo(any()) - `when`(app.context).thenReturn(context) - `when`(app.model).thenReturn(launcherModel) `when`(launcherModel.beginLoader(any())).thenReturn(transaction) - `when`(app.iconCache).thenReturn(iconCache) `when`(launcherModel.modelDbController) .thenReturn(FactitiousDbController(context, INSERTION_STATEMENT_FILE)) - `when`(app.invariantDeviceProfile).thenReturn(idp) `when`(launcherBinder.newIdleLock(any())).thenReturn(idleLock) `when`(idleLock.awaitLocked(1000)).thenReturn(false) `when`(iconCache.getUpdateHandler()).thenReturn(iconCacheUpdateHandler) `when`(widgetsFilterDataProvider.getDefaultWidgetsFilter()).thenReturn(Predicate { true }) context.initDaggerComponent( - DaggerLoaderTaskTest_TestComponent.builder().bindUserCache(userCache) + DaggerLoaderTaskTest_TestComponent.builder() + .bindUserCache(userCache) + .bindIconCache(iconCache) + .bindLauncherModel(launcherModel) ) + context.appComponent.idp.apply { + numRows = 5 + numColumns = 6 + numDatabaseHotseatIcons = 5 + } TestUtil.grantWriteSecurePermission() } @@ -281,8 +279,8 @@ class LoaderTaskTest { @EnableFlags(Flags.FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS) fun `When broadcast flag on and is restore and secure setting off then send new broadcast`() { // Given - val spyContext = spy(context) - `when`(app.context).thenReturn(spyContext) + spyOn(context) + val spyContext = context whenever( FirstScreenBroadcastHelper.createModelsForFirstScreenBroadcast( any(), @@ -357,8 +355,8 @@ class LoaderTaskTest { @EnableFlags(Flags.FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS) fun `When not a restore then installed item broadcast not sent`() { // Given - val spyContext = spy(context) - `when`(app.context).thenReturn(spyContext) + spyOn(context) + val spyContext = context whenever( FirstScreenBroadcastHelper.createModelsForFirstScreenBroadcast( any(), @@ -398,8 +396,8 @@ class LoaderTaskTest { @DisableFlags(Flags.FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS) fun `When broadcast flag off then installed item broadcast not sent`() { // Given - val spyContext = spy(context) - `when`(app.context).thenReturn(spyContext) + spyOn(context) + val spyContext = context whenever( FirstScreenBroadcastHelper.createModelsForFirstScreenBroadcast( any(), @@ -444,8 +442,8 @@ class LoaderTaskTest { @EnableFlags(Flags.FLAG_ENABLE_FIRST_SCREEN_BROADCAST_ARCHIVING_EXTRAS) fun `When failsafe secure setting on then installed item broadcast not sent`() { // Given - val spyContext = spy(context) - `when`(app.context).thenReturn(spyContext) + spyOn(context) + val spyContext = context whenever( FirstScreenBroadcastHelper.createModelsForFirstScreenBroadcast( any(), @@ -644,6 +642,10 @@ class LoaderTaskTest { interface Builder : LauncherAppComponent.Builder { @BindsInstance fun bindUserCache(userCache: UserCache): Builder + @BindsInstance fun bindLauncherModel(model: LauncherModel): Builder + + @BindsInstance fun bindIconCache(iconCache: IconCache): Builder + override fun build(): TestComponent } } diff --git a/tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt b/tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt index f6e45a381e..05cf926aa1 100644 --- a/tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt +++ b/tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt @@ -40,7 +40,6 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() { Flags.FLAG_ENABLE_SCALING_REVEAL_HOME_ANIMATION, ) setFlagsRule.setFlags(false, Flags.FLAG_ONE_GRID_SPECS) - setFlagsRule.setFlags(false, Flags.FLAG_ENABLE_LAUNCHER_ICON_SHAPES) } @Test diff --git a/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java b/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java index a123170290..38970fe31b 100644 --- a/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java +++ b/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.ContentValues; import android.net.Uri; @@ -37,6 +36,7 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.allapps.AllAppsRecyclerView; import com.android.launcher3.celllayout.FavoriteItemsTransaction; +import com.android.launcher3.dagger.LauncherComponentProvider; import com.android.launcher3.icons.mono.ThemedIconDrawable; import com.android.launcher3.popup.ArrowPopup; import com.android.launcher3.util.BaseLauncherActivityTest; @@ -139,7 +139,7 @@ public class ThemeIconsTest extends BaseLauncherActivityTest { return icon; } - private void setThemeEnabled(boolean isEnabled) throws Exception { + private void setThemeEnabled(boolean isEnabled) { Uri uri = new Uri.Builder() .scheme(ContentResolver.SCHEME_CONTENT) .authority(targetContext().getPackageName() + ".grid_control") @@ -147,11 +147,10 @@ public class ThemeIconsTest extends BaseLauncherActivityTest { .build(); ContentValues values = new ContentValues(); values.put("boolean_value", isEnabled); - try (ContentProviderClient client = targetContext().getContentResolver() - .acquireContentProviderClient(uri)) { - int result = client.update(uri, values, null); - assertTrue(result > 0); - } + + int result = LauncherComponentProvider.get(targetContext()).getGridCustomizationsProxy() + .update(uri, values, null, null); + assertTrue(result > 0); } private void switchToAllApps() { diff --git a/tests/src/com/android/launcher3/widget/picker/OWNERS b/tests/src/com/android/launcher3/widget/picker/OWNERS index 775b0c7d9b..716ab90043 100644 --- a/tests/src/com/android/launcher3/widget/picker/OWNERS +++ b/tests/src/com/android/launcher3/widget/picker/OWNERS @@ -5,7 +5,6 @@ set noparent # # Widget Picker OWNERS -zakcohen@google.com shamalip@google.com wvk@google.com diff --git a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java index ef72a0f6f1..214f1587f5 100644 --- a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java +++ b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java @@ -157,12 +157,7 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { LauncherInstrumentation.Closable c = mLauncher.addContextLayer( "dismissing all tasks")) { final BySelector clearAllSelector = mLauncher.getOverviewObjectSelector("clear_all"); - for (int i = 0; - i < FLINGS_FOR_DISMISS_LIMIT - && !verifyActiveContainer().hasObject(clearAllSelector); - ++i) { - flingForwardImpl(); - } + flingForwardUntilClearAllVisibleImpl(); final Runnable clickClearAll = () -> mLauncher.clickLauncherObject( mLauncher.waitForObjectInContainer(verifyActiveContainer(), @@ -182,6 +177,26 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { } } + /** + * Scrolls until Clear-all button is visible. + */ + public void flingForwardUntilClearAllVisible() { + try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck()) { + flingForwardUntilClearAllVisibleImpl(); + } + } + + private void flingForwardUntilClearAllVisibleImpl() { + try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer( + "flinging forward to clear all")) { + final BySelector clearAllSelector = mLauncher.getOverviewObjectSelector("clear_all"); + for (int i = 0; i < FLINGS_FOR_DISMISS_LIMIT && !verifyActiveContainer().hasObject( + clearAllSelector); ++i) { + flingForwardImpl(); + } + } + } + /** * Touch to the right of current task. This should dismiss overview and go back to Workspace. */ diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 16faf14d86..de31c4dd9a 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -947,7 +947,9 @@ public final class LauncherInstrumentation { waitUntilLauncherObjectGone(WORKSPACE_RES_ID); waitUntilLauncherObjectGone(WIDGETS_RES_ID); waitUntilSystemLauncherObjectGone(OVERVIEW_RES_ID); - waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID); + if (isTransientTaskbar()) { + waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID); + } waitUntilSystemLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID); waitUntilLauncherObjectGone(KEYBOARD_QUICK_SWITCH_RES_ID); diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java index 1158521db2..8fbb5e3172 100644 --- a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java +++ b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java @@ -125,11 +125,11 @@ public final class OverviewTask { return right - left; } - int getTaskCenterX() { + public int getTaskCenterX() { return mTask.getVisibleCenter().x; } - int getTaskCenterY() { + public int getTaskCenterY() { return mTask.getVisibleCenter().y; }