| commit | fa30672ec791dcf25eeb19c5749ea5e458d0ac63 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Oct 26 20:20:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 26 20:20:58 2021 +0000 |
| tree | 4d00f36768cead1efd7b14fe618870f43901678e | |
| parent | ebe19c95179be81c7720b27299f72e053cb1c201 [diff] | |
| parent | e9316d5ba793e71b6258361323d5a93613c5242a [diff] |
Merge "Fix the fallback logic for shortcut icons when icons are missing" into sc-v2-dev am: e9316d5ba7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16124501 Change-Id: I88c0653d3926b337fc243d6b1421c31c64ea131c
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index 8a5a9bf..47df538 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -190,6 +190,7 @@ String resourceName = itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT ? getString(iconResourceIndex) : null; byte[] iconBlob = itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT + || itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT || restoreFlag != 0 ? getBlob(iconIndex) : null;