aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't hide text in pre-drag when opening popup above icon

Browse Source 
Bug: 38468930
Change-Id: Id03162af829a00442d1db0a93f7e9d8bcb998b1a
This commit is contained in:
Tony
2017-05-23 12:19:09 -07:00
parent 8c26cec587
commit 17b7f9bdf4
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/launcher3/BubbleTextView.java
View File

@@ -23,10 +23,12 @@ import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Region;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.util.Property;
@@ -93,6 +95,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver {
private final int mIconSize;
@ViewDebug.ExportedProperty(category = "launcher")
private int mTextColor;
private boolean mIsIconVisible = true;
private BadgeInfo mBadgeInfo;
private BadgeRenderer mBadgeRenderer;
@@ -609,7 +612,21 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver {
private void setIcon(Drawable icon) {
mIcon = icon;
mIcon.setBounds(0, 0, mIconSize, mIconSize);
applyCompoundDrawables(mIcon);
if (mIsIconVisible) {
applyCompoundDrawables(mIcon);
}
}
public void setIconVisible(boolean visible) {
mIsIconVisible = visible;
mDisableRelayout = true;
Drawable icon = mIcon;
if (!visible) {
icon = new ColorDrawable(Color.TRANSPARENT);
icon.setBounds(0, 0, mIconSize, mIconSize);
}
applyCompoundDrawables(icon);
mDisableRelayout = false;
}
protected void applyCompoundDrawables(Drawable icon) {