Merge "Don't show user education when integration tests are running" into sc-v2-dev (91ce4753) · Commits · e / os / android_frameworks_base

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) {