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

Commit b9bbc264 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move EnterDesktopFromKeyboardShortcut from /fundamentals into... 

Merge "Move EnterDesktopFromKeyboardShortcut from /fundamentals into /keyboardhosrtcuts subfolder" into main
parents 88a96f40 5345b4e3

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ test_module_config { 
    exclude_filters: [

        "com.android.wm.shell.flicker.fundamentals.CloseAllAppsViaAppHeaderExitTest",

        "com.android.wm.shell.flicker.fundamentals.CloseAllAppsWithBackNavigationTest",

        "com.android.wm.shell.flicker.fundamentals.EnterDesktopFromKeyboardShortcutFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.EnterDesktopFromSplitScreenWithAppHandleMenuFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.EnterDesktopWithAppHandleMenuFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.EnterDesktopWithDragFlickerTest",
@@ -60,6 +59,7 @@ test_module_config { 
        "com.android.wm.shell.flicker.fundamentals.SwitchFocusBetweenAppsTest",

        "com.android.wm.shell.flicker.fundamentals.SwitchToHomeFromDesktopTest",

        "com.android.wm.shell.flicker.fundamentals.SwitchToOverviewFromDesktopFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.EnterDesktopFromKeyboardShortcutFlickerTest",

        "com.android.wm.shell.flicker.maximize.MaximizeAppDoubleTapAppHeaderFlickerTest",

        "com.android.wm.shell.flicker.maximize.MaximizeAppFlickerTest",

        "com.android.wm.shell.flicker.maximize.MaximizeAppNonResizableFlickerTest",
@@ -105,13 +105,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.CloseAllAppsWithBackNavigationTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-EnterDesktopFromKeyboardShortcutFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.fundamentals.EnterDesktopFromKeyboardShortcutFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-EnterDesktopFromSplitScreenWithAppHandleMenuFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -203,6 +196,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.SwitchToOverviewFromDesktopFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-EnterDesktopFromKeyboardShortcutFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.EnterDesktopFromKeyboardShortcutFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppDoubleTapAppHeaderFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/TEST_MAPPING

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-CloseAllAppsWithBackNavigationTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-EnterDesktopFromKeyboardShortcutFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-EnterDesktopFromSplitScreenWithAppHandleMenuFlickerTest"

    },
@@ -51,6 +48,9 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-keyboardshortcuts-AltTabSwitchInDesktopModeFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-keyboardshortcuts-EnterDesktopFromKeyboardShortcutFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppDoubleTapAppHeaderFlickerTest"

    },

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/fundamentals/EnterDesktopFromKeyboardShortcutFlickerTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/keyboardshortcuts/EnterDesktopFromKeyboardShortcutFlickerTest.kt

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

 */



package com.android.wm.shell.flicker.fundamentals

package com.android.wm.shell.flicker.keyboardshortcuts



import androidx.test.filters.RequiresDevice

import android.tools.NavBar

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ test_module_config { 
        "com.android.wm.shell.functional.UnminimizeAppFromTaskbarTest",

        "com.android.wm.shell.functional.fundamentals.CloseAllAppsViaAppHeaderExitTest",

        "com.android.wm.shell.functional.fundamentals.CloseAllAppsWithBackNavigationTest",

        "com.android.wm.shell.functional.fundamentals.EnterDesktopFromKeyboardShortcutTest",

        "com.android.wm.shell.functional.fundamentals.EnterDesktopFromSplitScreenWithAppHandleMenuTest",

        "com.android.wm.shell.functional.fundamentals.EnterDesktopWithAppHandleMenuTest",

        "com.android.wm.shell.functional.fundamentals.EnterDesktopWithDragTest",
@@ -131,6 +130,7 @@ test_module_config { 
        "com.android.wm.shell.functional.fundamentals.focus.DragAndKeepFocusTest",

        "com.android.wm.shell.functional.fundamentals.focus.MoveToNextDisplayAndFocusTest",

        "com.android.wm.shell.functional.fundamentals.focus.OpenAndFocusTest",

        "com.android.wm.shell.functional.keyboardshortcuts.EnterDesktopFromKeyboardShortcutTest",

        "com.android.wm.shell.functional.maximize.MaximizeAppWindowTest",

        "com.android.wm.shell.functional.maximize.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

        "com.android.wm.shell.functional.maximize.MaximizeAppWindowWithDragToTopDragZoneTest",
@@ -341,13 +341,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.CloseAllAppsWithBackNavigationTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-EnterDesktopFromKeyboardShortcutTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.fundamentals.EnterDesktopFromKeyboardShortcutTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-EnterDesktopFromSplitScreenWithAppHandleMenuTest",

    base: "FunctionalTestsDesktopMode",
@@ -474,6 +467,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.focus.OpenAndFocusTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-EnterDesktopFromKeyboardShortcutTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.keyboardshortcuts.EnterDesktopFromKeyboardShortcutTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowTest",

    base: "FunctionalTestsDesktopMode",

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/TEST_MAPPING

+3 −3
Original line number Diff line number Diff line
@@ -99,9 +99,6 @@ 
    {

      "name": "FunctionalTestsDesktopMode-fundamentals-CloseAllAppsWithBackNavigationTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-EnterDesktopFromKeyboardShortcutTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-EnterDesktopFromSplitScreenWithAppHandleMenuTest"

    },
@@ -156,6 +153,9 @@ 
    {

      "name": "FunctionalTestsDesktopMode-fundamentals-focus-OpenAndFocusTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-keyboardshortcuts-EnterDesktopFromKeyboardShortcutTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowTest"

    },