diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java index 3411eab23d63b..ff9fc30768b19 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java @@ -86,7 +86,6 @@ public class NotificationShelf extends ActivatableNotificationView implements private float mCornerAnimationDistance; private NotificationShelfController mController; private int mActualWidth = -1; - private boolean mUseSplitShade; /** Fraction of lockscreen to shade animation (on lockscreen swipe down). */ private float mFractionToShade; @@ -138,9 +137,6 @@ public class NotificationShelf extends ActivatableNotificationView implements mCornerAnimationDistance = res.getDimensionPixelSize( R.dimen.notification_corner_animation_distance); - // TODO(b/213480466) enable short shelf on split shade - mUseSplitShade = Utils.shouldUseSplitNotificationShade(mContext.getResources()); - mShelfIcons.setInNotificationIconShelf(true); if (!mShowNotificationShelf) { setVisibility(GONE); @@ -233,7 +229,7 @@ public class NotificationShelf extends ActivatableNotificationView implements */ @VisibleForTesting public void updateStateWidth(ShelfState shelfState, float fraction, int shortestWidth) { - shelfState.actualWidth = !mUseSplitShade && mAmbientState.isOnKeyguard() + shelfState.actualWidth = mAmbientState.isOnKeyguard() ? (int) MathUtils.lerp(shortestWidth, getWidth(), fraction) : getWidth(); }