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

Commit 5feb4a96 authored by Mykola Podolian's avatar Mykola Podolian Committed by Android (Google) Code Review
Browse files

Merge "Fix falling tapl tests" into main

parents 02cc26f0 39383dd5

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

+4 −3
Original line number Diff line number Diff line
@@ -463,7 +463,8 @@ public class TaskbarLauncherStateController { 
            controllers.bubbleStashController.setBubblesShowingOnOverview(onOverview);

        });



        mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_OVERVIEW,

        TaskbarStashController stashController = mControllers.taskbarStashController;

        stashController.updateStateForFlag(FLAG_IN_OVERVIEW,

                mLauncherState == LauncherState.OVERVIEW);



        AnimatorSet animatorSet = new AnimatorSet();
@@ -495,8 +496,6 @@ public class TaskbarLauncherStateController { 
                public void onAnimationStart(Animator animation) {

                    mIsAnimatingToLauncher = isInLauncher;



                    TaskbarStashController stashController =

                            mControllers.taskbarStashController;

                    if (DEBUG) {

                        Log.d(TAG, "onAnimationStart - FLAG_IN_APP: " + !isInLauncher);

                    }
@@ -512,6 +511,8 @@ public class TaskbarLauncherStateController { 


            // Handle closing open popups when going home/overview

            handleOpenFloatingViews = true;

        } else {

            stashController.applyState();

        }



        if (handleOpenFloatingViews && isInLauncher) {

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

+4 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
                    TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR,

                    !hasAnyFlag(FLAG_STASHED_IN_APP_AUTO));

        }

        if (hasAnyFlag(changedFlags, FLAG_IN_OVERVIEW | FLAG_IN_APP)) {

            mControllers.runAfterInit(() -> mControllers.taskbarInsetsController

                    .onTaskbarOrBubblebarWindowHeightOrInsetsChanged());

        }

        mActivity.applyForciblyShownFlagWhileTransientTaskbarUnstashed(!isStashedInApp());

    }

quickstep/tests/src/com/android/quickstep/TaplTestsPersistentTaskbar.java

+0 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import androidx.test.runner.AndroidJUnit4; 
import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;



import org.junit.Assert;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -31,8 +30,6 @@ import org.junit.runner.RunWith; 
@RunWith(AndroidJUnit4.class)

public class TaplTestsPersistentTaskbar extends AbstractTaplTestsTaskbar {



    //TODO(b/359277238): fix falling tests

    @Ignore

    @Test

    @NavigationModeSwitch

    public void testTaskbarFillsWidth() {

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+0 −2
Original line number Diff line number Diff line
@@ -516,8 +516,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
                isInState(() -> LauncherState.NORMAL));

    }



    //TODO(b/359277238): fix falling tests

    @Ignore

    @Test

    @PortraitLandscape

    @TaskbarModeSwitch

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public final class Taskbar { 


        if (!mLauncher.isTransientTaskbar()) {

            Assert.assertEquals("Persistent taskbar should fill screen width",

                    getVisibleBounds().width(), mLauncher.getRealDisplaySize().x);

                    mLauncher.getRealDisplaySize().x, getVisibleBounds().width());

        }

    }