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

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

Merge "Give NSSL.mListener a more descriptive name" into main

parents a8ebb58d 13c0ceb9
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -258,7 +258,7 @@ public class NotificationStackScrollLayout
    private float mOverScrolledBottomPixels;
    private float mOverScrolledBottomPixels;
    private final ListenerSet<Runnable> mStackHeightChangedListeners = new ListenerSet<>();
    private final ListenerSet<Runnable> mStackHeightChangedListeners = new ListenerSet<>();
    private final ListenerSet<Runnable> mHeadsUpHeightChangedListeners = new ListenerSet<>();
    private final ListenerSet<Runnable> mHeadsUpHeightChangedListeners = new ListenerSet<>();
    private NotificationLogger.OnChildLocationsChangedListener mListener;
    private NotificationLogger.OnChildLocationsChangedListener mLegacyLocationsChangedListener;
    private OnNotificationLocationsChangedListener mLocationsChangedListener;
    private OnNotificationLocationsChangedListener mLocationsChangedListener;
    private OnOverscrollTopChangedListener mOverscrollTopChangedListener;
    private OnOverscrollTopChangedListener mOverscrollTopChangedListener;
    private ExpandableView.OnHeightChangedListener mOnHeightChangedListener;
    private ExpandableView.OnHeightChangedListener mOnHeightChangedListener;
@@ -1281,7 +1281,7 @@ public class NotificationStackScrollLayout
    public void setChildLocationsChangedListener(
    public void setChildLocationsChangedListener(
            NotificationLogger.OnChildLocationsChangedListener listener) {
            NotificationLogger.OnChildLocationsChangedListener listener) {
        NotificationsLiveDataStoreRefactor.assertInLegacyMode();
        NotificationsLiveDataStoreRefactor.assertInLegacyMode();
        mListener = listener;
        mLegacyLocationsChangedListener = listener;
    }
    }


    private void setMaxLayoutHeight(int maxLayoutHeight) {
    private void setMaxLayoutHeight(int maxLayoutHeight) {
@@ -4433,8 +4433,8 @@ public class NotificationStackScrollLayout
                mLocationsChangedListener.onChildLocationsChanged(collectVisibleLocationsCallable);
                mLocationsChangedListener.onChildLocationsChanged(collectVisibleLocationsCallable);
            }
            }
        } else {
        } else {
            if (mListener != null) {
            if (mLegacyLocationsChangedListener != null) {
                mListener.onChildLocationsChanged();
                mLegacyLocationsChangedListener.onChildLocationsChanged();
            }
            }
        }
        }