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

Commit d9a3e746 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Split split screen module for trunk stable SLO 

Bug: 288470114
Test: atest WMShellFlickerTestsSplitScreenEnter WMShellFlickerTestsSplitScreenOther
Change-Id: I84c51a5442003966c6695f194b82db9f5bb4cf38
parent 853b9d56

libs/WindowManager/Shell/tests/flicker/Android.bp

+37 −5
Original line number Diff line number Diff line
@@ -44,13 +44,26 @@ filegroup { 
}



filegroup {

    name: "WMShellFlickerTestsSplitScreen-src",

    name: "WMShellFlickerTestsSplitScreenBase-src",

    srcs: [

        "src/com/android/wm/shell/flicker/splitscreen/*.kt",

        "src/com/android/wm/shell/flicker/splitscreen/benchmark/*.kt",

    ],

}



filegroup {

    name: "WMShellFlickerTestsSplitScreenEnter-src",

    srcs: [

        "src/com/android/wm/shell/flicker/splitscreen/Enter*.kt",

    ],

}



filegroup {

    name: "WMShellFlickerTestsSplitScreenOther-src",

    srcs: [

        "src/com/android/wm/shell/flicker/splitscreen/*.kt",

    ],

}



filegroup {

    name: "WMShellFlickerServiceTests-src",

    srcs: [
@@ -122,7 +135,9 @@ android_test { 
    exclude_srcs: [

        ":WMShellFlickerTestsBubbles-src",

        ":WMShellFlickerTestsPip-src",

        ":WMShellFlickerTestsSplitScreen-src",

        ":WMShellFlickerTestsSplitScreenEnter-src",

        ":WMShellFlickerTestsSplitScreenOther-src",

        ":WMShellFlickerTestsSplitScreenBase-src",

        ":WMShellFlickerServiceTests-src",

    ],

}
@@ -152,14 +167,31 @@ android_test { 
}



android_test {

    name: "WMShellFlickerTestsSplitScreen",

    name: "WMShellFlickerTestsSplitScreenEnter",

    defaults: ["WMShellFlickerTestsDefault"],

    additional_manifests: ["manifests/AndroidManifestSplitScreen.xml"],

    package_name: "com.android.wm.shell.flicker.splitscreen",

    instrumentation_target_package: "com.android.wm.shell.flicker.splitscreen",

    srcs: [

        ":WMShellFlickerTestsBase-src",

        ":WMShellFlickerTestsSplitScreen-src",

        ":WMShellFlickerTestsSplitScreenBase-src",

        ":WMShellFlickerTestsSplitScreenEnter-src",

    ],

}



android_test {

    name: "WMShellFlickerTestsSplitScreenOther",

    defaults: ["WMShellFlickerTestsDefault"],

    additional_manifests: ["manifests/AndroidManifestSplitScreen.xml"],

    package_name: "com.android.wm.shell.flicker.splitscreen",

    instrumentation_target_package: "com.android.wm.shell.flicker.splitscreen",

    srcs: [

        ":WMShellFlickerTestsBase-src",

        ":WMShellFlickerTestsSplitScreenBase-src",

        ":WMShellFlickerTestsSplitScreenOther-src",

    ],

    exclude_srcs: [

        ":WMShellFlickerTestsSplitScreenEnter-src",

    ],

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/CopyContentInSplitBenchmark.kt

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.tools.device.flicker.legacy.FlickerBuilder 
import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.splitscreen.SplitScreenBase

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/DismissSplitScreenByDividerBenchmark.kt

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.tools.device.flicker.legacy.FlickerBuilder 
import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.splitscreen.SplitScreenBase

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/DismissSplitScreenByGoHomeBenchmark.kt

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.tools.device.flicker.legacy.FlickerBuilder 
import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.splitscreen.SplitScreenBase

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/DragDividerToResizeBenchmark.kt

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.tools.device.flicker.legacy.FlickerBuilder 
import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.splitscreen.SplitScreenBase

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.Assume

import org.junit.Before