From b9bdc1c6e4e9503f72aa581fddec9b8d62ec3931 Mon Sep 17 00:00:00 2001 From: Pierre Barbier de Reuille Date: Fri, 25 Apr 2025 15:02:12 -0700 Subject: [PATCH 01/15] Use DesktopExperienceFlags instead of DesktopModeFlags for enableRecentsWindowProtoLog Also do not enable that feature in the developer option yet as it is still in development. Fix: 413741378 Test: Build and presubmit Flag: EXEMPT (flag infra) Change-Id: I96f870655405bc3f6dd6352471ea5da785a150bd --- .../quickstep/util/RecentsWindowProtoLogProxy.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/quickstep/src_protolog/com/android/quickstep/util/RecentsWindowProtoLogProxy.java b/quickstep/src_protolog/com/android/quickstep/util/RecentsWindowProtoLogProxy.java index 99888fb2a3..0be88f6b7f 100644 --- a/quickstep/src_protolog/com/android/quickstep/util/RecentsWindowProtoLogProxy.java +++ b/quickstep/src_protolog/com/android/quickstep/util/RecentsWindowProtoLogProxy.java @@ -19,7 +19,7 @@ package com.android.quickstep.util; import static com.android.quickstep.util.QuickstepProtoLogGroup.RECENTS_WINDOW; import static com.android.quickstep.util.QuickstepProtoLogGroup.isProtoLogInitialized; -import android.window.DesktopModeFlags; +import android.window.DesktopExperienceFlags; import androidx.annotation.NonNull; @@ -37,8 +37,13 @@ import com.android.launcher3.Flags; * method. Or, if an existing entry needs to be modified, simply update it here. */ public class RecentsWindowProtoLogProxy { - private static final DesktopModeFlags.DesktopModeFlag ENABLE_RECENTS_WINDOW_PROTO_LOG = - new DesktopModeFlags.DesktopModeFlag(Flags::enableRecentsWindowProtoLog, true); + private static final DesktopExperienceFlags.DesktopExperienceFlag + ENABLE_RECENTS_WINDOW_PROTO_LOG = + new DesktopExperienceFlags.DesktopExperienceFlag( + Flags::enableRecentsWindowProtoLog, + false, + Flags.FLAG_ENABLE_RECENTS_WINDOW_PROTO_LOG); + public static void logOnStateSetStart(@NonNull String stateName) { if (!ENABLE_RECENTS_WINDOW_PROTO_LOG.isTrue() || !isProtoLogInitialized()) return; ProtoLog.d(RECENTS_WINDOW, "onStateSetStart: %s", stateName); From e1a3329c398e42a161d19a040ca3d50b51f30f7b Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Wed, 30 Apr 2025 16:40:46 -0400 Subject: [PATCH 02/15] Use LauncherPrefs for stashed handle region dark. Flag: EXEMPT refactor Bug: 324485921 Test: go/testedequals Change-Id: Ib69ba1595eadd318521c88069cd867988f66c4bc --- .../taskbar/StashedHandleViewController.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java index 0fa5fd5370..20a049313a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java @@ -17,6 +17,8 @@ package com.android.launcher3.taskbar; import static android.view.Display.DEFAULT_DISPLAY; +import static com.android.launcher3.EncryptionType.ENCRYPTED; +import static com.android.launcher3.LauncherPrefs.nonRestorableItem; import static com.android.launcher3.taskbar.Utilities.getShapedTaskbarRadius; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; @@ -24,13 +26,13 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.content.Context; -import android.content.SharedPreferences; import android.content.res.Resources; import android.graphics.Outline; import android.graphics.Rect; import android.view.View; import android.view.ViewOutlineProvider; +import com.android.launcher3.ConstantItem; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Flags; import com.android.launcher3.LauncherPrefs; @@ -69,8 +71,11 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT private static final String SHARED_PREFS_STASHED_HANDLE_REGION_DARK_KEY = "stashed_handle_region_is_dark"; + private static final ConstantItem STASHED_HANDLE_REGION_IS_DARK = + nonRestorableItem(SHARED_PREFS_STASHED_HANDLE_REGION_DARK_KEY, false, ENCRYPTED); + private final TaskbarActivityContext mActivity; - private final SharedPreferences mPrefs; + private final LauncherPrefs mPrefs; private final StashedHandleView mStashedHandleView; private int mStashedHandleWidth; private final int mStashedHandleHeight; @@ -104,13 +109,12 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT public StashedHandleViewController(TaskbarActivityContext activity, StashedHandleView stashedHandleView) { mActivity = activity; - mPrefs = LauncherPrefs.getPrefs(mActivity); + mPrefs = LauncherPrefs.get(mActivity); mStashedHandleView = stashedHandleView; mTaskbarStashedHandleAlpha = new MultiValueAlpha(mStashedHandleView, NUM_ALPHA_CHANNELS); mTaskbarStashedHandleAlpha.setUpdateVisibility(true); mStashedHandleView.updateHandleColor( - mPrefs.getBoolean(SHARED_PREFS_STASHED_HANDLE_REGION_DARK_KEY, false), - false /* animate */); + mPrefs.get(STASHED_HANDLE_REGION_IS_DARK), false /* animate */); final Resources resources = mActivity.getResources(); mStashedHandleHeight = resources.getDimensionPixelSize( R.dimen.taskbar_stashed_handle_height); @@ -184,8 +188,7 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT @Override public void onRegionDarknessChanged(boolean isRegionDark) { mStashedHandleView.updateHandleColor(isRegionDark, true /* animate */); - mPrefs.edit().putBoolean(SHARED_PREFS_STASHED_HANDLE_REGION_DARK_KEY, - isRegionDark).apply(); + mPrefs.put(STASHED_HANDLE_REGION_IS_DARK, isRegionDark); } @Override From 9ec1c5f691abf4ba423c989abcc347efb2d78e44 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 30 Apr 2025 16:06:50 -0700 Subject: [PATCH 03/15] Using List instead of ArrayList in CollectionInfo to avoid typecast in subclasses Bug: 390572144 Test: Presubmit Flag: EXEMPT refactor Change-Id: I57c1a7c0c0ea32e710e1d7c03f249f84fc937196 --- .../launcher3/model/FirstScreenBroadcast.java | 2 +- .../launcher3/model/FirstScreenBroadcastHelper.kt | 2 +- src/com/android/launcher3/model/data/AppPairInfo.kt | 13 +++++-------- .../android/launcher3/model/data/CollectionInfo.kt | 6 +++--- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java index 829e0fe08b..a15deeabdd 100644 --- a/src/com/android/launcher3/model/FirstScreenBroadcast.java +++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java @@ -185,7 +185,7 @@ public class FirstScreenBroadcast { * is always modified on UI thread. */ @AnyThread - private static List cloneOnMainThread(ArrayList list) { + private static List cloneOnMainThread(List list) { try { return MAIN_EXECUTOR.submit(() -> new ArrayList(list)).get(); } catch (Exception e) { diff --git a/src/com/android/launcher3/model/FirstScreenBroadcastHelper.kt b/src/com/android/launcher3/model/FirstScreenBroadcastHelper.kt index 6ad52ea92b..cb29603af7 100644 --- a/src/com/android/launcher3/model/FirstScreenBroadcastHelper.kt +++ b/src/com/android/launcher3/model/FirstScreenBroadcastHelper.kt @@ -348,7 +348,7 @@ object FirstScreenBroadcastHelper { * always modified on UI thread. */ @AnyThread - private fun cloneOnMainThread(list: ArrayList): List { + private fun cloneOnMainThread(list: List): List { return try { return Executors.MAIN_EXECUTOR.submit> { ArrayList(list) } .get() diff --git a/src/com/android/launcher3/model/data/AppPairInfo.kt b/src/com/android/launcher3/model/data/AppPairInfo.kt index c0fe4fded8..49273fedd3 100644 --- a/src/com/android/launcher3/model/data/AppPairInfo.kt +++ b/src/com/android/launcher3/model/data/AppPairInfo.kt @@ -23,11 +23,10 @@ import com.android.launcher3.R import com.android.launcher3.icons.IconCache import com.android.launcher3.logger.LauncherAtom import com.android.launcher3.views.ActivityContext -import java.util.stream.Collectors /** A type of app collection that launches multiple apps into split screen. */ class AppPairInfo() : CollectionInfo() { - private var contents: ArrayList = ArrayList() + private var contents = mutableListOf() init { itemType = LauncherSettings.Favorites.ITEM_TYPE_APP_PAIR @@ -40,7 +39,7 @@ class AppPairInfo() : CollectionInfo() { /** Creates a new AppPairInfo that is a copy of the provided one. */ constructor(appPairInfo: AppPairInfo) : this() { - contents = appPairInfo.contents.clone() as ArrayList + contents = appPairInfo.contents.toMutableList() copyFrom(appPairInfo) } @@ -54,11 +53,10 @@ class AppPairInfo() : CollectionInfo() { } /** Returns the app pair's member apps as an ArrayList of [ItemInfo]. */ - override fun getContents(): ArrayList = - ArrayList(contents.stream().map { it as ItemInfo }.collect(Collectors.toList())) + override fun getContents(): List = contents.map { it } /** Returns the app pair's member apps as an ArrayList of [WorkspaceItemInfo]. */ - override fun getAppContents(): ArrayList = contents + override fun getAppContents(): List = contents /** Returns the first app in the pair. */ fun getFirstApp() = contents[0] @@ -82,9 +80,8 @@ class AppPairInfo() : CollectionInfo() { /** Fetches high-res icons for member apps if needed. */ fun fetchHiResIconsIfNeeded(iconCache: IconCache) { getAppContents() - .stream() .filter { it.matchingLookupFlag.isVisuallyLessThan(DESKTOP_ICON_FLAG) } - .forEach { member -> iconCache.getTitleAndIcon(member, DESKTOP_ICON_FLAG) } + .forEach { iconCache.getTitleAndIcon(it, DESKTOP_ICON_FLAG) } } /** diff --git a/src/com/android/launcher3/model/data/CollectionInfo.kt b/src/com/android/launcher3/model/data/CollectionInfo.kt index 12ba164713..0b42587e47 100644 --- a/src/com/android/launcher3/model/data/CollectionInfo.kt +++ b/src/com/android/launcher3/model/data/CollectionInfo.kt @@ -25,17 +25,17 @@ abstract class CollectionInfo : ItemInfo() { abstract fun add(item: ItemInfo) /** Returns the collection's contents as an ArrayList of [ItemInfo]. */ - abstract fun getContents(): ArrayList + abstract fun getContents(): List /** * Returns the collection's contents as an ArrayList of [WorkspaceItemInfo]. Does not include * other collection [ItemInfo]s that are inside this collection; rather, it should collect * *their* contents and adds them to the ArrayList. */ - abstract fun getAppContents(): ArrayList + abstract fun getAppContents(): List /** Convenience function. Checks contents to see if any match a given predicate. */ - fun anyMatch(matcher: Predicate) = getContents().stream().anyMatch(matcher) + fun anyMatch(matcher: Predicate) = getContents().any { matcher.test(it) } override fun onAddToDatabase(writer: ContentWriter) { super.onAddToDatabase(writer) From 033c8535c7d4c514f29b91ec77a51012c0c25947 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Thu, 1 May 2025 14:58:33 +0100 Subject: [PATCH 04/15] Don't consider IME insets in mSystemGestureRegion - A recent change applied IME insets equal to keyboard's height to Launcher's BaseDragLayer - mSystemGestureRegion takes a max of both IME insets and gesture insets, and caused a bug that while a live tile have keyboard open is in Overview, bottom half of the screen ignored touches to dismiss the task - The bug that ointroduceds IME insets consideration no longer repros, thus removing IME insets from mSystemGestureRegion to sovle the issue Fix: 404376494 Test: manual Flag: EXEMPT bug fix Change-Id: I5d8861ea204df9898b10cb7ccdeba94e94e5909c --- .../android/launcher3/views/BaseDragLayer.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java index d465b4071c..75794189ae 100644 --- a/src/com/android/launcher3/views/BaseDragLayer.java +++ b/src/com/android/launcher3/views/BaseDragLayer.java @@ -38,7 +38,6 @@ import android.view.accessibility.AccessibilityEvent; import android.widget.FrameLayout; import com.android.launcher3.AbstractFloatingView; -import com.android.launcher3.DeviceProfile; import com.android.launcher3.InsettableFrameLayout; import com.android.launcher3.Utilities; import com.android.launcher3.testing.shared.ResourceUtils; @@ -559,20 +558,13 @@ public abstract class BaseDragLayer @Override public WindowInsets dispatchApplyWindowInsets(WindowInsets insets) { Insets gestureInsets = insets.getMandatorySystemGestureInsets(); - int gestureInsetBottom = gestureInsets.bottom; - Insets imeInset = insets.getInsets(WindowInsets.Type.ime()); - DeviceProfile dp = mContainer.getDeviceProfile(); - if (dp.isTaskbarPresent) { + mSystemGestureRegion.set(gestureInsets.left, gestureInsets.top, gestureInsets.right, + gestureInsets.bottom); + if (mContainer.getDeviceProfile().isTaskbarPresent) { // Ignore taskbar gesture insets to avoid interfering with TouchControllers. - gestureInsetBottom = ResourceUtils.getNavbarSize( + mSystemGestureRegion.bottom = ResourceUtils.getNavbarSize( ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, getResources()); } - mSystemGestureRegion.set( - Math.max(gestureInsets.left, imeInset.left), - Math.max(gestureInsets.top, imeInset.top), - Math.max(gestureInsets.right, imeInset.right), - Math.max(gestureInsetBottom, imeInset.bottom) - ); return super.dispatchApplyWindowInsets(insets); } } From 011422cdb41bbb33c9c0f024184976633ac3f99d Mon Sep 17 00:00:00 2001 From: Ajinkya Chalke Date: Thu, 1 May 2025 15:13:36 +0000 Subject: [PATCH 05/15] Skip already running check when switching in KQS - In KQS existing code there is a check that returns early if a user is trying to switch to a running task. This check returns true for a task that is not running thus creating an issue when user tries to switch to that task using KQS. - While the root cause of the issue will take time to fix, this temporary check ensures that we workaround it when flatenning heirarchy feature is enabled. This issue happens when multi-desk backend flag is true and flatenning flag will always be true when multi-desk is true (given how the features are timed for release). Flag: com.android.launcher3.enable_alt_tab_kqs_flatenning Test: m Bug: 414410702 Change-Id: Ia35d6706a1512efbb4feca0128a9d59cd930df2f --- .../taskbar/KeyboardQuickSwitchViewController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java index d31051dda4..679fa3e3dc 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java @@ -281,16 +281,18 @@ public class KeyboardQuickSwitchViewController { if (task == null) { return mOnDesktop ? 1 : Math.max(0, index); } - if (mControllerCallbacks.isTaskRunning(task)) { - // Ignore attempts to run the selected task if it is already running. - return -1; - } if (enableAltTabKqsFlatenning.isTrue() && tryLaunchingCombinedTask(task, slideInTransition, systemUiProxy)) { return -1; } + // TODO b/414410702: move this check to before tryLaunchingCombinedTask() call. + if (mControllerCallbacks.isTaskRunning(task)) { + // Ignore attempts to run the selected task if it is already running. + return -1; + } + RemoteTransition remoteTransition = slideInTransition; boolean canUnminimizeDesktopTask = task instanceof SingleTask singleTask && mControllers.taskbarActivityContext.canUnminimizeDesktopTask( From 42d6c08d41cffa3f172bb4672649bea123cdcdf9 Mon Sep 17 00:00:00 2001 From: Schneider Victor-Tulias Date: Tue, 22 Apr 2025 15:54:12 -0400 Subject: [PATCH 06/15] Move ExtendedLongPressTimeoutRule implementation to shared sysui test library Flag: EXEMPT test fix Fixes: 396862825 Test: TaskbarExpandCollapse Change-Id: I950ed4ede8db150234d843422982792f5b6bfd8e --- Android.bp | 6 +- .../quickstep/FallbackRecentsTest.java | 2 +- .../launcher3/ui/BaseLauncherTaplTest.java | 2 +- .../rule/ExtendedLongPressTimeoutRule.java | 88 ------------------- .../launcher3/testing/BuildConfig.java | 24 +++++ 5 files changed, 30 insertions(+), 92 deletions(-) delete mode 100644 tests/src/com/android/launcher3/util/rule/ExtendedLongPressTimeoutRule.java create mode 100644 tests/src_tapl_build_config/com/android/launcher3/testing/BuildConfig.java diff --git a/Android.bp b/Android.bp index cc8a8c875d..4ef905c15e 100644 --- a/Android.bp +++ b/Android.bp @@ -312,6 +312,8 @@ android_library { srcs: [ "tests/tapl/**/*.java", "tests/tapl/**/*.kt", + "tests/src_tapl_build_config/**/*.java", + "tests/src_tapl_build_config/**/*.kt", ], resource_dirs: [], manifest: "tests/tapl/AndroidManifest.xml", @@ -404,7 +406,7 @@ android_library { "com_android_systemui_shared_flags_lib", "launcher-dagger-qualifiers", "launcher-executor-qualifiers", - "launcher-executors-module" + "launcher-executors-module", ], manifest: "AndroidManifest-common.xml", sdk_version: "current", @@ -430,7 +432,7 @@ android_app { srcs: [ ":launcher-src", ":launcher-src_no_quickstep", - ":launcher-build-config" + ":launcher-build-config", ], optimize: { diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java index d1645ac445..6a28a974e4 100644 --- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java +++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java @@ -41,6 +41,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.os.RemoteException; +import android.platform.test.rule.ExtendedLongPressTimeoutRule; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; @@ -57,7 +58,6 @@ import com.android.launcher3.testcomponent.TestCommandReceiver; import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.util.TestUtil; import com.android.launcher3.util.Wait; -import com.android.launcher3.util.rule.ExtendedLongPressTimeoutRule; import com.android.launcher3.util.rule.FailureWatcher; import com.android.launcher3.util.rule.MutualExclusionRule; import com.android.launcher3.util.rule.SamplerRule; diff --git a/tests/src/com/android/launcher3/ui/BaseLauncherTaplTest.java b/tests/src/com/android/launcher3/ui/BaseLauncherTaplTest.java index c9577dbf52..59800ecf6f 100644 --- a/tests/src/com/android/launcher3/ui/BaseLauncherTaplTest.java +++ b/tests/src/com/android/launcher3/ui/BaseLauncherTaplTest.java @@ -40,6 +40,7 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; import android.platform.test.flag.junit.SetFlagsRule; +import android.platform.test.rule.ExtendedLongPressTimeoutRule; import android.platform.test.rule.LimitDevicesRule; import android.util.Log; @@ -57,7 +58,6 @@ import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.tapl.TestHelpers; import com.android.launcher3.util.TestUtil; import com.android.launcher3.util.Wait; -import com.android.launcher3.util.rule.ExtendedLongPressTimeoutRule; import com.android.launcher3.util.rule.FailureWatcher; import com.android.launcher3.util.rule.MutualExclusionRule; import com.android.launcher3.util.rule.SamplerRule; diff --git a/tests/src/com/android/launcher3/util/rule/ExtendedLongPressTimeoutRule.java b/tests/src/com/android/launcher3/util/rule/ExtendedLongPressTimeoutRule.java deleted file mode 100644 index b04df7ec01..0000000000 --- a/tests/src/com/android/launcher3/util/rule/ExtendedLongPressTimeoutRule.java +++ /dev/null @@ -1,88 +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.util.rule; - -import static com.android.launcher3.util.TestUtil.grantWriteSecurePermission; - -import android.content.ContentResolver; -import android.provider.Settings; -import android.util.Log; -import android.view.ViewConfiguration; - -import androidx.test.InstrumentationRegistry; - -import com.android.launcher3.BuildConfig; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -/** - * Increases the device's long-press timeout in remote tests to reduce flakiness in slow-running - * devices. - */ -public class ExtendedLongPressTimeoutRule implements TestRule { - - private static final String TAG = "ExtendedLongPressTimeoutRule"; - - private static final float LONG_PRESS_TIMEOUT_MULTIPLIER = 10f; - - @Override - public Statement apply(Statement base, Description description) { - if (BuildConfig.IS_STUDIO_BUILD) { - // Skip rule on studio builds since cancelling a test run will not run the finally block - return base; - } - return new Statement() { - @Override - public void evaluate() throws Throwable { - ContentResolver contentResolver = InstrumentationRegistry.getInstrumentation() - .getContext() - .getContentResolver(); - int prevLongPressTimeout = Settings.Secure.getInt( - contentResolver, - Settings.Secure.LONG_PRESS_TIMEOUT, - ViewConfiguration.getLongPressTimeout()); - int newLongPressTimeout = - (int) (prevLongPressTimeout * LONG_PRESS_TIMEOUT_MULTIPLIER); - - try { - Log.d(TAG, "In try-block: Setting long press timeout from " - + prevLongPressTimeout + "ms to " + newLongPressTimeout + "ms"); - grantWriteSecurePermission(); - Settings.Secure.putInt( - contentResolver, - Settings.Secure.LONG_PRESS_TIMEOUT, - (int) (prevLongPressTimeout * LONG_PRESS_TIMEOUT_MULTIPLIER)); - - base.evaluate(); - } catch (Exception e) { - Log.e(TAG, "Error", e); - throw e; - } finally { - Log.d(TAG, "In finally-block: resetting long press timeout to " - + prevLongPressTimeout + "ms"); - grantWriteSecurePermission(); - Settings.Secure.putInt( - contentResolver, - Settings.Secure.LONG_PRESS_TIMEOUT, - prevLongPressTimeout); - } - } - }; - } -} diff --git a/tests/src_tapl_build_config/com/android/launcher3/testing/BuildConfig.java b/tests/src_tapl_build_config/com/android/launcher3/testing/BuildConfig.java new file mode 100644 index 0000000000..b60f517953 --- /dev/null +++ b/tests/src_tapl_build_config/com/android/launcher3/testing/BuildConfig.java @@ -0,0 +1,24 @@ +/* + * 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.testing; + +public final class BuildConfig { + public static final boolean DEBUG = Boolean.parseBoolean("true"); + + // Field from default config. + public static final boolean IS_STUDIO_BUILD = false; +} From a56aa0d539fa2aef08e441186fc52efa26e96e8e Mon Sep 17 00:00:00 2001 From: Schneider Victor-Tulias Date: Thu, 1 May 2025 16:04:32 -0400 Subject: [PATCH 07/15] Update TAPL tests to dismiss all tasks safely Flag: EXEMPT test refactor Bug: 377678992 Test: pre/post-submit tests Change-Id: I6a2225bea4f004bdc598e2c67ce26da9fd42f7a6 --- .../com/android/quickstep/TaplTestsKeyboardQuickSwitch.java | 2 +- .../src/com/android/quickstep/TaplTestsOverviewDesktop.kt | 5 +---- .../tests/src/com/android/quickstep/TaplTestsQuickstep.java | 4 ++-- tests/tapl/com/android/launcher3/tapl/BaseOverview.java | 4 ++++ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java b/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java index 3c4f1d9c6c..6f8600d637 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java @@ -152,7 +152,7 @@ public class TaplTestsKeyboardQuickSwitch extends AbstractQuickStepTest { @Test public void testLaunchSingleRecentTask() { - mLauncher.getLaunchedAppState().switchToOverview().dismissAllTasks(); + clearAllRecentTasks(); startAppFast(CALCULATOR_APP_PACKAGE); mLauncher.goHome().showQuickSwitchView().launchFocusedAppTask(CALCULATOR_APP_PACKAGE); } diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsOverviewDesktop.kt b/quickstep/tests/src/com/android/quickstep/TaplTestsOverviewDesktop.kt index 88d0969239..8c02340ce0 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsOverviewDesktop.kt +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsOverviewDesktop.kt @@ -35,10 +35,7 @@ import org.junit.Test class TaplTestsOverviewDesktop : AbstractQuickStepTest() { @Before fun setup() { - val overview = mLauncher.goHome().switchToOverview() - if (overview.hasTasks()) { - overview.dismissAllTasks() - } + clearAllRecentTasks() startTestAppsWithCheck() mLauncher.goHome() } diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index ede2aa24b4..560a28c1f2 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -548,7 +548,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @EnableFlags(value = Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW) public void testDismissBottomRow() throws Exception { assumeTrue(mLauncher.isTablet()); - mLauncher.goHome().switchToOverview().dismissAllTasks(); + clearAllRecentTasks(); startTestAppsWithCheck(); Overview overview = mLauncher.goHome().switchToOverview(); @@ -570,7 +570,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @EnableFlags(value = Flags.FLAG_ENABLE_GRID_ONLY_OVERVIEW) public void testDismissLastGridRow() throws Exception { assumeTrue(mLauncher.isTablet()); - mLauncher.goHome().switchToOverview().dismissAllTasks(); + clearAllRecentTasks(); startTestAppsWithCheck(); startTestActivity(3); startTestActivity(4); diff --git a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java index f27c25a159..176f81c418 100644 --- a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java +++ b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java @@ -151,6 +151,10 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { /** * Dismissed all tasks by scrolling to Clear-all button and pressing it. + *

+ * NOTE: Fails if there are already no recent tasks. If a test needs to start with an empty task + * list, check {@link #hasTasks} before calling this since the previous test may have already + * cleared the task list. */ public void dismissAllTasks() { try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck(); From 3818462d0e585c24de2b36d4eb5f2a35bd840b74 Mon Sep 17 00:00:00 2001 From: Schneider Victor-Tulias Date: Thu, 1 May 2025 14:43:33 -0400 Subject: [PATCH 08/15] Fix recents window activity leak - When we clean up the recents window, the recents view gets dettached, which causes a activity leak in tests and prod through RecentsView.mOnTaskLaunchCancelledRunnable. Fixing this leak across all uses of RecentsView, rather than just for RecentsWindowManager - Also cleaning up a potential leak in RecentsWindowManager.callbacks Flag: com.android.launcher3.enable_launcher_overview_in_window Flag: com.android.launcher3.enable_fallback_overview_in_window Bug: 377678992 Bug: 292269949 Test: swiped up from running app, checked leak canary and heap dump; pre/post-submit tests Change-Id: Id95b36dad6e41e5b21d1af8ede489f84ef987e50 --- .../android/quickstep/fallback/window/RecentsWindowManager.kt | 1 + quickstep/src/com/android/quickstep/views/RecentsView.java | 1 + 2 files changed, 2 insertions(+) diff --git a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt index f2459b617a..42754c3bc9 100644 --- a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt +++ b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt @@ -343,6 +343,7 @@ constructor( } stateManager.moveToRestState() callbacks?.removeListener(recentsAnimationListener) + callbacks = null } private fun isShowing(): Boolean { diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index d0e9888e98..90ffa1682e 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -1289,6 +1289,7 @@ public abstract class RecentsView< if (mDesktopVisibilityController != null) { mDesktopVisibilityController.unregisterDesktopVisibilityListener(mUtils); } + mOnTaskLaunchCancelledRunnable = null; reset(); } From 9b0d61a803258b4f07cf743f4d8e94439364f6e1 Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Thu, 1 May 2025 13:29:18 -0700 Subject: [PATCH 09/15] Failures caught by launcher.checkForAnomaly did not produce screenshots. Fix to handle failures caught by launcher.checkForAnomaly so that they are also reported to the test watcher. Bug: 406906811 Test: presubmit Flag: NONE Not production code Change-Id: I379fcf09e3cd2e6321be9f4bc3dd6f3272e9c2fd --- .../android/quickstep/NavigationModeSwitchRule.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java index c713c3dc9a..ef7183fc88 100644 --- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java +++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java @@ -205,12 +205,16 @@ public class NavigationModeSwitchRule implements TestRule { private static void assertTrue(LauncherInstrumentation launcher, String message, boolean condition, Description description) { - launcher.checkForAnomaly(true, true); - if (!condition) { + try { + launcher.checkForAnomaly(true, true); + if (!condition) { + throw new AssertionError(message); + } + } catch (Throwable e) { if (description != null) { FailureWatcher.onError(launcher, description); } - throw new AssertionError(message); + throw e; } } } From 4fde59e82127ffc93a46c6bbd6e9d47f3481c5ad Mon Sep 17 00:00:00 2001 From: Jagrut Desai Date: Wed, 23 Apr 2025 11:11:48 -0700 Subject: [PATCH 10/15] Tapl widget change - scroll if the header is under gesture region and click in same scroll loop Test: Local, Presubmit Bug: 402828709 Flag: EXEMPT bugfix Change-Id: I90a5cf2829591aafd18ef625244def2c4d9e3980 --- tests/tapl/com/android/launcher3/tapl/Widgets.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java index ac2748e6a1..acf4c6c2b2 100644 --- a/tests/tapl/com/android/launcher3/tapl/Widgets.java +++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java @@ -254,6 +254,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer targetAppSelector); final UiObject2 searchBar = findSearchBar(); + // If header's title is under or above search bar, let's not process the header yet, // scroll a bit more to bring the header into visible area. if (headerTitle != null @@ -270,6 +271,14 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer // to briefly appear to handle the gesture, which can break our test. boolean isHeaderOutOfGestureRegion = headerTitle.getVisibleCenter().y < mLauncher.getBottomGestureStartOnScreen(); + + if (!isHeaderOutOfGestureRegion) { + log("Test app's header is not out of gesture region, scrolling up"); + mLauncher.scrollDownByDistance(widgetListView, scrollDistance); + isHeaderOutOfGestureRegion = true; + } + + if (!hasHeaderExpanded && isHeaderOutOfGestureRegion) { log("Header has not been expanded. Click to expand."); hasHeaderExpanded = true; @@ -286,6 +295,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer UiObject2 widgetsContainer = mLauncher.findObjectInContainer( rightPane != null ? rightPane : widgetListView, widgetsContainerSelector); + if (widgetsContainer != null) { log("Widgets container found."); return widgetsContainer; From 98ce0f4ccb7a3c38db6e919d4fb4bc9fe74cfe1b Mon Sep 17 00:00:00 2001 From: Ajinkya Chalke Date: Thu, 1 May 2025 16:16:19 -0700 Subject: [PATCH 11/15] Ignore KeyboardQuickSwitchControllerTest to fix robo failure Bug: 413540825 Flag: EXEMPT ignoring test Test: atest Change-Id: I75a15563fbc8cc500df73c9b1d1e9bf2e2d378b8 --- .../launcher3/taskbar/KeyboardQuickSwitchControllerTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/KeyboardQuickSwitchControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/KeyboardQuickSwitchControllerTest.kt index 75dfbdaa08..1bfa527bc5 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/KeyboardQuickSwitchControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/KeyboardQuickSwitchControllerTest.kt @@ -60,6 +60,7 @@ import com.android.wm.shell.shared.split.SplitScreenConstants import com.google.common.truth.Truth.assertThat import dagger.BindsInstance import dagger.Component +import org.junit.Ignore; import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -75,6 +76,7 @@ import org.mockito.kotlin.whenever @RunWith(LauncherMultivalentJUnit::class) @EmulatedDevices(["pixelTablet2023"]) +@Ignore("b/413540825") class KeyboardQuickSwitchControllerTest { private var systemUiProxySpy: SystemUiProxy? = null private var desktopTaskListener: IDesktopTaskListener? = null From b9d3a5cc447a4d05b677192a304c88bf2a71d9bf Mon Sep 17 00:00:00 2001 From: Xiaoqian Dai Date: Thu, 1 May 2025 23:46:46 +0000 Subject: [PATCH 12/15] desktop-exploded-view: temporarily disable the functionality... ... to launch an individual task window from desktop tile in Overview when multi-desks is enabled, until the fix for b/413378320 is landed. Note the changes in http://ag/q/topic:%22activate-window-from-exploded-view%22 is the right implementation, however it will only work for multi-desks with the fix for b/413378320 is in place. Flag: com.android.launcher3.enable_desktop_exploded_view Test: Manual Bug: 413378320 Change-Id: I72914d60fb0ec2e80af6faa7441a67e743720c38 --- quickstep/src/com/android/quickstep/views/DesktopTaskView.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt index 93df80418a..7aa24a9d60 100644 --- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt +++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt @@ -402,7 +402,10 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu } else { taskContentView } - if (enableDesktopExplodedView()) { + if (enableDesktopExplodedView() && !enableMultipleDesktops(context)) { + // Note, currently there are some issues with launching an individual app window + // with multi-desks enabled, see b/413378320. Will enable this functionality + // after b/413378320 is fixed. snapshotView.setOnClickListener { launchTaskWithDesktopController(animated = true, task.key.id) } From d61655141975e6939a7e5e0bbab85d7e430a658d Mon Sep 17 00:00:00 2001 From: Ajinkya Chalke Date: Thu, 1 May 2025 21:15:03 +0000 Subject: [PATCH 13/15] Only use RecentsWindowManager instances for CDs Bug: 414767197 Test: m Flag: com.android.window.flags.enable_taskbar_connected_displays Change-Id: I8f2f143ef8ca885c089b83559899746ac594400a --- .../src/com/android/launcher3/taskbar/TaskbarManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java index fd3fc47262..cb59ec42c0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java @@ -729,10 +729,10 @@ public class TaskbarManagerImpl implements DisplayDecorationListener { /** Creates a {@link TaskbarUIController} to use with non default displays. */ private TaskbarUIController createTaskbarUIControllerForNonDefaultDisplay(int displayId) { - debugPrimaryTaskbar("createTaskbarUIControllerForNonDefaultDisplay"); + debugTaskbarManager("createTaskbarUIControllerForNonDefaultDisplay", displayId); RecentsViewContainer rvc = OverviewComponentObserver.INSTANCE.get( mBaseContext).getContainerInterface(displayId).getCreatedContainer(); - if (rvc != null) { + if (rvc instanceof RecentsWindowManager) { return createTaskbarUIControllerForRecentsViewContainer(rvc); } From 46b13eb18490e37e2b01c36cce6e2f369eac4078 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 21 Apr 2025 14:04:18 -0700 Subject: [PATCH 14/15] Moving WorkspaceItemFactory to dagger as PredictedItemFactory so that it can be reused Bug: 390572144 Flag: EXEMPTY refactor Test: Presubmit Change-Id: I41c5fea73452d7f4c1fd9980a89bcb7199eb19d7 --- .../launcher3/model/PredictedItemFactory.kt | 187 ++++++++++ .../launcher3/model/PredictionUpdateTask.java | 1 - .../model/QuickstepModelDelegate.java | 345 +++--------------- .../model/WidgetsPredictionUpdateTask.java | 1 - .../model/QuickstepModelDelegateTest.kt | 20 +- .../WidgetsPredicationUpdateTaskTest.java | 1 - src/com/android/launcher3/LauncherModel.kt | 5 - .../android/launcher3/model/LoaderTask.java | 9 +- .../launcher3/model/ModelDelegate.java | 24 +- .../launcher3/model/ModelInitializer.kt | 4 +- .../model/ReloadStringCacheTask.java | 9 +- .../android/launcher3/model/LoaderTaskTest.kt | 4 +- 12 files changed, 270 insertions(+), 340 deletions(-) create mode 100644 quickstep/src/com/android/launcher3/model/PredictedItemFactory.kt diff --git a/quickstep/src/com/android/launcher3/model/PredictedItemFactory.kt b/quickstep/src/com/android/launcher3/model/PredictedItemFactory.kt new file mode 100644 index 0000000000..47959bf086 --- /dev/null +++ b/quickstep/src/com/android/launcher3/model/PredictedItemFactory.kt @@ -0,0 +1,187 @@ +/* + * 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.prediction.AppPredictionContext +import android.app.prediction.AppPredictionManager +import android.app.prediction.AppPredictor +import android.app.prediction.AppTarget +import android.app.prediction.AppTargetEvent +import android.content.Context +import android.content.Intent +import android.content.pm.LauncherApps +import android.content.pm.ShortcutInfo +import android.os.UserHandle +import android.os.UserManager +import androidx.annotation.VisibleForTesting +import com.android.launcher3.LauncherModel +import com.android.launcher3.LauncherModel.ModelUpdateTask +import com.android.launcher3.LauncherSettings.Favorites +import com.android.launcher3.dagger.ApplicationContext +import com.android.launcher3.icons.IconCache +import com.android.launcher3.icons.cache.CacheLookupFlag +import com.android.launcher3.model.data.AppInfo +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.ShortcutKey +import com.android.launcher3.shortcuts.ShortcutRequest +import com.android.launcher3.util.ApiWrapper +import com.android.launcher3.util.Executors.MODEL_EXECUTOR +import com.android.launcher3.util.PackageManagerHelper +import com.android.launcher3.util.PersistedItemArray +import com.android.launcher3.util.PersistedItemArray.ItemFactory +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject + +/** [PersistedItemArray.ItemFactory] to parse predicted items */ +class PredictedItemFactory +@AssistedInject +constructor( + @ApplicationContext private val context: Context, + private val pmHelper: PackageManagerHelper, + private val userCache: UserCache, + private val apiWrapper: ApiWrapper, + private val iconCache: IconCache, + @Assisted private val maxItemCount: Int, + @Assisted private val predictorState: PredictorState, +) : ItemFactory { + + private val quietModeCache = mutableMapOf() + // Number of items persisted can be different than what is needed if the grid changed between + // the two operations + private var readCount = 0 + + override fun createInfo(itemType: Int, user: UserHandle, intent: Intent): ItemInfo? { + if (readCount >= maxItemCount) { + return null + } + when (itemType) { + Favorites.ITEM_TYPE_APPLICATION -> { + val lai = + context + .getSystemService(LauncherApps::class.java) + ?.resolveActivity(intent, user) ?: return null + val info = + AppInfo( + lai, + userCache.getUserInfo(user), + apiWrapper, + pmHelper, + quietModeCache.getOrPut(user) { + context + .getSystemService(UserManager::class.java) + ?.isQuietModeEnabled(user) ?: true + }, + ) + info.container = predictorState.containerId + iconCache.getTitleAndIcon(info, lai, predictorState.lookupFlag) + readCount++ + return info.makeWorkspaceItem(context) + } + + Favorites.ITEM_TYPE_DEEP_SHORTCUT -> { + val key = ShortcutKey.fromIntent(intent, user) ?: return null + val si: ShortcutInfo = + key.buildRequest(context).query(ShortcutRequest.PINNED).getOrNull(0) + ?: return null + val wii = WorkspaceItemInfo(si, context) + wii.container = predictorState.containerId + iconCache.getShortcutIcon(wii, si) + readCount++ + return wii + } + } + return null + } + + @AssistedFactory + interface Factory { + fun newParser(maxItemCount: Int, predictorState: PredictorState): PredictedItemFactory + } +} + +/** Class to manage predicted items for a particular prediction type */ +class PredictorState( + @JvmField val containerId: Int, + storageName: String, + @JvmField val lookupFlag: CacheLookupFlag, +) { + + @JvmField val storage: PersistedItemArray = PersistedItemArray(storageName) + + @VisibleForTesting var predictor: AppPredictor? = null + + private var lastTargets: List = emptyList() + + /** Creates and registers a predictor, and destroys any previously created predictor */ + fun registerPredictor( + ctx: Context, + predictionContext: AppPredictionContext, + model: LauncherModel, + taskFactory: (PredictorState, List) -> ModelUpdateTask, + ) { + destroyPredictor() + + val apm = ctx.getSystemService(AppPredictionManager::class.java) ?: return + lastTargets = emptyList() + + predictor = + apm.createAppPredictionSession(predictionContext).apply { + registerPredictionUpdates(MODEL_EXECUTOR) { + val oldTargets = lastTargets + lastTargets = it + + // If no diff, skip + if ( + oldTargets.size != lastTargets.size || + oldTargets.zip(lastTargets).any { (a1, a2) -> + !areAppTargetsSame(a1, a2) + } + ) { + model.enqueueModelUpdateTask(taskFactory.invoke(this@PredictorState, it)) + } + } + requestPredictionUpdate() + } + } + + /** Destroys a previously created predictor */ + fun destroyPredictor() { + predictor?.destroy() + predictor = null + } + + /** see [AppPredictor.requestPredictionUpdate] */ + fun requestPredictionUpdate() = predictor?.requestPredictionUpdate() + + /** see [AppPredictor.notifyAppTargetEvent] */ + fun notifyAppTargetEvent(event: AppTargetEvent) = predictor?.notifyAppTargetEvent(event) + + /** Compares two targets for the properties which we care about */ + private fun areAppTargetsSame(t1: AppTarget, t2: AppTarget): Boolean { + if ( + (t1.packageName != t2.packageName) || + (t1.user != t2.user) || + (t1.className != t2.className) + ) { + return false + } + return t1.shortcutInfo?.id == t2.shortcutInfo?.id + } +} diff --git a/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java index a2c680a682..ce02bd7384 100644 --- a/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java +++ b/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java @@ -35,7 +35,6 @@ import com.android.launcher3.LauncherModel.ModelUpdateTask; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.BgDataModel.FixedContainerItems; -import com.android.launcher3.model.QuickstepModelDelegate.PredictorState; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java index ba04b7d7ee..3028f9bf35 100644 --- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java +++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java @@ -24,8 +24,6 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.DESKTOP_ICON_FLAG; -import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION; -import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT; import static com.android.launcher3.hybridhotseat.HotseatPredictionModel.convertDataModelToAppTargetBundle; import static com.android.launcher3.icons.cache.CacheLookupFlag.DEFAULT_LOOKUP_FLAG; import static com.android.launcher3.model.PredictionHelper.getAppTargetFromItemInfo; @@ -36,22 +34,14 @@ import static java.util.stream.Collectors.toCollection; import android.app.StatsManager; import android.app.prediction.AppPredictionContext; -import android.app.prediction.AppPredictionManager; -import android.app.prediction.AppPredictor; import android.app.prediction.AppTarget; import android.app.prediction.AppTargetEvent; import android.content.Context; -import android.content.Intent; -import android.content.pm.LauncherActivityInfo; -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; -import androidx.annotation.AnyThread; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -60,36 +50,23 @@ import androidx.annotation.WorkerThread; 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; import com.android.launcher3.logging.InstanceIdSequence; import com.android.launcher3.model.BgDataModel.FixedContainerItems; -import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.CollectionInfo; 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.ShortcutKey; -import com.android.launcher3.util.ApiWrapper; -import com.android.launcher3.util.Executors; import com.android.launcher3.util.IntSparseArrayMap; -import com.android.launcher3.util.PackageManagerHelper; -import com.android.launcher3.util.PersistedItemArray; import com.android.quickstep.logging.SettingsChangeLogger; import com.android.quickstep.logging.StatsLogCompatManager; import com.android.quickstep.util.ContextualSearchStateManager; import com.android.systemui.shared.system.SysUiStatsLog; import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; import java.util.Objects; -import java.util.stream.IntStream; import javax.inject.Inject; import javax.inject.Named; @@ -109,17 +86,18 @@ public class QuickstepModelDelegate extends ModelDelegate { nonRestorableItem("LAST_SNAPSHOT_TIME_MILLIS", 0L, ENCRYPTED); @VisibleForTesting - final PredictorState mAllAppsState = new PredictorState( + final PredictorState mAllPredictionAppsState = new PredictorState( CONTAINER_ALL_APPS_PREDICTION, "all_apps_predictions", DEFAULT_LOOKUP_FLAG); @VisibleForTesting - final PredictorState mHotseatState = new PredictorState( + final PredictorState mHotseatPredictionState = new PredictorState( CONTAINER_HOTSEAT_PREDICTION, "hotseat_predictions", DESKTOP_ICON_FLAG); @VisibleForTesting final PredictorState mWidgetsRecommendationState = new PredictorState( CONTAINER_WIDGETS_PREDICTION, "widgets_prediction", DESKTOP_ICON_FLAG); private final InvariantDeviceProfile mIDP; - private final PackageManagerHelper mPmHelper; + private final UserCache mUserCache; + private final PredictedItemFactory.Factory mItemParserFactory; private final AppEventProducer mAppEventProducer; private final StatsManager mStatsManager; @@ -129,11 +107,15 @@ public class QuickstepModelDelegate extends ModelDelegate { @Inject public QuickstepModelDelegate(@ApplicationContext Context context, InvariantDeviceProfile idp, - PackageManagerHelper pmHelper, + UserCache userCache, + PredictedItemFactory.Factory itemParserFactory, @Nullable @Named("ICONS_DB") String dbFileName) { super(context); + + mIDP = idp; - mPmHelper = pmHelper; + mUserCache = userCache; + mItemParserFactory = itemParserFactory; mAppEventProducer = new AppEventProducer(context, this::onAppTargetEvent); StatsLogCompatManager.LOGS_CONSUMER.add(mAppEventProducer); @@ -146,74 +128,32 @@ public class QuickstepModelDelegate extends ModelDelegate { @CallSuper @Override - public void loadAndBindWorkspaceItems(@NonNull UserManagerState ums, - @NonNull BgDataModel.Callbacks[] callbacks, - @NonNull Map pinnedShortcuts) { - loadAndBindItems(ums, pinnedShortcuts, callbacks, mIDP.numDatabaseHotseatIcons, - mHotseatState); + public void loadAndBindWorkspaceItems() { + loadAndBindPredictedItems(mIDP.numDatabaseHotseatIcons, mHotseatPredictionState); } @CallSuper @Override - public void loadAndBindAllAppsItems(@NonNull UserManagerState ums, - @NonNull BgDataModel.Callbacks[] callbacks, - @NonNull Map pinnedShortcuts) { - loadAndBindItems(ums, pinnedShortcuts, callbacks, mIDP.numDatabaseAllAppsColumns, - mAllAppsState); + public void loadAndBindAllAppsItems() { + loadAndBindPredictedItems(mIDP.numDatabaseAllAppsColumns, mAllPredictionAppsState); } @WorkerThread - private void loadAndBindItems(@NonNull UserManagerState ums, - @NonNull Map pinnedShortcuts, - @NonNull BgDataModel.Callbacks[] callbacks, + private void loadAndBindPredictedItems( int numColumns, @NonNull PredictorState state) { - // TODO: Implement caching and preloading - - WorkspaceItemFactory factory = - new WorkspaceItemFactory(mContext, ums, mPmHelper, pinnedShortcuts, numColumns, - state.containerId, state.lookupFlag); + PredictedItemFactory parser = mItemParserFactory.newParser(numColumns, state); FixedContainerItems fci = new FixedContainerItems(state.containerId, - state.storage.read(mContext, factory, ums.allUsers::get)); + state.storage.read(mContext, parser, mUserCache::getUserForSerialNumber)); mDataModel.extraItems.put(state.containerId, fci); } @CallSuper @Override - public void loadAndBindOtherItems(@NonNull BgDataModel.Callbacks[] callbacks) { + public void loadAndBindOtherItems() { FixedContainerItems widgetPredictionFCI = new FixedContainerItems( mWidgetsRecommendationState.containerId, new ArrayList<>()); - // Widgets prediction isn't used frequently. And thus, it is not persisted on disk. mDataModel.extraItems.put(mWidgetsRecommendationState.containerId, widgetPredictionFCI); - - bindPredictionItems(callbacks, widgetPredictionFCI); - loadStringCache(mDataModel.stringCache); - } - - @AnyThread - private void bindPredictionItems(@NonNull BgDataModel.Callbacks[] callbacks, - @NonNull FixedContainerItems fci) { - Executors.MAIN_EXECUTOR.execute(() -> { - for (BgDataModel.Callbacks c : callbacks) { - c.bindExtraContainerItems(fci); - } - }); - } - - @Override - @WorkerThread - public void bindAllModelExtras(@NonNull BgDataModel.Callbacks[] callbacks) { - Iterable containerItems; - synchronized (mDataModel.extraItems) { - containerItems = mDataModel.extraItems.clone(); - } - Executors.MAIN_EXECUTOR.execute(() -> { - for (BgDataModel.Callbacks c : callbacks) { - for (FixedContainerItems fci : containerItems) { - c.bindExtraContainerItems(fci); - } - } - }); } public void markActive() { @@ -330,12 +270,8 @@ public class QuickstepModelDelegate extends ModelDelegate { @Override public void validateData() { super.validateData(); - if (mAllAppsState.predictor != null) { - mAllAppsState.predictor.requestPredictionUpdate(); - } - if (mWidgetsRecommendationState.predictor != null) { - mWidgetsRecommendationState.predictor.requestPredictionUpdate(); - } + mAllPredictionAppsState.requestPredictionUpdate(); + mWidgetsRecommendationState.requestPredictionUpdate(); } @WorkerThread @@ -355,8 +291,8 @@ public class QuickstepModelDelegate extends ModelDelegate { } private void destroyPredictors() { - mAllAppsState.destroyPredictor(); - mHotseatState.destroyPredictor(); + mAllPredictionAppsState.destroyPredictor(); + mHotseatPredictionState.destroyPredictor(); mWidgetsRecommendationState.destroyPredictor(); } @@ -366,78 +302,45 @@ public class QuickstepModelDelegate extends ModelDelegate { if (!mActive) { return; } - AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class); - if (apm == null) { - return; - } - registerPredictor(mAllAppsState, apm.createAppPredictionSession( + mAllPredictionAppsState.registerPredictor(mContext, new AppPredictionContext.Builder(mContext) - .setUiSurface("home") - .setPredictedTargetCount(mIDP.numDatabaseAllAppsColumns) - .build())); + .setUiSurface("home") + .setPredictedTargetCount(mIDP.numDatabaseAllAppsColumns) + .build(), + mModel, + PredictionUpdateTask::new); + // TODO: get bundle - registerHotseatPredictor(apm, mContext); + registerHotseatPredictor(mContext); - registerWidgetsPredictor(apm.createAppPredictionSession( + mWidgetsRecommendationState.registerPredictor(mContext, new AppPredictionContext.Builder(mContext) - .setUiSurface("widgets") - .setExtras(getBundleForWidgetsOnWorkspace(mContext, mDataModel)) - .setPredictedTargetCount(NUM_OF_RECOMMENDED_WIDGETS_PREDICATION) - .build())); + .setUiSurface("widgets") + .setExtras(getBundleForWidgetsOnWorkspace(mContext, mDataModel)) + .setPredictedTargetCount(NUM_OF_RECOMMENDED_WIDGETS_PREDICATION) + .build(), + mModel, + WidgetsPredictionUpdateTask::new); } @WorkerThread private void recreateHotseatPredictor() { - mHotseatState.destroyPredictor(); - if (!mActive) { - return; + mHotseatPredictionState.destroyPredictor(); + if (mActive) { + registerHotseatPredictor(mContext); } - AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class); - if (apm == null) { - return; - } - registerHotseatPredictor(apm, mContext); } - private void registerHotseatPredictor(AppPredictionManager apm, Context context) { - registerPredictor(mHotseatState, apm.createAppPredictionSession( + private void registerHotseatPredictor(Context context) { + mHotseatPredictionState.registerPredictor(context, new AppPredictionContext.Builder(context) - .setUiSurface("hotseat") - .setPredictedTargetCount(mIDP.numDatabaseHotseatIcons) - .setExtras(convertDataModelToAppTargetBundle(context, mDataModel)) - .build())); - } - - private void registerPredictor(PredictorState state, AppPredictor predictor) { - state.setTargets(Collections.emptyList()); - state.predictor = predictor; - state.predictor.registerPredictionUpdates( - MODEL_EXECUTOR, t -> handleUpdate(state, t)); - state.predictor.requestPredictionUpdate(); - } - - private void handleUpdate(PredictorState state, List targets) { - if (state.setTargets(targets)) { - // No diff, skip - return; - } - mModel.enqueueModelUpdateTask(new PredictionUpdateTask(state, targets)); - } - - private void registerWidgetsPredictor(AppPredictor predictor) { - mWidgetsRecommendationState.predictor = predictor; - mWidgetsRecommendationState.predictor.registerPredictionUpdates( - MODEL_EXECUTOR, targets -> { - if (mWidgetsRecommendationState.setTargets(targets)) { - // No diff, skip - return; - } - mModel.enqueueModelUpdateTask( - new WidgetsPredictionUpdateTask(mWidgetsRecommendationState, targets)); - }); - mWidgetsRecommendationState.predictor.requestPredictionUpdate(); + .setUiSurface("hotseat") + .setPredictedTargetCount(mIDP.numDatabaseHotseatIcons) + .setExtras(convertDataModelToAppTargetBundle(context, mDataModel)) + .build(), + mModel, PredictionUpdateTask::new); } @VisibleForTesting @@ -445,27 +348,26 @@ public class QuickstepModelDelegate extends ModelDelegate { PredictorState state; switch(client) { case CONTAINER_ALL_APPS_PREDICTION: - state = mAllAppsState; + state = mAllPredictionAppsState; break; case CONTAINER_WIDGETS_PREDICTION: state = mWidgetsRecommendationState; break; case CONTAINER_HOTSEAT_PREDICTION: default: - state = mHotseatState; + state = mHotseatPredictionState; break; } - if (state.predictor != null) { - state.predictor.notifyAppTargetEvent(event); - Log.d(TAG, "notifyAppTargetEvent action=" + event.getAction() - + " launchLocation=" + event.getLaunchLocation()); - if (state == mHotseatState - && (event.getAction() == AppTargetEvent.ACTION_PIN - || event.getAction() == AppTargetEvent.ACTION_UNPIN)) { - // Recreate hot seat predictor when we need to query for hot seat due to pin or - // unpin app icons. - recreateHotseatPredictor(); - } + + state.notifyAppTargetEvent(event); + Log.d(TAG, "notifyAppTargetEvent action=" + event.getAction() + + " launchLocation=" + event.getLaunchLocation()); + if (state == mHotseatPredictionState + && (event.getAction() == AppTargetEvent.ACTION_PIN + || event.getAction() == AppTargetEvent.ACTION_UNPIN)) { + // Recreate hot seat predictor when we need to query for hot seat due to pin or + // unpin app icons. + recreateHotseatPredictor(); } } @@ -485,133 +387,4 @@ public class QuickstepModelDelegate extends ModelDelegate { bundle.putParcelableArrayList(BUNDLE_KEY_ADDED_APP_WIDGETS, widgetEvents); return bundle; } - - static class PredictorState { - - public final int containerId; - public final PersistedItemArray storage; - public AppPredictor predictor; - public CacheLookupFlag lookupFlag; - - private List mLastTargets; - - PredictorState(int containerId, String storageName, CacheLookupFlag lookupFlag) { - this.containerId = containerId; - storage = new PersistedItemArray<>(storageName); - mLastTargets = Collections.emptyList(); - this.lookupFlag = lookupFlag; - } - - public void destroyPredictor() { - if (predictor != null) { - predictor.destroy(); - predictor = null; - } - } - - /** - * Sets the new targets and returns true if it was the same as before. - */ - boolean setTargets(List newTargets) { - List oldTargets = mLastTargets; - mLastTargets = newTargets; - - int size = oldTargets.size(); - return size == newTargets.size() && IntStream.range(0, size) - .allMatch(i -> areAppTargetsSame(oldTargets.get(i), newTargets.get(i))); - } - } - - /** - * Compares two targets for the properties which we care about - */ - private static boolean areAppTargetsSame(AppTarget t1, AppTarget t2) { - if (!Objects.equals(t1.getPackageName(), t2.getPackageName()) - || !Objects.equals(t1.getUser(), t2.getUser()) - || !Objects.equals(t1.getClassName(), t2.getClassName())) { - return false; - } - - ShortcutInfo s1 = t1.getShortcutInfo(); - ShortcutInfo s2 = t2.getShortcutInfo(); - if (s1 != null) { - if (s2 == null || !Objects.equals(s1.getId(), s2.getId())) { - return false; - } - } else if (s2 != null) { - return false; - } - return true; - } - - private static class WorkspaceItemFactory implements PersistedItemArray.ItemFactory { - - private final Context mContext; - private final UserManagerState mUMS; - private final PackageManagerHelper mPmHelper; - private final Map mPinnedShortcuts; - private final int mMaxCount; - private final int mContainer; - private final CacheLookupFlag mLookupFlag; - - private int mReadCount = 0; - - protected WorkspaceItemFactory( - Context context, UserManagerState ums, - PackageManagerHelper pmHelper, Map pinnedShortcuts, - int maxCount, int container, CacheLookupFlag lookupFlag) { - mContext = context; - mUMS = ums; - mPmHelper = pmHelper; - mPinnedShortcuts = pinnedShortcuts; - mMaxCount = maxCount; - mContainer = container; - mLookupFlag = lookupFlag; - } - - @Nullable - @Override - public ItemInfo createInfo(int itemType, UserHandle user, Intent intent) { - if (mReadCount >= mMaxCount) { - return null; - } - switch (itemType) { - case ITEM_TYPE_APPLICATION: { - LauncherActivityInfo lai = mContext - .getSystemService(LauncherApps.class) - .resolveActivity(intent, user); - if (lai == null) { - return null; - } - AppInfo info = new AppInfo( - lai, - UserCache.INSTANCE.get(mContext).getUserInfo(user), - ApiWrapper.INSTANCE.get(mContext), - mPmHelper, - mUMS.isUserQuiet(user)); - info.container = mContainer; - LauncherAppState.getInstance(mContext).getIconCache() - .getTitleAndIcon(info, lai, mLookupFlag); - mReadCount++; - return info.makeWorkspaceItem(mContext); - } - case ITEM_TYPE_DEEP_SHORTCUT: { - ShortcutKey key = ShortcutKey.fromIntent(intent, user); - if (key == null) { - return null; - } - ShortcutInfo si = mPinnedShortcuts.get(key); - if (si == null) { - return null; - } - WorkspaceItemInfo wii = new WorkspaceItemInfo(si, mContext); - wii.container = mContainer; - LauncherAppState.getInstance(mContext).getIconCache().getShortcutIcon(wii, si); - mReadCount++; - return wii; - } - } - return null; - } - } } diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java index da55b40b19..fb3e9d477f 100644 --- a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java +++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java @@ -32,7 +32,6 @@ import androidx.annotation.NonNull; import com.android.launcher3.LauncherModel.ModelUpdateTask; import com.android.launcher3.R; import com.android.launcher3.model.BgDataModel.FixedContainerItems; -import com.android.launcher3.model.QuickstepModelDelegate.PredictorState; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.widget.PendingAddWidgetInfo; 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 574effa723..a2b0338ab4 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt @@ -51,6 +51,7 @@ class QuickstepModelDelegateTest { @Mock private lateinit var allAppsPredictor: AppPredictor @Mock private lateinit var hotseatPredictor: AppPredictor @Mock private lateinit var widgetRecommendationPredictor: AppPredictor + @Mock private lateinit var itemParserFactory: PredictedItemFactory.Factory @Before fun setUp() { @@ -59,11 +60,12 @@ class QuickstepModelDelegateTest { QuickstepModelDelegate( context, context.appComponent.idp, - context.appComponent.packageManagerHelper, + context.appComponent.userCache, + itemParserFactory, "", /* dbFileName */ ) - underTest.mAllAppsState.predictor = allAppsPredictor - underTest.mHotseatState.predictor = hotseatPredictor + underTest.mAllPredictionAppsState.predictor = allAppsPredictor + underTest.mHotseatPredictionState.predictor = hotseatPredictor underTest.mWidgetsRecommendationState.predictor = widgetRecommendationPredictor underTest.mModel = LauncherAppState.getInstance(context).model underTest.mDataModel = @@ -113,31 +115,31 @@ class QuickstepModelDelegateTest { @Test fun hotseatActionPin_recreateHotSeat() { - assertSame(underTest.mHotseatState.predictor, hotseatPredictor) + assertSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_PIN).build() underTest.markActive() underTest.onAppTargetEvent(appTargetEvent, CONTAINER_HOTSEAT_PREDICTION) verify(hotseatPredictor).destroy() - assertNotSame(underTest.mHotseatState.predictor, hotseatPredictor) + assertNotSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) } @Test fun hotseatActionUnpin_recreateHotSeat() { - assertSame(underTest.mHotseatState.predictor, hotseatPredictor) + assertSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) underTest.markActive() val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_UNPIN).build() underTest.onAppTargetEvent(appTargetEvent, CONTAINER_HOTSEAT_PREDICTION) verify(hotseatPredictor).destroy() - assertNotSame(underTest.mHotseatState.predictor, hotseatPredictor) + assertNotSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) } @Test fun container_actionPin_notRecreateHotSeat() { - assertSame(underTest.mHotseatState.predictor, hotseatPredictor) + assertSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_UNPIN).build() underTest.markActive() @@ -145,6 +147,6 @@ class QuickstepModelDelegateTest { verify(allAppsPredictor, never()).destroy() verify(hotseatPredictor, never()).destroy() - assertSame(underTest.mHotseatState.predictor, hotseatPredictor) + assertSame(underTest.mHotseatPredictionState.predictor, hotseatPredictor) } } diff --git a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java b/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java index 26e08f9f19..4efa4ea9b8 100644 --- a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java +++ b/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java @@ -55,7 +55,6 @@ import com.android.launcher3.Flags; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; import com.android.launcher3.model.BgDataModel.FixedContainerItems; -import com.android.launcher3.model.QuickstepModelDelegate.PredictorState; import com.android.launcher3.util.LauncherLayoutBuilder; import com.android.launcher3.util.ModelTestExtensions; import com.android.launcher3.util.SandboxApplication; diff --git a/src/com/android/launcher3/LauncherModel.kt b/src/com/android/launcher3/LauncherModel.kt index b3e99050c9..a3331b945a 100644 --- a/src/com/android/launcher3/LauncherModel.kt +++ b/src/com/android/launcher3/LauncherModel.kt @@ -40,7 +40,6 @@ import com.android.launcher3.model.ModelLauncherCallbacks import com.android.launcher3.model.ModelTaskController import com.android.launcher3.model.ModelWriter import com.android.launcher3.model.PackageUpdatedTask -import com.android.launcher3.model.ReloadStringCacheTask import com.android.launcher3.model.ShortcutsChangedTask import com.android.launcher3.model.UserLockStateChangedTask import com.android.launcher3.model.UserManagerState @@ -157,10 +156,6 @@ constructor( MODEL_EXECUTOR.execute { modelDelegate.destroy() } } - fun reloadStringCache() { - enqueueModelUpdateTask(ReloadStringCacheTask(this.modelDelegate)) - } - /** * Called then there use a user event * diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index 5067a8fbbe..d01d53e1d5 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -509,11 +509,10 @@ public class LoaderTask implements Runnable { IOUtils.closeSilently(c); } - mModelDelegate.loadAndBindWorkspaceItems(mUserManagerState, - mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts); - mModelDelegate.loadAndBindAllAppsItems(mUserManagerState, - mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts); - mModelDelegate.loadAndBindOtherItems(mLauncherBinder.mCallbacksList); + mModelDelegate.loadAndBindWorkspaceItems(); + mModelDelegate.loadAndBindAllAppsItems(); + mModelDelegate.loadAndBindOtherItems(); + mBgDataModel.stringCache.loadStrings(mContext); mModelDelegate.markActive(); // Break early if we've stopped loading diff --git a/src/com/android/launcher3/model/ModelDelegate.java b/src/com/android/launcher3/model/ModelDelegate.java index 0ad8c1ea8a..d845b3b836 100644 --- a/src/com/android/launcher3/model/ModelDelegate.java +++ b/src/com/android/launcher3/model/ModelDelegate.java @@ -18,16 +18,12 @@ package com.android.launcher3.model; import static com.android.launcher3.util.PackageManagerHelper.hasShortcutsPermission; import android.content.Context; -import android.content.pm.ShortcutInfo; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; import com.android.launcher3.LauncherModel; import com.android.launcher3.dagger.ApplicationContext; -import com.android.launcher3.shortcuts.ShortcutKey; - -import java.util.Map; import javax.inject.Inject; @@ -65,33 +61,19 @@ public class ModelDelegate { /** Load workspace items (for example, those in the hot seat) if any in the data model */ @WorkerThread - public void loadAndBindWorkspaceItems(@NonNull UserManagerState ums, - @NonNull BgDataModel.Callbacks[] callbacks, - @NonNull Map pinnedShortcuts) { } + public void loadAndBindWorkspaceItems() { } /** Load all apps items if any in the data model */ @WorkerThread - public void loadAndBindAllAppsItems(@NonNull UserManagerState ums, - @NonNull BgDataModel.Callbacks[] callbacks, - @NonNull Map pinnedShortcuts) { } + public void loadAndBindAllAppsItems() { } /** Load other items like widget recommendations if any in the data model */ @WorkerThread - public void loadAndBindOtherItems(@NonNull BgDataModel.Callbacks[] callbacks) { } - - /** binds everything not bound by launcherBinder */ - @WorkerThread - public void bindAllModelExtras(@NonNull BgDataModel.Callbacks[] callbacks) { } + public void loadAndBindOtherItems() { } /** Marks the ModelDelegate as active */ public void markActive() { } - /** Load String cache */ - @WorkerThread - public void loadStringCache(@NonNull StringCache cache) { - cache.loadStrings(mContext); - } - /** * Called during loader after workspace loading is complete */ diff --git a/src/com/android/launcher3/model/ModelInitializer.kt b/src/com/android/launcher3/model/ModelInitializer.kt index ebbcfeab74..4e4a6febd4 100644 --- a/src/com/android/launcher3/model/ModelInitializer.kt +++ b/src/com/android/launcher3/model/ModelInitializer.kt @@ -99,7 +99,9 @@ constructor( // Device profile policy changes val dpUpdateReceiver = - SimpleBroadcastReceiver(context, UI_HELPER_EXECUTOR) { model.reloadStringCache() } + SimpleBroadcastReceiver(context, UI_HELPER_EXECUTOR) { + model.enqueueModelUpdateTask(ReloadStringCacheTask()) + } dpUpdateReceiver.register(ACTION_DEVICE_POLICY_RESOURCE_UPDATED) lifeCycle.addCloseable { dpUpdateReceiver.unregisterReceiverSafely() } diff --git a/src/com/android/launcher3/model/ReloadStringCacheTask.java b/src/com/android/launcher3/model/ReloadStringCacheTask.java index 3d974d6569..0dd5bd86bf 100644 --- a/src/com/android/launcher3/model/ReloadStringCacheTask.java +++ b/src/com/android/launcher3/model/ReloadStringCacheTask.java @@ -25,18 +25,11 @@ import com.android.launcher3.LauncherModel.ModelUpdateTask; */ public class ReloadStringCacheTask implements ModelUpdateTask { - @NonNull - private ModelDelegate mModelDelegate; - - public ReloadStringCacheTask(@NonNull final ModelDelegate modelDelegate) { - mModelDelegate = modelDelegate; - } - @Override public void execute(@NonNull ModelTaskController taskController, @NonNull BgDataModel dataModel, @NonNull AllAppsList apps) { synchronized (dataModel) { - mModelDelegate.loadStringCache(dataModel.stringCache); + dataModel.stringCache.loadStrings(taskController.getContext()); StringCache cloneSC = dataModel.stringCache.clone(); taskController.scheduleCallbackTask(c -> c.bindStringCache(cloneSC)); } diff --git a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt index f8516cc04b..8002305fd2 100644 --- a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt +++ b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt @@ -218,12 +218,12 @@ class LoaderTaskTest { verify(launcherBinder).bindWorkspace(true, false) verify(modelDelegate).workspaceLoadComplete() - verify(modelDelegate).loadAndBindAllAppsItems(any(), anyOrNull(), any()) + verify(modelDelegate).loadAndBindAllAppsItems() verify(launcherBinder).bindAllApps() verify(iconCacheUpdateHandler, times(4)).updateIcons(any(), any>(), any()) verify(launcherBinder).bindDeepShortcuts() verify(launcherBinder).bindWidgets() - verify(modelDelegate).loadAndBindOtherItems(anyOrNull()) + verify(modelDelegate).loadAndBindOtherItems() verify(iconCacheUpdateHandler).finish() verify(modelDelegate).modelLoadComplete() verify(transaction).commit() From d2f050ab26b18dbd5d0899d753f748de2bb60b20 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Fri, 2 May 2025 17:13:57 +0100 Subject: [PATCH 15/15] Add magnetic detach to task dismiss using MotionValue library. Fix: 389081766 Test: TaplTestsQuickstep Flag: com.android.launcher3.enable_expressive_dismiss_task_motion Change-Id: I77f980f9851f4b1c041cbf3bb7247b972c1730fd --- Android.bp | 1 + quickstep/res/values/dimens.xml | 2 + .../TaskViewDismissTouchController.kt | 95 ++++++++++++++++--- 3 files changed, 83 insertions(+), 15 deletions(-) diff --git a/Android.bp b/Android.bp index 4ef905c15e..d10ff1a908 100644 --- a/Android.bp +++ b/Android.bp @@ -390,6 +390,7 @@ android_library { "//frameworks/libs/systemui:view_capture", "//frameworks/libs/systemui:animationlib", "//frameworks/libs/systemui:contextualeducationlib", + "//frameworks/libs/systemui:mechanics", "//frameworks/libs/systemui:msdl", "SystemUI-statsd", "WindowManager-Shell-shared-AOSP", diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 067d784895..7519393454 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -94,6 +94,8 @@ 25dp + + 100dp 72dp 1.1 diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt index f2507da24a..1a7f7b0a47 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt @@ -34,6 +34,18 @@ import com.android.launcher3.statemanager.StatefulContainer import com.android.launcher3.touch.SingleAxisSwipeDetector import com.android.launcher3.util.MSDLPlayerWrapper import com.android.launcher3.util.TouchController +import com.android.mechanics.spec.Breakpoint +import com.android.mechanics.spec.Breakpoint.Companion.maxLimit +import com.android.mechanics.spec.Breakpoint.Companion.minLimit +import com.android.mechanics.spec.BreakpointKey +import com.android.mechanics.spec.DirectionalMotionSpec +import com.android.mechanics.spec.Guarantee +import com.android.mechanics.spec.InputDirection +import com.android.mechanics.spec.Mapping +import com.android.mechanics.spec.MotionSpec +import com.android.mechanics.spring.SpringParameters +import com.android.mechanics.view.DistanceGestureContext +import com.android.mechanics.view.ViewMotionValue import com.android.quickstep.views.RecentsView import com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY import com.android.quickstep.views.RecentsViewContainer @@ -59,6 +71,10 @@ CONTAINER : StatefulContainer { ) private val isRtl = isRtl(container.resources) private val upDirection: Int = recentsView.pagedOrientationHandler.getUpDirection(isRtl) + private val maxUndershoot = + container.resources.getDimension(R.dimen.task_dismiss_max_undershoot) + private val detachThreshold = + container.resources.getDimension(R.dimen.task_dismiss_detach_threshold) private val stateListener = object : StateListener { override fun onStateTransitionStart(toState: T) { @@ -69,6 +85,7 @@ CONTAINER : StatefulContainer { private val tempTaskThumbnailBounds = Rect() private var taskBeingDragged: TaskView? = null + private var taskDragDisplacementValue: ViewMotionValue? = null private var springAnimation: SpringAnimation? = null private var dismissLength: Int = 0 private var verticalFactor: Int = 0 @@ -196,6 +213,24 @@ CONTAINER : StatefulContainer { initialDisplacement = taskBeingDragged.secondaryDismissTranslationProperty.get(taskBeingDragged) + taskDragDisplacementValue = + generateMotionValue( + initialDisplacement, + detachThreshold * verticalFactor, + container.asContext(), + ) { currentDisplacement -> + taskBeingDragged.secondaryDismissTranslationProperty.setValue( + taskBeingDragged, + currentDisplacement, + ) + if (taskBeingDragged.isRunningTask && recentsView.enableDrawingLiveTile) { + recentsView.runActionOnRemoteHandles { remoteTargetHandle -> + remoteTargetHandle.taskViewSimulator.taskSecondaryTranslation.value = + currentDisplacement + } + recentsView.redrawLiveTile() + } + } // Add a tiny bit of translation Z, so that it draws on top of other views. This is relevant // (e.g.) when we dismiss a task by sliding it upward: if there is a row of icons above, we @@ -205,35 +240,26 @@ CONTAINER : StatefulContainer { override fun onDrag(displacement: Float): Boolean { if (isBlockedDuringDismissal) return true - val taskBeingDragged = taskBeingDragged ?: return false + taskBeingDragged ?: return false val currentDisplacement = displacement + initialDisplacement val boundedDisplacement = boundToRange(abs(currentDisplacement), 0f, dismissLength.toFloat()) // When swiping below origin, allow slight undershoot to simulate resisting the movement. + val isAboveOrigin = + recentsView.pagedOrientationHandler.isGoingUp(currentDisplacement, isRtl) val totalDisplacement = - if (recentsView.pagedOrientationHandler.isGoingUp(currentDisplacement, isRtl)) - boundedDisplacement * verticalFactor + if (isAboveOrigin) boundedDisplacement * verticalFactor else mapToRange( boundedDisplacement, 0f, dismissLength.toFloat(), 0f, - container.resources.getDimension(R.dimen.task_dismiss_max_undershoot), + maxUndershoot, DECELERATE, ) * -verticalFactor - taskBeingDragged.secondaryDismissTranslationProperty.setValue( - taskBeingDragged, - totalDisplacement, - ) - if (taskBeingDragged.isRunningTask && recentsView.enableDrawingLiveTile) { - recentsView.runActionOnRemoteHandles { remoteTargetHandle -> - remoteTargetHandle.taskViewSimulator.taskSecondaryTranslation.value = - totalDisplacement - } - recentsView.redrawLiveTile() - } val dismissFraction = displacement / (dismissLength * verticalFactor).toFloat() + taskDragDisplacementValue?.input = totalDisplacement RECENTS_SCALE_PROPERTY.setValue(recentsView, getRecentsScale(dismissFraction)) playDismissThresholdHaptic(displacement) return true @@ -262,6 +288,7 @@ CONTAINER : StatefulContainer { override fun onDragEnd(velocity: Float) { if (isBlockedDuringDismissal) return val taskBeingDragged = taskBeingDragged ?: return + taskDragDisplacementValue?.dispose() val currentDisplacement = taskBeingDragged.secondaryDismissTranslationProperty.get(taskBeingDragged) @@ -299,6 +326,7 @@ CONTAINER : StatefulContainer { taskBeingDragged?.translationZ = 0f taskBeingDragged = null springAnimation = null + taskDragDisplacementValue = null isBlockedDuringDismissal = false } @@ -341,6 +369,43 @@ CONTAINER : StatefulContainer { } } + private fun generateMotionValue( + initialDisplacement: Float, + detachThreshold: Float, + context: Context, + updateCallback: (Float) -> Unit, + ): ViewMotionValue { + val direction = if (initialDisplacement < 0) InputDirection.Max else InputDirection.Min + val distanceGestureContext = + DistanceGestureContext.create(context, initialDisplacement, direction) + val viewMotionValue = + ViewMotionValue( + initialDisplacement, + distanceGestureContext, + generateMotionSpec(detachThreshold), + label = "taskDismiss::displacement", + ) + + viewMotionValue.addUpdateCallback { motionValue -> updateCallback(motionValue.output) } + return viewMotionValue + } + + /** Motion spec for an initial magnetic detach. Track linearly otherwise. No reattach. */ + private fun generateMotionSpec(detachThreshold: Float): MotionSpec { + val spring = SpringParameters(stiffness = 800f, dampingRatio = 0.95f) + val detachKey = BreakpointKey("TaskDismiss::Detach") + val breakpoints = mutableListOf() + val mappings = mutableListOf() + + breakpoints.add(minLimit) + mappings.add(Mapping.Identity) + breakpoints.add(Breakpoint(detachKey, detachThreshold, spring, Guarantee.None)) + mappings.add(Mapping.Linear(0.3f)) + breakpoints.add(maxLimit) + + return MotionSpec(DirectionalMotionSpec(breakpoints, mappings)) + } + companion object { private const val TAG = "TaskViewDismissTouchController"