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

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

Change-Id: I4c417814b7020323306845c79aa5cfa8f4008530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sergey Serokurov
2022-05-10 20:42:07 +00:00
committed by Automerger Merge Worker
parent 328a5ce3f4 eadf688621
commit d2fb80fda6
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.content.Context;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Outline;
import android.graphics.Path;
@@ -350,16 +351,19 @@ public class BadgedImageView extends ConstraintLayout {
}
void showBadge() {
if (mBubble.getAppBadge() == null) {
Bitmap appBadgeBitmap = mBubble.getAppBadge();
if (appBadgeBitmap == null) {
mAppIcon.setVisibility(GONE);
return;
}
int translationX;
if (mOnLeft) {
translationX = -(mBubbleIcon.getWidth() - mAppIcon.getWidth());
translationX = -(mBubble.getBubbleIcon().getWidth() - appBadgeBitmap.getWidth());
} else {
translationX = 0;
}
mAppIcon.setTranslationX(translationX);
mAppIcon.setVisibility(VISIBLE);
}