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

Merge "Use bitmap width for bubble icon and app badge to calculate translation" into tm-dev

Browse Source
This commit is contained in:
Sergey Serokurov
2022-05-10 17:28:08 +00:00
committed by Android (Google) Code Review
parent f29ffc2940 8d25921a22
commit eadf688621
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BadgedImageView.java
View File

@@ -19,6 +19,7 @@ import android.annotation.DrawableRes;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Outline; import android.graphics.Outline;
import android.graphics.Path; import android.graphics.Path;
@@ -350,16 +351,19 @@ public class BadgedImageView extends ConstraintLayout {
} }
void showBadge() { void showBadge() {
if (mBubble.getAppBadge() == null) { Bitmap appBadgeBitmap = mBubble.getAppBadge();
if (appBadgeBitmap == null) {
mAppIcon.setVisibility(GONE); mAppIcon.setVisibility(GONE);
return; return;
} }
int translationX; int translationX;
if (mOnLeft) { if (mOnLeft) {
translationX = -(mBubbleIcon.getWidth() - mAppIcon.getWidth()); translationX = -(mBubble.getBubbleIcon().getWidth() - appBadgeBitmap.getWidth());
} else { } else {
translationX = 0; translationX = 0;
} }
mAppIcon.setTranslationX(translationX); mAppIcon.setTranslationX(translationX);
mAppIcon.setVisibility(VISIBLE); mAppIcon.setVisibility(VISIBLE);
} }