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

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

Merge "Remove unused shelf state"

parents ba55b568 96a8bf6e

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

+0 −6
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ public class NotificationShelf extends ActivatableNotificationView implements 
            viewState.hasItemsInStableShelf = lastViewState.inShelf;

            viewState.hidden = !mAmbientState.isShadeExpanded()

                    || mAmbientState.isQsCustomizerShowing();

            viewState.maxShelfEnd = maxShelfEnd;

        } else {

            viewState.hidden = true;

            viewState.location = ExpandableViewState.LOCATION_GONE;
@@ -823,10 +822,6 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        return - (getIntrinsicHeight() - mStatusBarHeight) / 2;

    }



    public int getNotificationMergeSize() {

        return getIntrinsicHeight();

    }



    @Override

    public boolean hasNoContentHeight() {

        return true;
@@ -1018,7 +1013,6 @@ public class NotificationShelf extends ActivatableNotificationView implements 
    private class ShelfState extends ExpandableViewState {

        private float openedAmount;

        private boolean hasItemsInStableShelf;

        private float maxShelfEnd;



        @Override

        public void applyToView(View view) {