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

Commit cb7100e5 authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Migrate Platinum tests to inherite from new Flicker Service Splitscreen... 

Merge "Migrate Platinum tests to inherite from new Flicker Service Splitscreen tests" into udc-qpr-dev am: 923e046a am: 5576f881

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23781303



Change-Id: I18710575c08ba3f49fd7e86f1783f79ecc017cf2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51af589f 5576f881

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

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.wm.shell.flicker.service.splitscreen.benchmark



import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit

import org.junit.Test



@RequiresDevice

class CopyContentInSplitGesturalNavLandscapeBenchmark : CopyContentInSplit(Rotation.ROTATION_90) {

    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun copyContentInSplit() = super.copyContentInSplit()

}

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

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.wm.shell.flicker.service.splitscreen.benchmark



import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit

import org.junit.Test



@RequiresDevice

class CopyContentInSplitGesturalNavPortraitBenchmark : CopyContentInSplit(Rotation.ROTATION_0) {

    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun copyContentInSplit() = super.copyContentInSplit()

}

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.wm.shell.flicker.service.splitscreen.benchmark



import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider

import org.junit.Test



@RequiresDevice

class DismissSplitScreenByDividerGesturalNavLandscapeBenchmark :

    DismissSplitScreenByDivider(Rotation.ROTATION_90) {

    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun dismissSplitScreenByDivider() = super.dismissSplitScreenByDivider()

}

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.wm.shell.flicker.service.splitscreen.benchmark



import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider

import org.junit.Test



@RequiresDevice

class DismissSplitScreenByDividerGesturalNavPortraitBenchmark :

    DismissSplitScreenByDivider(Rotation.ROTATION_0) {

    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun dismissSplitScreenByDivider() = super.dismissSplitScreenByDivider()

}

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.wm.shell.flicker.service.splitscreen.benchmark



import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByGoHome

import org.junit.Test



@RequiresDevice

class DismissSplitScreenByGoHomeGesturalNavLandscapeBenchmark :

    DismissSplitScreenByGoHome(Rotation.ROTATION_90) {

    @PlatinumTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun dismissSplitScreenByGoHome() = super.dismissSplitScreenByGoHome()

}