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 am: c27b541c09

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

Change-Id: I98fe4f72842e79c278b8f403916a9d987455a47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2022-05-19 16:16:46 +00:00
parent 1201b3c634 c27b541c09
commit 1c72aa134e
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_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"

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();
}
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() {
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) {