Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-05-19 15:51:13 +00:00
committed by Android (Google) Code Review
parent 7a4bb8ea32 711e3387de
commit c27b541c09
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/WindowManager/Shell/res/layout/bubble_overflow_container.xml
View File

@@ -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"

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

@@ -887,7 +887,9 @@ public class BubbleExpandedView extends LinearLayout {
mTaskView.onLocationChanged(); mTaskView.onLocationChanged();
} }
if (mIsOverflow) { if (mIsOverflow) {
mOverflowView.show(); post(() -> {
mOverflowView.show();
});
} }
} }

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

@@ -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) {