From cc2d14be93a4cbdba9c8e8bd8dd6bcb0e9ade516 Mon Sep 17 00:00:00 2001
From: Sebastian Franco <fransebas@google.com>
Date: Tue, 13 May 2025 22:00:48 +0000
Subject: [PATCH] launcher: Get rid of redundant folders like testing when we
 have the test folder

Bug: 324261526
Test: BubbleBarViewAnimatorTest
Test: BubbleBarViewScreenshotTest
Test: BubbleViewScreenshotTest
Test: DepthControllerTest
Test: DesktopVisibilityControllerTest
Test: ExcludeFromRecentsTestActivity
Test: FakeBubbleViewFactory
Test: WidgetsPredicationUpdateTaskTest
Flag: EXEMPT test only
Change-Id: I2fb9dfebade1925cc5b5875487f97003d97c49de
---
 quickstep/Android.bp                                      | 8 --------
 .../taskbar/bubbles/BubbleBarViewScreenshotTest.kt        | 1 -
 .../launcher3/taskbar/bubbles/BubbleViewScreenshotTest.kt | 1 -
 .../launcher3/taskbar/bubbles}/FakeBubbleViewFactory.kt   | 6 ++----
 4 files changed, 2 insertions(+), 14 deletions(-)
 rename quickstep/{testing/com/android/launcher3/taskbar/bubbles/testing => tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles}/FakeBubbleViewFactory.kt (93%)

diff --git a/quickstep/Android.bp b/quickstep/Android.bp
index 2ef9f82a71..4c724dc290 100644
--- a/quickstep/Android.bp
+++ b/quickstep/Android.bp
@@ -64,11 +64,3 @@ filegroup {
         "tests/multivalentScreenshotTests/src/**/*.kt",
     ],
 }
-
-filegroup {
-    name: "launcher3-quickstep-testing",
-    path: "testing",
-    srcs: [
-        "testing/**/*.kt",
-    ],
-}
diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewScreenshotTest.kt
index 2d473f1479..ceea24eedb 100644
--- a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewScreenshotTest.kt
+++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewScreenshotTest.kt
@@ -26,7 +26,6 @@ import android.widget.FrameLayout.LayoutParams.WRAP_CONTENT
 import androidx.activity.ComponentActivity
 import androidx.test.core.app.ApplicationProvider
 import com.android.launcher3.R
-import com.android.launcher3.taskbar.bubbles.testing.FakeBubbleViewFactory
 import com.android.wm.shell.shared.bubbles.BubbleBarLocation
 import com.google.android.apps.nexuslauncher.imagecomparison.goldenpathmanager.ViewScreenshotGoldenPathManager
 import org.junit.Rule
diff --git a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewScreenshotTest.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewScreenshotTest.kt
index 47f393ffc1..0661a99dbd 100644
--- a/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewScreenshotTest.kt
+++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/BubbleViewScreenshotTest.kt
@@ -18,7 +18,6 @@ package com.android.launcher3.taskbar.bubbles
 import android.content.Context
 import android.graphics.Color
 import androidx.test.core.app.ApplicationProvider
-import com.android.launcher3.taskbar.bubbles.testing.FakeBubbleViewFactory
 import com.google.android.apps.nexuslauncher.imagecomparison.goldenpathmanager.ViewScreenshotGoldenPathManager
 import org.junit.Rule
 import org.junit.Test
diff --git a/quickstep/testing/com/android/launcher3/taskbar/bubbles/testing/FakeBubbleViewFactory.kt b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/FakeBubbleViewFactory.kt
similarity index 93%
rename from quickstep/testing/com/android/launcher3/taskbar/bubbles/testing/FakeBubbleViewFactory.kt
rename to quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/FakeBubbleViewFactory.kt
index 2f1f0b5f6f..e6d3ae7661 100644
--- a/quickstep/testing/com/android/launcher3/taskbar/bubbles/testing/FakeBubbleViewFactory.kt
+++ b/quickstep/tests/multivalentScreenshotTests/src/com/android/launcher3/taskbar/bubbles/FakeBubbleViewFactory.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,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher3.taskbar.bubbles.testing
+package com.android.launcher3.taskbar.bubbles
 
 import android.app.Notification
 import android.content.Context
@@ -26,8 +26,6 @@ import android.util.PathParser
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.android.launcher3.R
-import com.android.launcher3.taskbar.bubbles.BubbleBarBubble
-import com.android.launcher3.taskbar.bubbles.BubbleView
 import com.android.wm.shell.shared.bubbles.BubbleInfo
 
 object FakeBubbleViewFactory {