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

Commit a11bcc2a authored by Mady Mellor's avatar Mady Mellor
Browse files

Don't show user education when integration tests are running 

Test: atest PlatformScenarioTests:android.platform.test.scenario.sysui.bubble.Overflow
Fixes: 150344903
Change-Id: I9167359811bb2d105fcd6b075b95aa283ff25e30
parent 35185d54

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+7 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.animation.AnimatorSet; 
import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.annotation.SuppressLint;

import android.app.ActivityManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;
@@ -1116,6 +1117,9 @@ public class BubbleStackView extends FrameLayout 
     * Whether the educational view should show for the expanded view "manage" menu.

     */

    private boolean shouldShowManageEdu() {

        if (ActivityManager.isRunningInTestHarness()) {

            return false;

        }

        final boolean seen = getPrefBoolean(ManageEducationViewKt.PREF_MANAGED_EDUCATION);

        final boolean shouldShow = (!seen || BubbleDebugConfig.forceShowUserEducation(mContext))

                && mExpandedBubble != null;
@@ -1140,6 +1144,9 @@ public class BubbleStackView extends FrameLayout 
     * Whether education view should show for the collapsed stack.

     */

    private boolean shouldShowStackEdu() {

        if (ActivityManager.isRunningInTestHarness()) {

            return false;

        }

        final boolean seen = getPrefBoolean(StackEducationViewKt.PREF_STACK_EDUCATION);

        final boolean shouldShow = !seen || BubbleDebugConfig.forceShowUserEducation(mContext);

        if (BubbleDebugConfig.DEBUG_USER_EDUCATION) {