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

Commit 0540c060 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Fix visibility of notification footer divider" into ub-launcher3-dorval-polish

parents 3e61c9d6 79b176e4

res/layout/notification.xml

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ 
            android:layout_width="match_parent"

            android:layout_height="@dimen/popup_item_divider_height"

            android:background="?android:attr/listDivider"

            android:layout_below="@id/main_view"/>

            android:layout_below="@id/main_view"

            android:visibility="gone" />



        <include layout="@layout/notification_footer"

            android:id="@+id/footer"

src/com/android/launcher3/notification/NotificationFooterLayout.java

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ public class NotificationFooterLayout extends FrameLayout { 
                collapseFooter.addListener(new AnimatorListenerAdapter() {

                    @Override

                    public void onAnimationEnd(Animator animation) {

                        ((ViewGroup) getParent()).findViewById(R.id.divider).setVisibility(GONE);

                        ((ViewGroup) getParent()).removeView(NotificationFooterLayout.this);

                    }

                });

src/com/android/launcher3/popup/PopupContainerWithArrow.java

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,9 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra 
                int footerHeight = notificationFooterHasIcons ?

                        res.getDimensionPixelSize(R.dimen.notification_footer_height) : 0;

                item.findViewById(R.id.footer).getLayoutParams().height = footerHeight;

                if (notificationFooterHasIcons) {

                    mNotificationItemView.findViewById(R.id.divider).setVisibility(VISIBLE);

                }



                int roundedCorners = ROUNDED_TOP_CORNERS | ROUNDED_BOTTOM_CORNERS;

                if (shouldUnroundTopCorners) {