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

Commit 711e3387 authored by Sergey Serokurov's avatar Sergey Serokurov Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I9fcdbe753a6dfec68750fd15f1e9f54d4f8ed709
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72d2aa2b a6e03b00

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

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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center_horizontal"

        android:layout_gravity="center_horizontal"

        android:gravity="center"/>

        android:gravity="center"

        android:clipChildren="false"/>





    <LinearLayout

    <LinearLayout

        android:id="@+id/bubble_overflow_empty_state"

        android:id="@+id/bubble_overflow_empty_state"

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

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

            mTaskView.onLocationChanged();

        }

        }

        if (mIsOverflow) {

        if (mIsOverflow) {

            post(() -> {

                mOverflowView.show();

                mOverflowView.show();

            });

        }

        }

    }

    }

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

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




    void updateOverflow() {

    void updateOverflow() {

        Resources res = getResources();

        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(

        mRecyclerView.setLayoutManager(

                new OverflowGridLayoutManager(getContext(), columns));

                new OverflowGridLayoutManager(getContext(), columns));

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

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