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

Commit 7a9686b4 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

Merge "Fixing com.android.quickstep.TaplTestsTransientTaskbar#testSwipeToStashAndUnstash" into main

parents 8b35defb 4f56608a

quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java

+2 −2
Original line number Diff line number Diff line 
package com.android.quickstep;



import static com.android.launcher3.taskbar.TaskbarThresholdUtils.getFromNavThreshold;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;



import android.app.Activity;
@@ -10,7 +11,6 @@ import android.os.Bundle; 


import androidx.annotation.Nullable;



import com.android.launcher3.R;

import com.android.launcher3.taskbar.TaskbarActivityContext;

import com.android.launcher3.testing.TestInformationHandler;

import com.android.launcher3.testing.shared.TestProtocol;
@@ -99,7 +99,7 @@ public class QuickstepTestInformationHandler extends TestInformationHandler { 
            case TestProtocol.REQUEST_TASKBAR_FROM_NAV_THRESHOLD: {

                final Resources resources = mContext.getResources();

                response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD,

                        resources.getDimensionPixelSize(R.dimen.taskbar_from_nav_threshold));

                        getFromNavThreshold(resources, mDeviceProfile));

                return response;

            }

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.test.filters.LargeTest; 
import androidx.test.runner.AndroidJUnit4;



import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape;

import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;



import org.junit.Test;
@@ -69,6 +70,7 @@ public class TaplTestsTransientTaskbar extends AbstractTaplTestsTaskbar { 
    @Test

    @TaskbarModeSwitch(mode = TRANSIENT)

    @PortraitLandscape

    @ScreenRecord // b/317798731

    public void testSwipeToStashAndUnstash() {

        getTaskbar().swipeDownToStash();

        mLauncher.getLaunchedAppState().swipeUpToUnstashTaskbar();