Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17de8004 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Enable short shelf for split shade"

parents 531d778d 4c3248c4

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+1 −5
Original line number Diff line number Diff line
@@ -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();

    }