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

Commit 22fbd838 authored by Mady Mellor's avatar Mady Mellor
Browse files

Fix touches activating TaskView when showing user education 

Test: manual - force user education to show, expand a bubble
             - while manage user education is up tap on the
               task view & verify the user education hides
Bug: 195592791
Change-Id: Ie0e3647b8ea68ed8504b3ad7f27713ba15c5a8ca
parent 20408073

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ class ManageEducationView constructor(context: Context, positioner: BubblePositi 


    private var isHiding = false

    private var realManageButtonRect = Rect()

    private var bubbleExpandedView: BubbleExpandedView? = null



    init {

        LayoutInflater.from(context).inflate(R.layout.bubbles_manage_button_education, this)
@@ -97,6 +98,9 @@ class ManageEducationView constructor(context: Context, positioner: BubblePositi 
        setButtonColor()

        if (visibility == VISIBLE) return



        bubbleExpandedView = expandedView

        expandedView.taskView?.setObscuredTouchRect(Rect(positioner.screenRect))



        layoutParams.width = if (positioner.isLargeScreen)

            context.resources.getDimensionPixelSize(

                    R.dimen.bubbles_user_education_width_large_screen)
@@ -131,6 +135,7 @@ class ManageEducationView constructor(context: Context, positioner: BubblePositi 
    }



    fun hide() {

        bubbleExpandedView?.taskView?.setObscuredTouchRect(null)

        if (visibility != VISIBLE || isHiding) return



        animate()