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

Commit 5b2b8bf1 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Remove dividers when expanding groups." into sc-dev am: 5f1b2bdd am: b0f3c9d7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15013931

Change-Id: Ie097589c0bcd6e0987ae1a1c11822768ea5f402d
parents cc1b2feb b0f3c9d7

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ 
    <!-- Whether or not the dividing lines should be shown when the container is expanding and

         collapsing. If this value is true, then the lines will only show when the container has

         been completely expanded. -->

    <bool name="config_hideDividersDuringExpand">false</bool>

    <bool name="config_hideDividersDuringExpand">true</bool>



    <!-- Whether or not child notifications that are part of a group will have shadows. -->

    <bool name="config_enableShadowOnChildNotifications">true</bool>

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

+8 −8
Original line number Diff line number Diff line
@@ -710,10 +710,10 @@ public class NotificationChildrenContainer extends ViewGroup { 
        if (mUserLocked) {

            expandFraction = getGroupExpandFraction();

        }

        final boolean dividersVisible = mUserLocked && !showingAsLowPriority()

                || (mChildrenExpanded && mShowDividersWhenExpanded)

                || (mContainingNotification.isGroupExpansionChanging()

                && !mHideDividersDuringExpand);

        final boolean isExpanding = !showingAsLowPriority()

                && (mUserLocked || mContainingNotification.isGroupExpansionChanging());

        final boolean dividersVisible = (mChildrenExpanded && mShowDividersWhenExpanded)

                || (isExpanding && !mHideDividersDuringExpand);

        for (int i = 0; i < childCount; i++) {

            ExpandableNotificationRow child = mAttachedChildren.get(i);

            ExpandableViewState viewState = child.getViewState();
@@ -789,10 +789,10 @@ public class NotificationChildrenContainer extends ViewGroup { 
        int childCount = mAttachedChildren.size();

        ViewState tmpState = new ViewState();

        float expandFraction = getGroupExpandFraction();

        final boolean dividersVisible = mUserLocked && !showingAsLowPriority()

                || (mChildrenExpanded && mShowDividersWhenExpanded)

                || (mContainingNotification.isGroupExpansionChanging()

                && !mHideDividersDuringExpand);

        final boolean isExpanding = !showingAsLowPriority()

                && (mUserLocked || mContainingNotification.isGroupExpansionChanging());

        final boolean dividersVisible = (mChildrenExpanded && mShowDividersWhenExpanded)

                || (isExpanding && !mHideDividersDuringExpand);

        for (int i = childCount - 1; i >= 0; i--) {

            ExpandableNotificationRow child = mAttachedChildren.get(i);

            ExpandableViewState viewState = child.getViewState();