Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7e98985 authored by Brian Isganitis's avatar Brian Isganitis
Browse files

Move test rules to subpackage. 

Test: Compiles
Flag: EXEMPT refactor
Bug: 230027385
Change-Id: I9199fd92450180fa10673c3072dd6e8312fd24d6
parent 9f8e1471

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+2 −2
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ public class TaskbarManager { 
    }



    @VisibleForTesting

    void addTaskbarRootViewToWindow() {

    public void addTaskbarRootViewToWindow() {

        if (enableTaskbarNoRecreate() && !mAddedWindow && mTaskbarActivityContext != null) {

            mWindowManager.addView(mTaskbarRootLayout,

                    mTaskbarActivityContext.getWindowLayoutParams());
@@ -620,7 +620,7 @@ public class TaskbarManager { 
    }



    @VisibleForTesting

    void removeTaskbarRootViewFromWindow() {

    public void removeTaskbarRootViewFromWindow() {

        if (enableTaskbarNoRecreate() && mAddedWindow) {

            mWindowManager.removeViewImmediate(mTaskbarRootLayout);

            mAddedWindow = false;

quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsControllerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import com.android.launcher3.appprediction.PredictionRowView 
import com.android.launcher3.model.data.AppInfo

import com.android.launcher3.model.data.WorkspaceItemInfo

import com.android.launcher3.notification.NotificationKeyData

import com.android.launcher3.taskbar.TaskbarUnitTestRule

import com.android.launcher3.taskbar.TaskbarUnitTestRule.InjectController

import com.android.launcher3.taskbar.overlay.TaskbarOverlayController

import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule

import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController

import com.android.launcher3.util.LauncherMultivalentJUnit

import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices

import com.android.launcher3.util.PackageUserKey

quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayControllerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_ALL_APPS 
import com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_OVERLAY_PROXY

import com.android.launcher3.AbstractFloatingView.hasOpenView

import com.android.launcher3.taskbar.TaskbarActivityContext

import com.android.launcher3.taskbar.TaskbarUnitTestRule

import com.android.launcher3.taskbar.TaskbarUnitTestRule.InjectController

import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule

import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController

import com.android.launcher3.util.LauncherMultivalentJUnit

import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices

import com.android.launcher3.views.BaseDragLayer

quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarModeRule.kt→quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRule.kt

+3 −3
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 
 * limitations under the License.

 */



package com.android.launcher3.taskbar

package com.android.launcher3.taskbar.rules



import com.android.launcher3.taskbar.TaskbarModeRule.Mode

import com.android.launcher3.taskbar.TaskbarModeRule.TaskbarMode

import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode

import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode

import com.android.launcher3.util.DisplayController

import com.android.launcher3.util.MainThreadInitializedObject

import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext

quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarModeRuleTest.kt→quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/rules/TaskbarModeRuleTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 
 * limitations under the License.

 */



package com.android.launcher3.taskbar

package com.android.launcher3.taskbar.rules



import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation

import com.android.launcher3.InvariantDeviceProfile

import com.android.launcher3.taskbar.TaskbarModeRule.Mode.PINNED

import com.android.launcher3.taskbar.TaskbarModeRule.Mode.THREE_BUTTONS

import com.android.launcher3.taskbar.TaskbarModeRule.Mode.TRANSIENT

import com.android.launcher3.taskbar.TaskbarModeRule.TaskbarMode

import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.PINNED

import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.THREE_BUTTONS

import com.android.launcher3.taskbar.rules.TaskbarModeRule.Mode.TRANSIENT

import com.android.launcher3.taskbar.rules.TaskbarModeRule.TaskbarMode

import com.android.launcher3.util.DisplayController

import com.android.launcher3.util.LauncherMultivalentJUnit

import com.android.launcher3.util.MainThreadInitializedObject.SandboxContext