From 48cb7bc7a449c0b4e7b7156c77e01f4060e798b8 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Tue, 25 Sep 2018 17:03:34 -0700 Subject: [PATCH] Move IconNormalizer/ShadowGenerator/LauncherIcons to icons package Bug: 115891474 Sending out the package name changing CL first before I make LauncherIconsHandler and tests around it. Change-Id: Ic10479a06333e1435b392a7072cd08782e710cbd --- .../src/com/android/quickstep/NormalizedIconLoader.java | 4 ++-- src/com/android/launcher3/AutoInstallsLayout.java | 2 +- src/com/android/launcher3/DeviceProfile.java | 2 +- src/com/android/launcher3/FastBitmapDrawable.java | 2 +- src/com/android/launcher3/InstallShortcutReceiver.java | 4 ++-- src/com/android/launcher3/ItemInfoWithIcon.java | 2 +- src/com/android/launcher3/LauncherModel.java | 2 +- src/com/android/launcher3/WidgetPreviewLoader.java | 4 ++-- .../launcher3/allapps/search/AppsSearchContainerLayout.java | 2 +- src/com/android/launcher3/badge/BadgeRenderer.java | 2 +- src/com/android/launcher3/compat/LauncherAppsCompatVO.java | 2 +- src/com/android/launcher3/dragndrop/DragView.java | 2 +- src/com/android/launcher3/graphics/DrawableFactory.java | 3 +-- .../android/launcher3/graphics/PlaceHolderIconDrawable.java | 1 + src/com/android/launcher3/icons/BaseIconCache.java | 4 +--- .../android/launcher3/{graphics => icons}/BitmapInfo.java | 2 +- src/com/android/launcher3/icons/CachingLogic.java | 3 --- .../launcher3/{graphics => icons}/ColorExtractor.java | 2 +- .../launcher3/{graphics => icons}/FixedScaleDrawable.java | 2 +- .../launcher3/{graphics => icons}/IconNormalizer.java | 2 +- .../launcher3/{graphics => icons}/LauncherIcons.java | 6 +++--- .../launcher3/{graphics => icons}/ShadowGenerator.java | 2 +- src/com/android/launcher3/model/LoaderCursor.java | 4 ++-- src/com/android/launcher3/model/LoaderTask.java | 2 +- src/com/android/launcher3/model/PackageUpdatedTask.java | 4 ++-- src/com/android/launcher3/model/ShortcutsChangedTask.java | 2 +- .../android/launcher3/model/UserLockStateChangedTask.java | 2 +- src/com/android/launcher3/popup/PopupPopulator.java | 2 +- src/com/android/launcher3/widget/PendingItemDragHelper.java | 2 +- .../uioverrides/dynamicui/WallpaperManagerCompatVL.java | 2 +- .../launcher3/model/BaseModelUpdateTaskTestCase.java | 2 +- tests/src/com/android/launcher3/model/LoaderCursorTest.java | 2 +- 32 files changed, 38 insertions(+), 43 deletions(-) rename src/com/android/launcher3/{graphics => icons}/BitmapInfo.java (97%) rename src/com/android/launcher3/{graphics => icons}/ColorExtractor.java (99%) rename src/com/android/launcher3/{graphics => icons}/FixedScaleDrawable.java (97%) rename src/com/android/launcher3/{graphics => icons}/IconNormalizer.java (99%) rename src/com/android/launcher3/{graphics => icons}/LauncherIcons.java (99%) rename src/com/android/launcher3/{graphics => icons}/ShadowGenerator.java (99%) diff --git a/quickstep/src/com/android/quickstep/NormalizedIconLoader.java b/quickstep/src/com/android/quickstep/NormalizedIconLoader.java index 8f7dbdd366..655776194f 100644 --- a/quickstep/src/com/android/quickstep/NormalizedIconLoader.java +++ b/quickstep/src/com/android/quickstep/NormalizedIconLoader.java @@ -28,9 +28,9 @@ import android.util.LruCache; import android.util.SparseArray; import com.android.launcher3.FastBitmapDrawable; -import com.android.launcher3.graphics.BitmapInfo; +import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.graphics.DrawableFactory; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; import com.android.systemui.shared.recents.model.IconLoader; import com.android.systemui.shared.recents.model.TaskKeyLruCache; diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java index 6b0a90a78a..4c34071a92 100644 --- a/src/com/android/launcher3/AutoInstallsLayout.java +++ b/src/com/android/launcher3/AutoInstallsLayout.java @@ -39,7 +39,7 @@ import android.util.Patterns; import com.android.launcher3.LauncherProvider.SqlArguments; import com.android.launcher3.LauncherSettings.Favorites; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.util.Thunk; import org.xmlpull.v1.XmlPullParser; diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index b429018d74..256fd6c80c 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -30,7 +30,7 @@ import android.view.WindowManager; import com.android.launcher3.CellLayout.ContainerType; import com.android.launcher3.badge.BadgeRenderer; -import com.android.launcher3.graphics.IconNormalizer; +import com.android.launcher3.icons.IconNormalizer; public class DeviceProfile { diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java index 7efb6ec945..daf587a736 100644 --- a/src/com/android/launcher3/FastBitmapDrawable.java +++ b/src/com/android/launcher3/FastBitmapDrawable.java @@ -34,7 +34,7 @@ import android.graphics.drawable.Drawable; import android.util.Property; import android.util.SparseArray; -import com.android.launcher3.graphics.BitmapInfo; +import com.android.launcher3.icons.BitmapInfo; public class FastBitmapDrawable extends Drawable { diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java index b9d45fb02e..7190f12779 100644 --- a/src/com/android/launcher3/InstallShortcutReceiver.java +++ b/src/com/android/launcher3/InstallShortcutReceiver.java @@ -40,8 +40,8 @@ import android.util.Pair; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.UserManagerCompat; -import com.android.launcher3.graphics.BitmapInfo; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.BitmapInfo; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.shortcuts.ShortcutKey; diff --git a/src/com/android/launcher3/ItemInfoWithIcon.java b/src/com/android/launcher3/ItemInfoWithIcon.java index 2ceb0dd71a..6d453c9b38 100644 --- a/src/com/android/launcher3/ItemInfoWithIcon.java +++ b/src/com/android/launcher3/ItemInfoWithIcon.java @@ -16,7 +16,7 @@ package com.android.launcher3; -import static com.android.launcher3.graphics.BitmapInfo.LOW_RES_ICON; +import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON; import android.graphics.Bitmap; diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index df1c693382..68abd682dd 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -38,7 +38,7 @@ import android.util.Pair; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.PackageInstallerCompat.PackageInstallInfo; import com.android.launcher3.compat.UserManagerCompat; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.AddWorkspaceItemsTask; import com.android.launcher3.model.BaseModelUpdateTask; diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index cf497fd876..d47dcee92c 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -31,8 +31,8 @@ import android.util.LongSparseArray; import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.compat.ShortcutConfigActivityInfo; import com.android.launcher3.compat.UserManagerCompat; -import com.android.launcher3.graphics.LauncherIcons; -import com.android.launcher3.graphics.ShadowGenerator; +import com.android.launcher3.icons.LauncherIcons; +import com.android.launcher3.icons.ShadowGenerator; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.util.ComponentKey; diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java index ab6635e45e..15cc2caae6 100644 --- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java +++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java @@ -19,7 +19,7 @@ import static android.view.View.MeasureSpec.EXACTLY; import static android.view.View.MeasureSpec.getSize; import static android.view.View.MeasureSpec.makeMeasureSpec; -import static com.android.launcher3.graphics.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; +import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; import android.content.Context; import android.graphics.Rect; diff --git a/src/com/android/launcher3/badge/BadgeRenderer.java b/src/com/android/launcher3/badge/BadgeRenderer.java index 8998b24ede..5d38aadede 100644 --- a/src/com/android/launcher3/badge/BadgeRenderer.java +++ b/src/com/android/launcher3/badge/BadgeRenderer.java @@ -27,7 +27,7 @@ import android.graphics.Point; import android.graphics.Rect; import android.util.Log; -import com.android.launcher3.graphics.ShadowGenerator; +import com.android.launcher3.icons.ShadowGenerator; /** * Contains parameters necessary to draw a badge for an icon (e.g. the size of the badge). diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVO.java b/src/com/android/launcher3/compat/LauncherAppsCompatVO.java index 386b3b3fe3..fb446600c3 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompatVO.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompatVO.java @@ -33,7 +33,7 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; import com.android.launcher3.ShortcutInfo; import com.android.launcher3.compat.ShortcutConfigActivityInfo.ShortcutConfigActivityInfoVO; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.util.LooperExecutor; import com.android.launcher3.util.PackageUserKey; diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index 6ac56ebed3..6d1efd5879 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -56,7 +56,7 @@ import com.android.launcher3.FirstFrameAnimatorHelper; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.ShortcutConfigActivityInfo; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.shortcuts.ShortcutKey; diff --git a/src/com/android/launcher3/graphics/DrawableFactory.java b/src/com/android/launcher3/graphics/DrawableFactory.java index 8cabd2fe60..ce83a177a8 100644 --- a/src/com/android/launcher3/graphics/DrawableFactory.java +++ b/src/com/android/launcher3/graphics/DrawableFactory.java @@ -16,8 +16,6 @@ package com.android.launcher3.graphics; -import static com.android.launcher3.graphics.BitmapInfo.LOW_RES_ICON; - import android.content.Context; import android.content.pm.ActivityInfo; import android.content.res.Resources; @@ -37,6 +35,7 @@ import com.android.launcher3.FastBitmapDrawable; import com.android.launcher3.ItemInfoWithIcon; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.ResourceBasedOverride; diff --git a/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java b/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java index 18efd47b6e..5f2fb596af 100644 --- a/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java +++ b/src/com/android/launcher3/graphics/PlaceHolderIconDrawable.java @@ -24,6 +24,7 @@ import android.graphics.Rect; import com.android.launcher3.FastBitmapDrawable; import com.android.launcher3.ItemInfoWithIcon; import com.android.launcher3.R; +import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.util.Themes; /** diff --git a/src/com/android/launcher3/icons/BaseIconCache.java b/src/com/android/launcher3/icons/BaseIconCache.java index 3c742df1b2..f7e2be11b3 100644 --- a/src/com/android/launcher3/icons/BaseIconCache.java +++ b/src/com/android/launcher3/icons/BaseIconCache.java @@ -15,7 +15,7 @@ */ package com.android.launcher3.icons; -import static com.android.launcher3.graphics.BitmapInfo.LOW_RES_ICON; +import static com.android.launcher3.icons.BitmapInfo.LOW_RES_ICON; import android.content.ComponentName; import android.content.ContentValues; @@ -48,9 +48,7 @@ import com.android.launcher3.MainThreadExecutor; import com.android.launcher3.Utilities; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.UserManagerCompat; -import com.android.launcher3.graphics.BitmapInfo; import com.android.launcher3.graphics.BitmapRenderer; -import com.android.launcher3.graphics.LauncherIcons; import com.android.launcher3.model.PackageItemInfo; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.InstantAppResolver; diff --git a/src/com/android/launcher3/graphics/BitmapInfo.java b/src/com/android/launcher3/icons/BitmapInfo.java similarity index 97% rename from src/com/android/launcher3/graphics/BitmapInfo.java rename to src/com/android/launcher3/icons/BitmapInfo.java index 74b783dfd7..ebe05113e8 100644 --- a/src/com/android/launcher3/graphics/BitmapInfo.java +++ b/src/com/android/launcher3/icons/BitmapInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.graphics; +package com.android.launcher3.icons; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; diff --git a/src/com/android/launcher3/icons/CachingLogic.java b/src/com/android/launcher3/icons/CachingLogic.java index 194fedb1fe..13fdc6a0b8 100644 --- a/src/com/android/launcher3/icons/CachingLogic.java +++ b/src/com/android/launcher3/icons/CachingLogic.java @@ -20,9 +20,6 @@ import android.content.Context; import android.content.pm.LauncherActivityInfo; import android.os.UserHandle; -import com.android.launcher3.graphics.BitmapInfo; -import com.android.launcher3.graphics.LauncherIcons; - public interface CachingLogic { ComponentName getComponent(T object); diff --git a/src/com/android/launcher3/graphics/ColorExtractor.java b/src/com/android/launcher3/icons/ColorExtractor.java similarity index 99% rename from src/com/android/launcher3/graphics/ColorExtractor.java rename to src/com/android/launcher3/icons/ColorExtractor.java index da5da9cea6..87bda825cc 100644 --- a/src/com/android/launcher3/graphics/ColorExtractor.java +++ b/src/com/android/launcher3/icons/ColorExtractor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.graphics; +package com.android.launcher3.icons; import android.graphics.Bitmap; import android.graphics.Color; diff --git a/src/com/android/launcher3/graphics/FixedScaleDrawable.java b/src/com/android/launcher3/icons/FixedScaleDrawable.java similarity index 97% rename from src/com/android/launcher3/graphics/FixedScaleDrawable.java rename to src/com/android/launcher3/icons/FixedScaleDrawable.java index 0f0e42428d..e594f477eb 100644 --- a/src/com/android/launcher3/graphics/FixedScaleDrawable.java +++ b/src/com/android/launcher3/icons/FixedScaleDrawable.java @@ -1,4 +1,4 @@ -package com.android.launcher3.graphics; +package com.android.launcher3.icons; import android.annotation.TargetApi; import android.content.res.Resources; diff --git a/src/com/android/launcher3/graphics/IconNormalizer.java b/src/com/android/launcher3/icons/IconNormalizer.java similarity index 99% rename from src/com/android/launcher3/graphics/IconNormalizer.java rename to src/com/android/launcher3/icons/IconNormalizer.java index df00815c07..73177825bd 100644 --- a/src/com/android/launcher3/graphics/IconNormalizer.java +++ b/src/com/android/launcher3/icons/IconNormalizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.graphics; +package com.android.launcher3.icons; import android.content.Context; import android.graphics.Bitmap; diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/icons/LauncherIcons.java similarity index 99% rename from src/com/android/launcher3/graphics/LauncherIcons.java rename to src/com/android/launcher3/icons/LauncherIcons.java index 7db67c9828..b4cbf65304 100644 --- a/src/com/android/launcher3/graphics/LauncherIcons.java +++ b/src/com/android/launcher3/icons/LauncherIcons.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.launcher3.graphics; +package com.android.launcher3.icons; import static android.graphics.Paint.DITHER_FLAG; import static android.graphics.Paint.FILTER_BITMAP_FLAG; -import static com.android.launcher3.graphics.ShadowGenerator.BLUR_FACTOR; +import static com.android.launcher3.icons.ShadowGenerator.BLUR_FACTOR; import android.content.ComponentName; import android.content.Context; @@ -44,7 +44,7 @@ import android.os.UserHandle; import com.android.launcher3.AppInfo; import com.android.launcher3.FastBitmapDrawable; -import com.android.launcher3.icons.IconCache; +import com.android.launcher3.graphics.BitmapRenderer; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.ItemInfoWithIcon; import com.android.launcher3.LauncherAppState; diff --git a/src/com/android/launcher3/graphics/ShadowGenerator.java b/src/com/android/launcher3/icons/ShadowGenerator.java similarity index 99% rename from src/com/android/launcher3/graphics/ShadowGenerator.java rename to src/com/android/launcher3/icons/ShadowGenerator.java index d2d1699bf7..57d463a806 100644 --- a/src/com/android/launcher3/graphics/ShadowGenerator.java +++ b/src/com/android/launcher3/icons/ShadowGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.graphics; +package com.android.launcher3.icons; import android.content.Context; import android.graphics.Bitmap; diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index 77e9721bce..87aef02f76 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java @@ -43,8 +43,8 @@ import com.android.launcher3.Workspace; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.graphics.BitmapInfo; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.BitmapInfo; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.logging.FileLog; import com.android.launcher3.util.ContentWriter; import com.android.launcher3.util.GridOccupancy; diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index 0105fbbafd..d6b7b0f53a 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -61,7 +61,7 @@ import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIconPreviewVerifier; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.logging.FileLog; import com.android.launcher3.provider.ImportDataTask; import com.android.launcher3.shortcuts.DeepShortcutManager; diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java index 0af53118d3..c004e217b1 100644 --- a/src/com/android/launcher3/model/PackageUpdatedTask.java +++ b/src/com/android/launcher3/model/PackageUpdatedTask.java @@ -38,8 +38,8 @@ import com.android.launcher3.Utilities; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.graphics.BitmapInfo; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.BitmapInfo; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.logging.FileLog; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutInfoCompat; diff --git a/src/com/android/launcher3/model/ShortcutsChangedTask.java b/src/com/android/launcher3/model/ShortcutsChangedTask.java index 59f3d1c60a..020bc41822 100644 --- a/src/com/android/launcher3/model/ShortcutsChangedTask.java +++ b/src/com/android/launcher3/model/ShortcutsChangedTask.java @@ -23,7 +23,7 @@ import com.android.launcher3.ItemInfo; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherSettings; import com.android.launcher3.ShortcutInfo; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.shortcuts.ShortcutKey; diff --git a/src/com/android/launcher3/model/UserLockStateChangedTask.java b/src/com/android/launcher3/model/UserLockStateChangedTask.java index 9521a9e5b5..9f02d4fdad 100644 --- a/src/com/android/launcher3/model/UserLockStateChangedTask.java +++ b/src/com/android/launcher3/model/UserLockStateChangedTask.java @@ -26,7 +26,7 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherSettings; import com.android.launcher3.ShortcutInfo; import com.android.launcher3.compat.UserManagerCompat; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.shortcuts.ShortcutKey; diff --git a/src/com/android/launcher3/popup/PopupPopulator.java b/src/com/android/launcher3/popup/PopupPopulator.java index 450062961a..c14c00eb87 100644 --- a/src/com/android/launcher3/popup/PopupPopulator.java +++ b/src/com/android/launcher3/popup/PopupPopulator.java @@ -24,7 +24,7 @@ import android.service.notification.StatusBarNotification; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.ShortcutInfo; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.notification.NotificationInfo; import com.android.launcher3.notification.NotificationKeyData; import com.android.launcher3.shortcuts.DeepShortcutManager; diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java index 74ab14f55d..8ea9bd479c 100644 --- a/src/com/android/launcher3/widget/PendingItemDragHelper.java +++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java @@ -34,7 +34,7 @@ import com.android.launcher3.R; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.LivePreviewWidgetCell; import com.android.launcher3.graphics.DragPreviewProvider; -import com.android.launcher3.graphics.LauncherIcons; +import com.android.launcher3.icons.LauncherIcons; /** * Extension of {@link DragPreviewProvider} with logic specific to pending widgets/shortcuts diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java index 7883442546..6808859438 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java @@ -45,7 +45,7 @@ import android.util.Log; import android.util.Pair; import com.android.launcher3.Utilities; -import com.android.launcher3.graphics.ColorExtractor; +import com.android.launcher3.icons.ColorExtractor; import java.io.IOException; import java.util.ArrayList; diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index f4aa15a72c..1e5643982f 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -32,7 +32,7 @@ import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherModel.Callbacks; import com.android.launcher3.LauncherModel.ModelUpdateTask; import com.android.launcher3.LauncherProvider; -import com.android.launcher3.graphics.BitmapInfo; +import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.Provider; import com.android.launcher3.util.TestLauncherProvider; diff --git a/tests/src/com/android/launcher3/model/LoaderCursorTest.java b/tests/src/com/android/launcher3/model/LoaderCursorTest.java index 42a2764010..a21f861771 100644 --- a/tests/src/com/android/launcher3/model/LoaderCursorTest.java +++ b/tests/src/com/android/launcher3/model/LoaderCursorTest.java @@ -17,7 +17,7 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.ShortcutInfo; import com.android.launcher3.Utilities; import com.android.launcher3.compat.LauncherAppsCompat; -import com.android.launcher3.graphics.BitmapInfo; +import com.android.launcher3.icons.BitmapInfo; import org.junit.Before; import org.junit.Test;