| commit | d81b579fc2c6f042e1c8ae80dce741f624275f55 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Oct 26 20:40:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 26 20:40:31 2021 +0000 |
| tree | 00c211c61f4e17c166bf1b9a75a3042961b721a2 | |
| parent | 6f758ff59f150e98d2a58c6359adf70cbf15d0eb [diff] | |
| parent | fa30672ec791dcf25eeb19c5749ea5e458d0ac63 [diff] |
Merge "Fix the fallback logic for shortcut icons when icons are missing" into sc-v2-dev am: e9316d5ba7 am: fa30672ec7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16124501 Change-Id: I7fea7a7151014fedd7671a4d116e878e09e6bf88
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;