Merge "Fix dismiss ciricle being behind expanded view" into sc-dev

import android.view.ViewGroup;

import android.view.ViewGroup;

import android.view.ViewOutlineProvider;

import android.view.ViewOutlineProvider;

import android.view.ViewTreeObserver;

import android.view.ViewTreeObserver;

import android.view.WindowInsets;

import android.view.accessibility.AccessibilityNodeInfo;

import android.view.accessibility.AccessibilityNodeInfo;

import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;

import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;

import android.widget.FrameLayout;

import android.widget.FrameLayout;

            removeView(mDismissView);

            removeView(mDismissView);

        }

        }

        mDismissView = new DismissView(getContext());

        mDismissView = new DismissView(getContext());

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

        addView(mDismissView);

        addView(mDismissView);

        mDismissView.setElevation(elevation);

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

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

        final int dismissRadius = Settings.Secure.getInt(

        final int dismissRadius = Settings.Secure.getInt(

        // MagnetizedObjects.

        // MagnetizedObjects.

        mMagneticTarget = new MagnetizedObject.MagneticTarget(

        mMagneticTarget = new MagnetizedObject.MagneticTarget(

                mDismissView.getCircle(), dismissRadius);

                mDismissView.getCircle(), dismissRadius);

        mBubbleContainer.bringToFront();

    }

    }

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

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