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

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

Fix dismiss ciricle being behind expanded view 

- Need to give it an elevation
- Need to make sure to bring the bubble container
  in front of it so that they appear on top

Test: manual - have at least 2 bubbles, expand the stack, drag
               the bubble that is not expanded to the dismiss view
             => observe that the dismiss view is above the expanded
                view & below the bubble
Bug: 190478161
Change-Id: Ifbce49211b2342c3e197168af38f4c2ca9a1904b
parent 01aedfcd

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

+5 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.ViewOutlineProvider;

import android.view.ViewTreeObserver;

import android.view.WindowInsets;

import android.view.accessibility.AccessibilityNodeInfo;

import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;

import android.widget.FrameLayout;
@@ -1018,7 +1017,10 @@ public class BubbleStackView extends FrameLayout 
            removeView(mDismissView);

        }

        mDismissView = new DismissView(getContext());

        int elevation = getResources().getDimensionPixelSize(R.dimen.bubble_elevation);



        addView(mDismissView);

        mDismissView.setElevation(elevation);



        final ContentResolver contentResolver = getContext().getContentResolver();

        final int dismissRadius = Settings.Secure.getInt(
@@ -1028,6 +1030,8 @@ public class BubbleStackView extends FrameLayout 
        // MagnetizedObjects.

        mMagneticTarget = new MagnetizedObject.MagneticTarget(

                mDismissView.getCircle(), dismissRadius);



        mBubbleContainer.bringToFront();

    }



    // TODO: Create ManageMenuView and move setup / animations there