diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java index bfa43fde03d0a..dba7130793cad 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java @@ -42,7 +42,6 @@ public class ScrimView extends View private float mViewAlpha = 1.0f; private ValueAnimator mAlphaAnimator; private Rect mExcludedRect = new Rect(); - private int mLeftInset = 0; private boolean mHasExcludedArea; private ValueAnimator.AnimatorUpdateListener mAlphaUpdateListener = new ValueAnimator.AnimatorUpdateListener() { @@ -88,12 +87,12 @@ public class ScrimView extends View if (mExcludedRect.top > 0) { canvas.drawRect(0, 0, getWidth(), mExcludedRect.top, mPaint); } - if (mExcludedRect.left + mLeftInset > 0) { - canvas.drawRect(0, mExcludedRect.top, mExcludedRect.left + mLeftInset, - mExcludedRect.bottom, mPaint); + if (mExcludedRect.left > 0) { + canvas.drawRect(0, mExcludedRect.top, mExcludedRect.left, mExcludedRect.bottom, + mPaint); } - if (mExcludedRect.right + mLeftInset < getWidth()) { - canvas.drawRect(mExcludedRect.right + mLeftInset, + if (mExcludedRect.right < getWidth()) { + canvas.drawRect(mExcludedRect.right, mExcludedRect.top, getWidth(), mExcludedRect.bottom, @@ -184,14 +183,4 @@ public class ScrimView extends View public void setChangeRunnable(Runnable changeRunnable) { mChangeRunnable = changeRunnable; } - - public void setLeftInset(int leftInset) { - if (mLeftInset != leftInset) { - mLeftInset = leftInset; - - if (mHasExcludedArea) { - invalidate(); - } - } - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 0e74e579624b6..749ff99e9c6d3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -556,10 +556,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, mScrimBehind.setExcludedArea(area); } - public void setLeftInset(int inset) { - mScrimBehind.setLeftInset(inset); - } - public int getScrimBehindColor() { return mScrimBehind.getScrimColorWithAlpha(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index f6dd88d9a475f..487f0e73959ce 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -130,7 +130,6 @@ public class StatusBarWindowView extends FrameLayout { } private void applyMargins() { - mService.mScrimController.setLeftInset(mLeftInset); final int N = getChildCount(); for (int i = 0; i < N; i++) { View child = getChildAt(i);