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

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

Merge "Fix dismiss ciricle being behind expanded view" into sc-dev am: 563e1b48 

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

Change-Id: Id5efca28bb74c11167094143ca0a1a7c286fe54d
parents 116a6e04 563e1b48

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