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

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

Merge "Remove Taskbar and Taskbar EDU flags." into tm-dev

parents d8f81e9b 58c27cce

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+1 −6
Original line number Diff line number Diff line
@@ -228,8 +228,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
     * Whether the taskbar education should be shown.

     */

    public boolean shouldShowEdu() {

        return FeatureFlags.ENABLE_TASKBAR_EDU.get()

                && !Utilities.IS_RUNNING_IN_TEST_HARNESS

        return !Utilities.IS_RUNNING_IN_TEST_HARNESS

                && !mLauncher.getOnboardingPrefs().getBoolean(OnboardingPrefs.TASKBAR_EDU_SEEN);

    }
@@ -237,10 +236,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
     * Manually ends the taskbar education flow.

     */

    public void hideEdu() {

        if (!FeatureFlags.ENABLE_TASKBAR_EDU.get()) {

            return;

        }



        mControllers.taskbarEduController.hideEdu();

    }

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+1 −2
Original line number Diff line number Diff line
@@ -236,8 +236,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen 
        DeviceProfile dp =

                mUserUnlocked ? LauncherAppState.getIDP(mContext).getDeviceProfile(mContext) : null;



        boolean isTaskBarEnabled =

                FeatureFlags.ENABLE_TASKBAR.get() && dp != null && dp.isTaskbarPresent;

        boolean isTaskBarEnabled = dp != null && dp.isTaskbarPresent;



        if (!isTaskBarEnabled) {

            SystemUiProxy.INSTANCE.get(mContext)

src/com/android/launcher3/DeviceProfile.java

+1 −2
Original line number Diff line number Diff line
@@ -245,8 +245,7 @@ public class DeviceProfile { 
        isTablet = info.isTablet(windowBounds);

        isPhone = !isTablet;

        isTwoPanels = isTablet && useTwoPanels;

        isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS

                && FeatureFlags.ENABLE_TASKBAR.get();

        isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS;



        // Some more constants.

        context = getContext(context, info, isVerticalBarLayout() || (isTablet && isLandscape)

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

+0 −6
Original line number Diff line number Diff line
@@ -197,12 +197,6 @@ public final class FeatureFlags { 
            "ENABLE_APP_PREDICTIONS_WHILE_VISIBLE", true, "Allows app "

            + "predictions to be updated while they are visible to the user.");



    public static final BooleanFlag ENABLE_TASKBAR = getDebugFlag(

            "ENABLE_TASKBAR", true, "Allows a system Taskbar to be shown on larger devices.");



    public static final BooleanFlag ENABLE_TASKBAR_EDU = getDebugFlag("ENABLE_TASKBAR_EDU", true,

            "Enables showing taskbar education the first time an app is opened.");



    public static final BooleanFlag ENABLE_TASKBAR_POPUP_MENU = getDebugFlag(

            "ENABLE_TASKBAR_POPUP_MENU", true, "Enables long pressing taskbar icons to show the"

                    + " popup menu.");