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

Commit 2c5e3216 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Remove Logger classes from flicker" into main

parents 035ee7b9 4b83646c

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/CopyContentInSplit.kt

+0 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.service.splitscreen.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

import android.tools.Rotation

import android.tools.AndroidLoggerSetupRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -28,7 +27,6 @@ import com.android.wm.shell.flicker.service.common.Utils 
import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.After

import org.junit.Before

import org.junit.ClassRule

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test
@@ -66,8 +64,4 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

    }



    companion object {

        @ClassRule @JvmField val setupLoggerRule = AndroidLoggerSetupRule()

    }

}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenByDragFromNotification.kt

+0 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.service.splitscreen.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

import android.tools.Rotation

import android.tools.AndroidLoggerSetupRule

import android.tools.flicker.rules.ChangeDisplayOrientationRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry
@@ -30,7 +29,6 @@ import com.android.wm.shell.flicker.utils.SplitScreenUtils 
import org.junit.After

import org.junit.Assume

import org.junit.Before

import org.junit.ClassRule

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test
@@ -77,8 +75,4 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        secondaryApp.exit(wmHelper)

        sendNotificationApp.exit(wmHelper)

    }



    companion object {

        @ClassRule @JvmField val setupLoggerRule = AndroidLoggerSetupRule()

    }

}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenByDragFromShortcut.kt

+0 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.service.splitscreen.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

import android.tools.Rotation

import android.tools.AndroidLoggerSetupRule

import android.tools.flicker.rules.ChangeDisplayOrientationRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry
@@ -30,7 +29,6 @@ import com.android.wm.shell.flicker.utils.SplitScreenUtils 
import org.junit.After

import org.junit.Assume

import org.junit.Before

import org.junit.ClassRule

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test
@@ -88,8 +86,4 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        secondaryApp.exit(wmHelper)

        tapl.enableBlockTimeout(false)

    }



    companion object {

        @ClassRule @JvmField val setupLoggerRule = AndroidLoggerSetupRule()

    }

}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenByDragFromTaskbar.kt

+0 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.service.splitscreen.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

import android.tools.Rotation

import android.tools.AndroidLoggerSetupRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -29,7 +28,6 @@ import com.android.wm.shell.flicker.utils.SplitScreenUtils 
import org.junit.After

import org.junit.Assume

import org.junit.Before

import org.junit.ClassRule

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test
@@ -76,8 +74,4 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        secondaryApp.exit(wmHelper)

        tapl.enableBlockTimeout(false)

    }



    companion object {

        @ClassRule @JvmField val setupLoggerRule = AndroidLoggerSetupRule()

    }

}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/EnterSplitScreenFromOverview.kt

+0 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.service.splitscreen.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

import android.tools.Rotation

import android.tools.AndroidLoggerSetupRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -28,7 +27,6 @@ import com.android.wm.shell.flicker.service.common.Utils 
import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.After

import org.junit.Before

import org.junit.ClassRule

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test
@@ -72,8 +70,4 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

    }



    companion object {

        @ClassRule @JvmField val setupLoggerRule = AndroidLoggerSetupRule()

    }

}