Merge "Fix NPE in FloatingIconView" into sc-v2-dev
This commit is contained in:
commit
199644c397
|
@ -460,7 +460,7 @@ public class FloatingIconView extends FrameLayout implements
|
||||||
if (mIconLoadResult != null && mIconLoadResult.isIconLoaded) {
|
if (mIconLoadResult != null && mIconLoadResult.isIconLoaded) {
|
||||||
setVisibility(View.VISIBLE);
|
setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
if (!mIsOpening) {
|
if (!mIsOpening && mOriginalIcon != null) {
|
||||||
// When closing an app, we want the item on the workspace to be invisible immediately
|
// When closing an app, we want the item on the workspace to be invisible immediately
|
||||||
setIconAndDotVisible(mOriginalIcon, false);
|
setIconAndDotVisible(mOriginalIcon, false);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue