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

Commit efd4eb98 authored by Winson Chung's avatar Winson Chung
Browse files

Fix issue with nav bar mode check in tests 

- Don't use the version with the baked in resource constant

Bug: 129697378
Change-Id: I9b7235d10d9493273495a507ddd662a01d8870c3
parent a8bd0527

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

+6 −12
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.quickstep;



import static androidx.test.InstrumentationRegistry.getInstrumentation;



import static com.android.quickstep.NavigationModeSwitchRule.Mode.ALL;

import static com.android.quickstep.NavigationModeSwitchRule.Mode.THREE_BUTTON;

import static com.android.quickstep.NavigationModeSwitchRule.Mode.TWO_BUTTON;
@@ -27,22 +26,17 @@ import static com.android.systemui.shared.system.QuickStepContract.NAV_BAR_MODE_ 


import android.content.Context;

import android.util.Log;



import androidx.test.uiautomator.UiDevice;



import com.android.launcher3.tapl.LauncherInstrumentation;

import com.android.launcher3.tapl.TestHelpers;

import com.android.systemui.shared.system.QuickStepContract;



import org.junit.Assert;

import org.junit.rules.TestRule;

import org.junit.runner.Description;

import org.junit.runners.model.Statement;



import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

import org.junit.Assert;

import org.junit.rules.TestRule;

import org.junit.runner.Description;

import org.junit.runners.model.Statement;



/**

 * Test rule that allows executing a test with Quickstep on and then Quickstep off.
@@ -78,9 +72,9 @@ public class NavigationModeSwitchRule implements TestRule { 
                @Override

                public void evaluate() throws Throwable {

                    final Context context = getInstrumentation().getContext();

                    final String prevOverlayPkg = QuickStepContract.isGesturalMode(context)

                    final String prevOverlayPkg = LauncherInstrumentation.isGesturalMode(context)

                            ? NAV_BAR_MODE_GESTURAL_OVERLAY

                            : QuickStepContract.isSwipeUpMode(context)

                            : LauncherInstrumentation.isSwipeUpMode(context)

                                    ? NAV_BAR_MODE_2BUTTON_OVERLAY

                                    : NAV_BAR_MODE_3BUTTON_OVERLAY;

                    final LauncherInstrumentation.NavigationModel originalMode =

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

+34 −10
Original line number Diff line number Diff line
@@ -16,14 +16,13 @@ 


package com.android.launcher3.tapl;



import static com.android.launcher3.TestProtocol.BACKGROUND_APP_STATE_ORDINAL;



import android.app.ActivityManager;

import android.app.Instrumentation;

import android.app.UiAutomation;

import android.content.ContentResolver;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.graphics.Point;

import android.net.Uri;

import android.os.Build;
@@ -37,7 +36,6 @@ import android.view.MotionEvent; 
import android.view.Surface;

import android.view.ViewConfiguration;

import android.view.accessibility.AccessibilityEvent;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.test.uiautomator.By;
@@ -46,18 +44,15 @@ import androidx.test.uiautomator.Configurator; 
import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiObject2;

import androidx.test.uiautomator.Until;



import com.android.launcher3.TestProtocol;

import com.android.systemui.shared.system.QuickStepContract;



import org.junit.Assert;



import java.io.IOException;

import java.lang.ref.WeakReference;

import java.util.Deque;

import java.util.LinkedList;

import java.util.List;

import java.util.concurrent.TimeoutException;

import org.junit.Assert;



/**

 * The main tapl object. The only object that can be explicitly constructed by the using code. It
@@ -66,6 +61,8 @@ import java.util.concurrent.TimeoutException; 
public final class LauncherInstrumentation {



    private static final String TAG = "Tapl";

    private static final String NAV_BAR_INTERACTION_MODE_RES_NAME =

            "config_navBarInteractionMode";

    private static final int ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME = 20;



    // Types for launcher containers that the user is interacting with. "Background" is a
@@ -172,11 +169,11 @@ public final class LauncherInstrumentation { 
            // Workaround, use constructed context because both the instrumentation context and the

            // app context are not constructed with resources that take overlays into account

            final Context ctx = baseContext.createPackageContext("android", 0);

            if (QuickStepContract.isGesturalMode(ctx)) {

            if (isGesturalMode(ctx)) {

                return NavigationModel.ZERO_BUTTON;

            } else if (QuickStepContract.isSwipeUpMode(ctx)) {

            } else if (isSwipeUpMode(ctx)) {

                return NavigationModel.TWO_BUTTON;

            } else if (QuickStepContract.isLegacyMode(ctx)) {

            } else if (isLegacyMode(ctx)) {

                return NavigationModel.THREE_BUTTON;

            } else {

                fail("Can't detect navigation mode");
@@ -603,6 +600,33 @@ public final class LauncherInstrumentation { 
        }

    }



    public static boolean isGesturalMode(Context context) {

        return QuickStepContract.isGesturalMode(

                getSystemIntegerRes(context, NAV_BAR_INTERACTION_MODE_RES_NAME));

    }



    public static boolean isSwipeUpMode(Context context) {

        return QuickStepContract.isSwipeUpMode(

                getSystemIntegerRes(context, NAV_BAR_INTERACTION_MODE_RES_NAME));

    }



    public static boolean isLegacyMode(Context context) {

        return QuickStepContract.isLegacyMode(

                getSystemIntegerRes(context, NAV_BAR_INTERACTION_MODE_RES_NAME));

    }



    private static int getSystemIntegerRes(Context context, String resName) {

        Resources res = context.getResources();

        int resId = res.getIdentifier(resName, "integer", "android");



        if (resId != 0) {

            return res.getInteger(resId);

        } else {

            Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");

            return -1;

        }

    }



    static void sleep(int duration) {

        try {

            Thread.sleep(duration);