Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mady Mellor
2021-06-15 16:09:56 +00:00
committed by Android (Google) Code Review
parent faee2e6b03 be613e6a98
commit 563e1b4856
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,6 @@ import android.view.View;
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;
@@ -1018,7 +1017,10 @@ public class BubbleStackView extends 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(
@@ -1028,6 +1030,8 @@ public class BubbleStackView extends FrameLayout
// 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