openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix bug where app icons stay invisible after app open animation." into ub-launcher3-qt-dev

This commit is contained in:
TreeHugger Robot 2019-04-10 22:34:09 +00:00 committed by Android (Google) Code Review
parent e9c4c50168 d53a9bf8a0
commit 2513835484
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/launcher3/views/FloatingIconView.java
View File

@ -34,6 +34,7 @@ import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.os.CancellationSignal;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.view.View; import android.view.View;
@ -73,6 +74,7 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
private static final Rect sTmpRect = new Rect(); private static final Rect sTmpRect = new Rect();
private Runnable mEndRunnable; private Runnable mEndRunnable;
private CancellationSignal mLoadIconSignal;
private final int mBlurSizeOutline; private final int mBlurSizeOutline;
@ -153,6 +155,9 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
@Override @Override
public void onAnimationEnd(Animator animator) { public void onAnimationEnd(Animator animator) {
if (mLoadIconSignal != null) {
mLoadIconSignal.cancel();
}
if (mEndRunnable != null) { if (mEndRunnable != null) {
mEndRunnable.run(); mEndRunnable.run();
} else { } else {
@ -186,7 +191,7 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
@WorkerThread @WorkerThread
private void getIcon(Launcher launcher, View v, ItemInfo info, boolean isOpening, private void getIcon(Launcher launcher, View v, ItemInfo info, boolean isOpening,
Runnable onIconLoadedRunnable) { Runnable onIconLoadedRunnable, CancellationSignal loadIconSignal) {
final LayoutParams lp = (LayoutParams) getLayoutParams(); final LayoutParams lp = (LayoutParams) getLayoutParams();
Drawable drawable = null; Drawable drawable = null;
boolean supportsAdaptiveIcons = ADAPTIVE_ICON_WINDOW_ANIM.get() boolean supportsAdaptiveIcons = ADAPTIVE_ICON_WINDOW_ANIM.get()
@ -290,7 +295,9 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
setBackground(finalDrawable); setBackground(finalDrawable);
} }
onIconLoadedRunnable.run(); if (!loadIconSignal.isCanceled()) {
onIconLoadedRunnable.run();
}
invalidate(); invalidate();
invalidateOutline(); invalidateOutline();
}); });
@ -386,6 +393,7 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
// Get the drawable on the background thread // Get the drawable on the background thread
// Must be called after matchPositionOf so that we know what size to load. // Must be called after matchPositionOf so that we know what size to load.
if (originalView.getTag() instanceof ItemInfo) { if (originalView.getTag() instanceof ItemInfo) {
view.mLoadIconSignal = new CancellationSignal();
Runnable onIconLoaded = () -> { Runnable onIconLoaded = () -> {
// Delay swapping views until the icon is loaded to prevent a flash. // Delay swapping views until the icon is loaded to prevent a flash.
view.setVisibility(VISIBLE); view.setVisibility(VISIBLE);
@ -393,9 +401,10 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
originalView.setVisibility(INVISIBLE); originalView.setVisibility(INVISIBLE);
} }
}; };
CancellationSignal loadIconSignal = view.mLoadIconSignal;
new Handler(LauncherModel.getWorkerLooper()).postAtFrontOfQueue(() -> { new Handler(LauncherModel.getWorkerLooper()).postAtFrontOfQueue(() -> {
view.getIcon(launcher, originalView, (ItemInfo) originalView.getTag(), isOpening, view.getIcon(launcher, originalView, (ItemInfo) originalView.getTag(), isOpening,
onIconLoaded); onIconLoaded, loadIconSignal);
}); });
} }
@ -461,6 +470,10 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
setScaleY(1); setScaleY(1);
setAlpha(1); setAlpha(1);
setBackground(null); setBackground(null);
if (mLoadIconSignal != null) {
mLoadIconSignal.cancel();
}
mLoadIconSignal = null;
mEndRunnable = null; mEndRunnable = null;
mIsAdaptiveIcon = false; mIsAdaptiveIcon = false;
mForeground = null; mForeground = null;