diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-11-01 23:01:31 +0000 |
---|---|---|
committer | Android Build Merger (Role) <android-build-merger@google.com> | 2017-11-01 23:01:31 +0000 |
commit | 31a07c9340f08c6cf0348bfa6ff2ba03c85437c8 (patch) | |
tree | b8f5aebaa0907ac3f2c1f525adde21d469300706 /src/com | |
parent | 74bbdebbe411491b87c3b8e46bb2bf59fcf78af7 (diff) | |
parent | 48043ee0d6ad9bee4d10118e5c67fef6c2d0cb5e (diff) | |
download | android_packages_apps_Trebuchet-31a07c9340f08c6cf0348bfa6ff2ba03c85437c8.tar.gz android_packages_apps_Trebuchet-31a07c9340f08c6cf0348bfa6ff2ba03c85437c8.tar.bz2 android_packages_apps_Trebuchet-31a07c9340f08c6cf0348bfa6ff2ba03c85437c8.zip |
[automerger] Also reset mBadgeScale to 0 when recycling view. am: 48043ee0d6
Change-Id: I45edb03913e7cad7f670be5e5331896c30662bcc
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/badge/BadgeRenderer.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 364b2040e..a59050403 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -184,6 +184,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, public void reset() { mBadgeInfo = null; mBadgePalette = null; + mBadgeScale = 0f; mForceHideBadge = false; } diff --git a/src/com/android/launcher3/badge/BadgeRenderer.java b/src/com/android/launcher3/badge/BadgeRenderer.java index c2cc215ce..6ce334ef3 100644 --- a/src/com/android/launcher3/badge/BadgeRenderer.java +++ b/src/com/android/launcher3/badge/BadgeRenderer.java @@ -26,6 +26,7 @@ import android.graphics.Point; import android.graphics.Rect; import android.graphics.Shader; import android.support.annotation.Nullable; +import android.util.Log; import android.util.SparseArray; import com.android.launcher3.R; @@ -38,6 +39,8 @@ import com.android.launcher3.graphics.ShadowGenerator; */ public class BadgeRenderer { + private static final String TAG = "BadgeRenderer"; + private static final boolean DOTS_ONLY = true; // The badge sizes are defined as percentages of the app icon size. @@ -95,6 +98,10 @@ public class BadgeRenderer { */ public void draw(Canvas canvas, IconPalette palette, @Nullable BadgeInfo badgeInfo, Rect iconBounds, float badgeScale, Point spaceForOffset) { + if (palette == null || iconBounds == null || spaceForOffset == null) { + Log.e(TAG, "Invalid null argument(s) passed in call to draw."); + return; + } mTextPaint.setColor(palette.textColor); IconDrawer iconDrawer = badgeInfo != null && badgeInfo.isIconLarge() ? mLargeIconDrawer : mSmallIconDrawer; |