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

Commit c8736439 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed the behavior when dragging down on home screen with a hun" into... 

Merge "Fixed the behavior when dragging down on home screen with a hun" into qt-r1-dev am: 201d00ed am: e10fec5e
am: ec434151

Change-Id: I63b53d172865db37810972fcfa3f70d684e8f8c3
parents 87db6a1c ec434151

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java

+2 −0
Original line number Diff line number Diff line
@@ -184,4 +184,6 @@ public interface NotificationListContainer extends ExpandableView.OnHeightChange 
    default boolean containsView(View v) {

        return true;

    }



    default void setWillExpand(boolean willExpand) {};

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+8 −1
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
    private boolean mAnimateBottomOnLayout;

    private float mLastSentAppear;

    private float mLastSentExpandedHeight;

    private boolean mWillExpand;



    @Inject

    public NotificationStackScrollLayout(
@@ -4406,6 +4407,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        mStateAnimator.setShadeExpanded(isExpanded);

        mSwipeHelper.setIsExpanded(isExpanded);

        if (changed) {

            mWillExpand = false;

            if (!mIsExpanded) {

                mGroupManager.collapseAllGroups();

                mExpandHelper.cancelImmediately();
@@ -5054,7 +5056,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        if (mAnimationsEnabled && (isHeadsUp || mHeadsUpGoingAwayAnimationsAllowed)) {

            mHeadsUpChangeAnimations.add(new Pair<>(row, isHeadsUp));

            mNeedsAnimation = true;

            if (!mIsExpanded && !isHeadsUp) {

            if (!mIsExpanded && !mWillExpand && !isHeadsUp) {

                row.setHeadsUpAnimatingAway(true);

            }

            requestChildrenUpdate();
@@ -5075,6 +5077,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        requestChildrenUpdate();

    }



    @Override

    public void setWillExpand(boolean willExpand) {

        mWillExpand = willExpand;

    }



    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    public void setTrackingHeadsUp(ExpandableNotificationRow row) {

        mTrackingHeadsUp = row != null;

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+2 −1
Original line number Diff line number Diff line
@@ -1283,6 +1283,7 @@ public class NotificationPanelView extends PanelView implements 
        }

        mExpectingSynthesizedDown = true;

        onTrackingStarted();

        updatePanelExpanded();

    }



    /**
@@ -2034,7 +2035,7 @@ public class NotificationPanelView extends PanelView implements 
    }



    private void updatePanelExpanded() {

        boolean isExpanded = !isFullyCollapsed();

        boolean isExpanded = !isFullyCollapsed() || mExpectingSynthesizedDown;

        if (mPanelExpanded != isExpanded) {

            mHeadsUpManager.setIsPanelExpanded(isExpanded);

            mStatusBar.setPanelExpanded(isExpanded);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+2 −1
Original line number Diff line number Diff line
@@ -1802,6 +1802,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK);

                }

                mNotificationPanel.expand(true /* animate */);

                ((NotificationListContainer) mStackScroller).setWillExpand(true);

                mHeadsUpManager.unpinAll(true /* userUnpinned */);

                mMetricsLogger.count(NotificationPanelView.COUNTER_PANEL_OPEN, 1);

            } else if (!mNotificationPanel.isInSettings() && !mNotificationPanel.isExpanding()){

                mNotificationPanel.flingSettings(0 /* velocity */,
@@ -1939,7 +1941,6 @@ public class StatusBar extends SystemUI implements DemoMode, 


        if (start) {

            mNotificationPanel.startWaitingForOpenPanelGesture();

            setPanelExpanded(true);

        } else {

            mNotificationPanel.stopWaitingForOpenPanelGesture(velocity);

        }