Merge "Remove corner cutout tracking from HeadsUpStatusBarView" into sc-dev am: 8261dc7483
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14722672
Change-Id: Ib66f5121f0b40142f260c82139dec65c3da8f813
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java
index b33424c..acfd998 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java
@@ -35,7 +35,6 @@
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.collection.NotificationEntry.OnSensitivityChangedListener;
-import java.util.List;
/**
* The view in the statusBar that contains part of the heads-up information
@@ -55,10 +54,8 @@
private int[] mTmpPosition = new int[2];
private boolean mFirstLayout = true;
private int mMaxWidth;
- private View mRootView;
private int mSysWinInset;
private int mCutOutInset;
- private List<Rect> mCutOutBounds;
private Rect mIconDrawingRect = new Rect();
private Point mDisplaySize;
private Runnable mOnDrawingRectChangedListener;
@@ -197,19 +194,7 @@
int targetPadding = mAbsoluteStartPadding + mSysWinInset + mCutOutInset;
boolean isRtl = isLayoutRtl();
int start = isRtl ? (mDisplaySize.x - right) : left;
-
if (start != targetPadding) {
- if (mCutOutBounds != null) {
- for (Rect cutOutRect : mCutOutBounds) {
- int cutOutStart = (isRtl)
- ? (mDisplaySize.x - cutOutRect.right) : cutOutRect.left;
- if (start > cutOutStart) {
- start -= cutOutRect.width();
- break;
- }
- }
- }
-
int newPadding = targetPadding - start + getPaddingStart();
setPaddingRelative(newPadding, 0, mEndMargin, 0);
}
@@ -252,12 +237,6 @@
getDisplaySize();
- mCutOutBounds = null;
- if (displayCutout != null && displayCutout.getSafeInsetRight() == 0
- && displayCutout.getSafeInsetLeft() == 0) {
- mCutOutBounds = displayCutout.getBoundingRects();
- }
-
// For Double Cut Out mode, the System window navigation bar is at the right
// side of the left cut out. In this condition, mSysWinInset include the left cut
// out width so we set mCutOutInset to be 0. For RTL, the condition is the same.