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

Commit fdd044e1 authored by Brian Isganitis's avatar Brian Isganitis
Browse files

Expose IS_RUNNING_IN_TEST_HARNESS as static method. 

This variable is now mutable, making the uppercase format misleading.
For instance, users might assume they can use this value in other
immutable properties, when they really should be accessing the latest
value every time they need it.

Context: https://source.android.com/docs/setup/contribute/code-style#follow-field-naming-conventions

Test: Manual
Bug: 271160958
Change-Id: Iaaa51d9153cb8a7d686c72e1210b1948029dcfd5
parent aa08af87

quickstep/src/com/android/launcher3/model/AppEventProducer.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class AppEventProducer implements StatsLogConsumer { 
    private void sendEvent(AppTarget target, LauncherAtom.ItemInfo locationInfo, int eventId,

            int targetPredictor) {

        // TODO: remove the running test check when b/231648228 is fixed.

        if (target != null && !Utilities.IS_RUNNING_IN_TEST_HARNESS) {

        if (target != null && !Utilities.isRunningInTestHarness()) {

            AppTargetEvent event = new AppTargetEvent.Builder(target, eventId)

                    .setLaunchLocation(getContainer(locationInfo))

                    .build();

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

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
     * Returns {@code true} if a Taskbar education should be shown on application launch.

     */

    public boolean shouldShowEduOnAppLaunch() {

        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {

        if (Utilities.isRunningInTestHarness()) {

            return false;

        }

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

+2 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; 


import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;

import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE;

import static com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS;

import static com.android.launcher3.Utilities.isRunningInTestHarness;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN;

import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING;

import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_FULLSCREEN;
@@ -105,7 +105,6 @@ import com.android.systemui.unfold.updates.RotationChangeProvider; 
import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider;



import java.io.PrintWriter;

import java.util.function.Consumer;



/**

 * The {@link ActivityContext} with which we inflate Taskbar-related Views. This allows UI elements
@@ -336,8 +335,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        int windowFlags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE

                | WindowManager.LayoutParams.FLAG_SLIPPERY

                | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH;

        if (DisplayController.isTransientTaskbar(this)

                && !IS_RUNNING_IN_TEST_HARNESS) {

        if (DisplayController.isTransientTaskbar(this) && !isRunningInTestHarness()) {

            windowFlags |= WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                    | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;

        }

quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import com.airbnb.lottie.LottieProperty.COLOR_FILTER 
import com.airbnb.lottie.model.KeyPath

import com.android.launcher3.R

import com.android.launcher3.Utilities

import com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS

import com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_EDU_TOOLTIP

import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_EDU_OPEN

import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController
@@ -57,7 +56,7 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) : 
    LoggableTaskbarController {



    private val isTooltipEnabled: Boolean

        get() = !IS_RUNNING_IN_TEST_HARNESS && ENABLE_TASKBAR_EDU_TOOLTIP.get()

        get() = !Utilities.isRunningInTestHarness() && ENABLE_TASKBAR_EDU_TOOLTIP.get()

    private val isOpen: Boolean

        get() = tooltip?.isOpen ?: false

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

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ import java.util.StringJoiner; 
        updateIconAlphaForHome(taskbarWillBeVisible ? 1 : 0);



        // Sync the first frame where we swap taskbar and hotseat.

        if (firstFrameVisChanged && mCanSyncViews && !Utilities.IS_RUNNING_IN_TEST_HARNESS) {

        if (firstFrameVisChanged && mCanSyncViews && !Utilities.isRunningInTestHarness()) {

            ViewRootSync.synchronizeNextDraw(mLauncher.getHotseat(),

                    mControllers.taskbarActivityContext.getDragLayer(),

                    () -> {});