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

Commit 517131ae authored by Alex Chau's avatar Alex Chau
Browse files

Enable taskbar in overview by default 

- Also changed expectation in test that taskbar is visible in overview

Fix: 245320601
Test: presubmit
Change-Id: If1ed44f542e5907860f7ab8182e4b45172346f3f
parent e2791f0c

src/com/android/launcher3/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ public final class FeatureFlags { 
            "Enables One Search box in Taskbar All Apps.");



    public static final BooleanFlag ENABLE_TASKBAR_IN_OVERVIEW = getDebugFlag(

            "ENABLE_TASKBAR_IN_OVERVIEW", false,

            "ENABLE_TASKBAR_IN_OVERVIEW", true,

            "Enables accessing the system Taskbar in overview.");



    public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag(

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+16 −11
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ public final class LauncherInstrumentation { 
                    waitUntilLauncherObjectGone(APPS_RES_ID);

                    waitUntilLauncherObjectGone(WORKSPACE_RES_ID);

                    waitUntilLauncherObjectGone(WIDGETS_RES_ID);

                    waitUntilLauncherObjectGone(TASKBAR_RES_ID);

                    checkTaskbarVisibility();

                    waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);



                    return waitForLauncherObject(OVERVIEW_RES_ID);
@@ -790,7 +790,7 @@ public final class LauncherInstrumentation { 
                    waitUntilLauncherObjectGone(APPS_RES_ID);

                    waitUntilLauncherObjectGone(WORKSPACE_RES_ID);

                    waitUntilLauncherObjectGone(WIDGETS_RES_ID);

                    waitUntilLauncherObjectGone(TASKBAR_RES_ID);

                    checkTaskbarVisibility();



                    waitForLauncherObject(SPLIT_PLACEHOLDER_RES_ID);

                    return waitForLauncherObject(OVERVIEW_RES_ID);
@@ -799,7 +799,7 @@ public final class LauncherInstrumentation { 
                    waitUntilLauncherObjectGone(APPS_RES_ID);

                    waitUntilLauncherObjectGone(WORKSPACE_RES_ID);

                    waitUntilLauncherObjectGone(WIDGETS_RES_ID);

                    waitUntilLauncherObjectGone(TASKBAR_RES_ID);

                    checkTaskbarVisibility();

                    waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);



                    return waitForFallbackLauncherObject(OVERVIEW_RES_ID);
@@ -811,14 +811,7 @@ public final class LauncherInstrumentation { 
                    waitUntilLauncherObjectGone(WIDGETS_RES_ID);

                    waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);



                    if (mIgnoreTaskbarVisibility) {

                        return null;

                    }

                    if (isTablet() && !isFallbackOverview()) {

                        waitForLauncherObject(TASKBAR_RES_ID);

                    } else {

                        waitUntilLauncherObjectGone(TASKBAR_RES_ID);

                    }

                    checkTaskbarVisibility();

                    return null;

                }

                default:
@@ -828,6 +821,18 @@ public final class LauncherInstrumentation { 
        }

    }



    private void checkTaskbarVisibility() {

        if (mIgnoreTaskbarVisibility) {

            return;

        }



        if (isTablet() && !isFallbackOverview()) {

            waitForLauncherObject(TASKBAR_RES_ID);

        } else {

            waitUntilLauncherObjectGone(TASKBAR_RES_ID);

        }

    }



    public void waitForLauncherInitialized() {

        for (int i = 0; i < 100; ++i) {

            if (getTestInfo(