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

Commit a6e03b00 authored by Sergey Serokurov's avatar Sergey Serokurov Committed by Android (Google) Code Review
Browse files

Merge "Fix clipping of an app badge on bubbles in overflow" into tm-qpr-dev

parents 7cb1c219 328f9569

libs/WindowManager/Shell/res/layout/bubble_overflow_container.xml

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

        android:layout_height="match_parent"

        android:layout_gravity="center_horizontal"

        android:gravity="center"/>

        android:gravity="center"

        android:clipChildren="false"/>



    <LinearLayout

        android:id="@+id/bubble_overflow_empty_state"

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+3 −1
Original line number Diff line number Diff line
@@ -887,7 +887,9 @@ public class BubbleExpandedView extends LinearLayout { 
            mTaskView.onLocationChanged();

        }

        if (mIsOverflow) {

            post(() -> {

                mOverflowView.show();

            });

        }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflowContainerView.java

+4 −1
Original line number Diff line number Diff line
@@ -167,7 +167,10 @@ public class BubbleOverflowContainerView extends LinearLayout { 


    void updateOverflow() {

        Resources res = getResources();

        final int columns = res.getInteger(R.integer.bubbles_overflow_columns);

        int columns = (int) Math.round(getWidth()

                / (res.getDimension(R.dimen.bubble_name_width)));

        columns = columns > 0 ? columns : res.getInteger(R.integer.bubbles_overflow_columns);



        mRecyclerView.setLayoutManager(

                new OverflowGridLayoutManager(getContext(), columns));

        if (mRecyclerView.getItemDecorationCount() == 0) {