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

Commit bbcb733d authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge changes I0ca13626,I3677ce54 into nyc-dev 

* changes:
  Fixed a flicker when closing QS without notifications
  Handled expandability and swiping while guts are exposed
parents fd6e7e67 90b6a276

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

+6 −2
Original line number Diff line number Diff line
@@ -873,7 +873,8 @@ public class NotificationStackScrollLayout extends ViewGroup 
            ExpandableNotificationRow row = (ExpandableNotificationRow) child;

            ExpandableNotificationRow parent = row.getNotificationParent();

            if (parent != null && parent.areChildrenExpanded()

                    && (mGearExposedView == parent

                    && (parent.areGutsExposed()

                        || mGearExposedView == parent

                        || (parent.getNotificationChildren().size() == 1

                                && parent.isClearable()))) {

                // In this case the group is expanded and showing the gear for the
@@ -961,6 +962,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
    public boolean canChildBeExpanded(View v) {

        return v instanceof ExpandableNotificationRow

                && ((ExpandableNotificationRow) v).isExpandable()

                && !((ExpandableNotificationRow) v).areGutsExposed()

                && (mIsExpanded || !((ExpandableNotificationRow) v).isPinned());

    }
@@ -2097,6 +2099,8 @@ public class NotificationStackScrollLayout extends ViewGroup 
        final ExpandableView firstChild = getFirstChildNotGone();

        int firstChildMinHeight = firstChild != null

                ? firstChild.getIntrinsicHeight()

                : mEmptyShadeView != null

                        ? mEmptyShadeView.getMinHeight()

                        : mCollapsedSize;

        if (mOwnScrollY > 0) {

            firstChildMinHeight = Math.max(firstChildMinHeight - mOwnScrollY, mCollapsedSize);

packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java

+6 −0
Original line number Diff line number Diff line
@@ -171,6 +171,12 @@ public class StackScrollAlgorithm { 
    }



    public static boolean canChildBeDismissed(View v) {

        if (v instanceof ExpandableNotificationRow) {

            ExpandableNotificationRow row = (ExpandableNotificationRow) v;

            if (row.areGutsExposed()) {

                return false;

            }

        }

        final View veto = v.findViewById(R.id.veto);

        return (veto != null && veto.getVisibility() != View.GONE);

    }