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 crash when trying to load SystemShortcut drawable." into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2019-03-11 22:49:18 +00:00 committed by Android (Google) Code Review
parent e8692ecc79 93e0594b3d
commit 0dd484bede
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import android.os.Looper;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
import android.widget.ImageView;
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.InsettableFrameLayout.LayoutParams;
@ -48,6 +49,7 @@ import com.android.launcher3.folder.FolderIcon;
import com.android.launcher3.folder.FolderShape;
import com.android.launcher3.graphics.ShiftedBitmapDrawable;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.popup.SystemShortcut;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
@ -196,6 +198,9 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
// Similar to DragView, we simply use the BubbleTextView icon here.
mDrawable = ((BubbleTextView) v).getIcon();
}
if (v instanceof ImageView && info instanceof SystemShortcut) {
mDrawable = ((ImageView) v).getDrawable();
}
if (mDrawable == null) {
mDrawable = Utilities.getFullDrawable(launcher, info, lp.width, lp.height,
useDrawableAsIs, new Object[1]);