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

Commit bad834c0 authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "Remove unused field from the NSSL" into main

parents cfae7a56 316ae626
Loading
Loading
Loading
Loading
+0 −17
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrim
import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrollState;
import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScrollView;
import com.android.systemui.statusbar.phone.HeadsUpAppearanceController;
import com.android.systemui.statusbar.phone.ScreenOffAnimationController;
import com.android.systemui.statusbar.policy.ScrollAdapter;
import com.android.systemui.statusbar.policy.SplitShadeStateController;
import com.android.systemui.util.Assert;
@@ -282,11 +281,9 @@ public class NotificationStackScrollLayout
    private boolean mExpandedInThisMotion;
    private boolean mShouldShowShelfOnly;
    protected boolean mScrollingEnabled;
    private boolean mIsCurrentUserSetup;
    protected FooterView mFooterView;
    protected EmptyShadeView mEmptyShadeView;
    private boolean mClearAllInProgress;
    private FooterClearAllListener mFooterClearAllListener;
    private boolean mFlingAfterUpEvent;
    /**
     * Was the scroller scrolled to the top when the down motion was observed?
@@ -467,7 +464,6 @@ public class NotificationStackScrollLayout
    boolean mHeadsUpAnimatingAway;
    private Consumer<Boolean> mHeadsUpAnimatingAwayListener;
    private int mStatusBarState;
    private int mUpcomingStatusBarState;
    private boolean mHeadsUpGoingAwayAnimationsAllowed = true;
    private final Runnable mReflingAndAnimateScroll = this::animateScroll;
    private int mCornerRadius;
@@ -498,7 +494,6 @@ public class NotificationStackScrollLayout
    private float mLastSentExpandedHeight;
    private boolean mWillExpand;
    private int mGapHeight;
    private boolean mIsRemoteInputActive;

    /**
     * The extra inset during the full shade transition
@@ -572,10 +567,8 @@ public class NotificationStackScrollLayout
    private boolean mDismissUsingRowTranslationX = true;
    private ExpandableNotificationRow mTopHeadsUpRow;
    private NotificationStackScrollLayoutController.TouchHandler mTouchHandler;
    private final ScreenOffAnimationController mScreenOffAnimationController;
    private boolean mShouldUseSplitNotificationShade;
    private boolean mShouldSkipTopPaddingAnimationAfterFold = false;
    private boolean mHasFilteredOutSeenNotifications;
    @Nullable private SplitShadeStateController mSplitShadeStateController = null;
    private boolean mIsSmallLandscapeLockscreenEnabled = false;
    private boolean mSuppressHeightUpdates;
@@ -635,9 +628,6 @@ public class NotificationStackScrollLayout
        }
    };

    @Nullable
    private OnClickListener mManageButtonClickListener;

    @Nullable
    private WallpaperInteractor mWallpaperInteractor;

@@ -650,8 +640,6 @@ public class NotificationStackScrollLayout
        mDebugLines = mFeatureFlags.isEnabled(Flags.NSSL_DEBUG_LINES);
        mDebugRemoveAnimation = mFeatureFlags.isEnabled(Flags.NSSL_DEBUG_REMOVE_ANIMATION);
        mSectionsManager = Dependency.get(NotificationSectionsManager.class);
        mScreenOffAnimationController =
                Dependency.get(ScreenOffAnimationController.class);
        mSectionsManager.initialize(this);
        mSections = mSectionsManager.createSectionsForBuckets();

@@ -5403,7 +5391,6 @@ public class NotificationStackScrollLayout
            println(pw, "suppressChildrenMeasureLayout", mSuppressChildrenMeasureAndLayout);
            println(pw, "scrollY", mAmbientState.getScrollY());
            println(pw, "showShelfOnly", mShouldShowShelfOnly);
            println(pw, "isCurrentUserSetup", mIsCurrentUserSetup);
            println(pw, "hideAmount", mAmbientState.getHideAmount());
            println(pw, "ambientStateSwipingUp", mAmbientState.isSwipingUp());
            println(pw, "maxDisplayedNotifications", mMaxDisplayedNotifications);
@@ -6793,10 +6780,6 @@ public class NotificationStackScrollLayout
        void onClearAll(@SelectedRows int selectedRows);
    }

    interface FooterClearAllListener {
        void onClearAll();
    }

    interface ClearAllAnimationListener {
        void onAnimationEnd(
                List<ExpandableNotificationRow> viewsToRemove, @SelectedRows int selectedRows);