From bf9d047b534c47d2233a76732e98bfc2c91f7cb5 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Fri, 11 Oct 2024 13:04:18 -0700 Subject: [PATCH 1/4] Removing unnecessary SafeClosable requirement from DaggerSingletonObject Test: presubmit Bug: 361850561 Flag: EXEMPT dagger Change-Id: I453159be83e92eee92f5a18cfe0d3ea9a3123f47 --- .../android/launcher3/pm/InstallSessionHelper.java | 12 ++---------- .../launcher3/util/DaggerSingletonObject.java | 2 +- .../android/launcher3/pm/InstallSessionHelperTest.kt | 4 +--- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java index f36f595545..afc5117a63 100644 --- a/src/com/android/launcher3/pm/InstallSessionHelper.java +++ b/src/com/android/launcher3/pm/InstallSessionHelper.java @@ -38,13 +38,10 @@ import com.android.launcher3.logging.FileLog; import com.android.launcher3.model.ItemInstallQueue; import com.android.launcher3.util.ApplicationInfoWrapper; import com.android.launcher3.util.DaggerSingletonObject; -import com.android.launcher3.util.DaggerSingletonTracker; -import com.android.launcher3.util.ExecutorUtil; import com.android.launcher3.util.IntArray; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.Preconditions; -import com.android.launcher3.util.SafeCloseable; import java.util.ArrayList; import java.util.HashMap; @@ -59,7 +56,7 @@ import javax.inject.Inject; */ @SuppressWarnings("NewApi") @LauncherAppSingleton -public class InstallSessionHelper implements SafeCloseable { +public class InstallSessionHelper { @NonNull private static final String LOG = "InstallSessionHelper"; @@ -91,17 +88,12 @@ public class InstallSessionHelper implements SafeCloseable { private IntSet mPromiseIconIds; @Inject - public InstallSessionHelper(@NonNull @ApplicationContext final Context context, - DaggerSingletonTracker tracker) { + public InstallSessionHelper(@NonNull @ApplicationContext final Context context) { mInstaller = context.getPackageManager().getPackageInstaller(); mAppContext = context.getApplicationContext(); mLauncherApps = context.getSystemService(LauncherApps.class); - ExecutorUtil.executeSyncOnMainOrFail(() -> tracker.addCloseable(this)); } - @Override - public void close() { } - @WorkerThread @NonNull private IntSet getPromiseIconIds() { diff --git a/src/com/android/launcher3/util/DaggerSingletonObject.java b/src/com/android/launcher3/util/DaggerSingletonObject.java index b8cf2ae77a..febe6af2d4 100644 --- a/src/com/android/launcher3/util/DaggerSingletonObject.java +++ b/src/com/android/launcher3/util/DaggerSingletonObject.java @@ -29,7 +29,7 @@ import java.util.function.Function; * We should delete this class at the end and use @Inject to get dagger provided singletons. */ -public class DaggerSingletonObject { +public class DaggerSingletonObject { private final Function mFunction; public DaggerSingletonObject(Function function) { diff --git a/tests/src/com/android/launcher3/pm/InstallSessionHelperTest.kt b/tests/src/com/android/launcher3/pm/InstallSessionHelperTest.kt index a991981362..ca2ef42124 100644 --- a/tests/src/com/android/launcher3/pm/InstallSessionHelperTest.kt +++ b/tests/src/com/android/launcher3/pm/InstallSessionHelperTest.kt @@ -28,7 +28,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.launcher3.LauncherPrefs import com.android.launcher3.LauncherPrefs.Companion.PROMISE_ICON_IDS -import com.android.launcher3.util.DaggerSingletonTracker import com.android.launcher3.util.Executors.MODEL_EXECUTOR import com.android.launcher3.util.IntArray import com.android.launcher3.util.LauncherModelHelper @@ -54,7 +53,6 @@ class InstallSessionHelperTest { private val expectedAppPackage = "expectedAppPackage" private val expectedInstallerPackage = "expectedInstallerPackage" private val mockPackageInstaller: PackageInstaller = mock() - private val mTracker: DaggerSingletonTracker = mock() private lateinit var installSessionHelper: InstallSessionHelper private lateinit var launcherApps: LauncherApps @@ -64,7 +62,7 @@ class InstallSessionHelperTest { whenever(packageManager.packageInstaller).thenReturn(mockPackageInstaller) whenever(sandboxContext.packageName).thenReturn(expectedInstallerPackage) launcherApps = sandboxContext.spyService(LauncherApps::class.java) - installSessionHelper = InstallSessionHelper(sandboxContext, mTracker) + installSessionHelper = InstallSessionHelper(sandboxContext) } @Test From 5a01f588be4431e99ae1c438e3794b5e73ada5c0 Mon Sep 17 00:00:00 2001 From: samcackett Date: Fri, 11 Oct 2024 17:03:21 +0100 Subject: [PATCH 2/4] Fix jank resulting from TaskView resizing Don't include taskbar height when calculating TaskView size, otherwise this results in an unnecessary jump when the taskbar changes, either when navigating from DesktopWindowing to Overview or pinning the Taskbar in Overview Bug: 343882478 Fix: 373319262 Test: unbundled/launcher/nexus_image_test_platform OverviewImageNoTransientTaskbarTest Flag: NONE Bugfix Change-Id: I09de0e8b4386dd9b8ccbe5330ff0c6075ef773f2 --- .../src/com/android/quickstep/BaseContainerInterface.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/BaseContainerInterface.java b/quickstep/src/com/android/quickstep/BaseContainerInterface.java index 14c2cc4e6e..e625f55d71 100644 --- a/quickstep/src/com/android/quickstep/BaseContainerInterface.java +++ b/quickstep/src/com/android/quickstep/BaseContainerInterface.java @@ -379,9 +379,6 @@ public abstract class BaseContainerInterface Date: Mon, 14 Oct 2024 16:27:19 +0000 Subject: [PATCH 3/4] Fix package name for TaskbarEduTooltipControllerTest Change-Id: I12795bb8506f44f7bb6af6176f2a647b5f099e50 Flag: TEST_ONLY Bug: No Test: go/testedequals --- .../launcher3/taskbar/TaskbarEduTooltipControllerTest.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarEduTooltipControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarEduTooltipControllerTest.kt index e575efd273..af05d22391 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarEduTooltipControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarEduTooltipControllerTest.kt @@ -14,17 +14,11 @@ * limitations under the License. */ -package com.android.launcher3.taskbar.test +package com.android.launcher3.taskbar import android.util.Log import com.android.launcher3.Utilities -import com.android.launcher3.taskbar.TOOLTIP_STEP_FEATURES -import com.android.launcher3.taskbar.TOOLTIP_STEP_NONE -import com.android.launcher3.taskbar.TOOLTIP_STEP_PINNING -import com.android.launcher3.taskbar.TOOLTIP_STEP_SWIPE -import com.android.launcher3.taskbar.TaskbarActivityContext import com.android.launcher3.taskbar.TaskbarControllerTestUtil.runOnMainSync -import com.android.launcher3.taskbar.TaskbarEduTooltipController import com.android.launcher3.taskbar.rules.TaskbarModeRule import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.PINNED import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.THREE_BUTTONS From 1d12cbcd23a0a5b1c328061a7ad259fd374bfd09 Mon Sep 17 00:00:00 2001 From: fbaron Date: Mon, 14 Oct 2024 09:42:20 -0700 Subject: [PATCH 4/4] Add screenrecord for testWorkspaceSwitchToAllApps Flag: EXEMPT TEST_ONLY Test: TaplTestsQuickstep#testWorkspaceSwitchToAllApps Bug: 371615571 Change-Id: Ib2ce1d1b56b1710e65bad8eaa5de89949ec22c7e --- .../tests/src/com/android/quickstep/TaplTestsQuickstep.java | 1 + 1 file changed, 1 insertion(+) diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 5ff2af705b..e7e2f577ce 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -103,6 +103,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @Test @NavigationModeSwitch @PortraitLandscape + @ScreenRecord // b/371615571 public void testWorkspaceSwitchToAllApps() { assertNotNull("switchToAllApps() returned null", mLauncher.getWorkspace().switchToAllApps());