diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-09-02 19:40:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-02 19:40:58 +0000 |
| commit | 2ac19186677da6b28ba15ff1c6188ef00604f89e (patch) | |
| tree | c3078dd6869cce49007df83831bfe44d1147ec89 /src/com/android/launcher3/LauncherModel.java | |
| parent | 7f1aca9906cfc9f80e4f0c56ff739b403b4d5281 (diff) | |
| parent | 10629b077c65b648be6a8603a092322d8a2c2c50 (diff) | |
| download | android_packages_apps_Trebuchet-2ac19186677da6b28ba15ff1c6188ef00604f89e.tar.gz android_packages_apps_Trebuchet-2ac19186677da6b28ba15ff1c6188ef00604f89e.tar.bz2 android_packages_apps_Trebuchet-2ac19186677da6b28ba15ff1c6188ef00604f89e.zip | |
Merge "Moving some image handling classes to .graphics package" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index ccde0e9cf..2e3d6036a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -57,6 +57,7 @@ import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.dynamicui.ExtractionUtils; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; +import com.android.launcher3.graphics.LauncherIcons; import com.android.launcher3.logging.FileLog; import com.android.launcher3.model.GridSizeMigrationTask; import com.android.launcher3.model.SdCardAvailableReceiver; @@ -3121,7 +3122,7 @@ public class LauncherModel extends BroadcastReceiver // Update shortcuts which use iconResource. if ((si.iconResource != null) && pkgFilter.matches(si.iconResource.packageName)) { - Bitmap icon = Utilities.createIconBitmap( + Bitmap icon = LauncherIcons.createIconBitmap( si.iconResource.packageName, si.iconResource.resourceName, context); if (icon != null) { @@ -3715,17 +3716,15 @@ public class LauncherModel extends BroadcastReceiver } Bitmap icon = null; - boolean customIcon = false; ShortcutIconResource iconResource = null; if (bitmap instanceof Bitmap) { - icon = Utilities.createIconBitmap((Bitmap) bitmap, context); - customIcon = true; + icon = LauncherIcons.createIconBitmap((Bitmap) bitmap, context); } else { Parcelable extra = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE); if (extra instanceof ShortcutIconResource) { iconResource = (ShortcutIconResource) extra; - icon = Utilities.createIconBitmap(iconResource.packageName, + icon = LauncherIcons.createIconBitmap(iconResource.packageName, iconResource.resourceName, context); } } |