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

Commit 5dec2ace authored by Alex Chau's avatar Alex Chau
Browse files

Revert "Revert "Enable taskbar in overview by default"" 

This reverts commit 6f0b0fe7.

Bug: 245320601
Reason for revert: Re-land "Enable taskbar in overview by default"

Change-Id: Ie722a608d6bd7168744ffc81c156e4307d4c1d2d
parent 7b467add

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

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,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

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

                    waitUntilLauncherObjectGone(WORKSPACE_RES_ID);

                    waitUntilLauncherObjectGone(WIDGETS_RES_ID);

                    if (isTablet()) {

                        waitForSystemLauncherObject(TASKBAR_RES_ID);

                    } else {

                        waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID);

                    }

                    waitUntilSystemLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID);



                    return waitForSystemLauncherObject(OVERVIEW_RES_ID);
@@ -836,7 +840,11 @@ public final class LauncherInstrumentation { 
                    waitUntilLauncherObjectGone(APPS_RES_ID);

                    waitUntilLauncherObjectGone(WORKSPACE_RES_ID);

                    waitUntilLauncherObjectGone(WIDGETS_RES_ID);

                    if (isTablet()) {

                        waitForSystemLauncherObject(TASKBAR_RES_ID);

                    } else {

                        waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID);

                    }



                    waitForSystemLauncherObject(SPLIT_PLACEHOLDER_RES_ID);

                    return waitForSystemLauncherObject(OVERVIEW_RES_ID);