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

Commit 72500c81 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Hide the stack education view when user taps" into sc-dev am:... 

Merge "Hide the stack education view when user taps" into sc-dev am: cdfc5356 am: 938929c3 am: ab34e9bf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14753038

Change-Id: Icfecb552abaeb9999798c319b3df5c3486649f11
parents 59925761 ab34e9bf

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

+3 −0
Original line number Diff line number Diff line
@@ -938,6 +938,8 @@ public class BubbleStackView extends FrameLayout 
            if (ev.getAction() == MotionEvent.ACTION_DOWN) {

                if (mShowingManage) {

                    showManageMenu(false /* show */);

                } else if (mStackEduView != null && mStackEduView.getVisibility() == VISIBLE) {

                    mStackEduView.hide(false);

                } else if (mBubbleData.isExpanded()) {

                    mBubbleData.setExpanded(false);

                }
@@ -1152,6 +1154,7 @@ public class BubbleStackView extends FrameLayout 
            mStackEduView = new StackEducationView(mContext);

            addView(mStackEduView);

        }

        mBubbleContainer.bringToFront();

        return mStackEduView.show(mPositioner.getDefaultStartPosition());

    }