summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/CellLayout.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-02-18 22:09:23 +0000
committerSunny Goyal <sunnygoyal@google.com>2016-02-23 02:02:54 +0000
commit261194387beebaa7927ec4e310274218b651494d (patch)
tree31ebc51a25f275e9aa28129aca1ab3ed4c0cb85d /src/com/android/launcher3/CellLayout.java
parent7de283a5ecb39bf1f264b5d0d8019b6fabdd6ae3 (diff)
downloadandroid_packages_apps_Trebuchet-261194387beebaa7927ec4e310274218b651494d.tar.gz
android_packages_apps_Trebuchet-261194387beebaa7927ec4e310274218b651494d.tar.bz2
android_packages_apps_Trebuchet-261194387beebaa7927ec4e310274218b651494d.zip
Revert "Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage"
This reverts commit fc956e5a2a818c06ed3424e15b0aa20a3f604658. Change-Id: Ib3b5156b8fc3cad35c4634d61d5390c848ce1f93
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r--src/com/android/launcher3/CellLayout.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 9370e57b5..5832b9f0d 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -32,6 +32,7 @@ import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
import android.graphics.drawable.TransitionDrawable;
import android.os.Build;
import android.os.Parcelable;
@@ -53,7 +54,8 @@ import com.android.launcher3.accessibility.FolderAccessibilityHelper;
import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.config.ProviderConfig;
-import com.android.launcher3.FolderIcon.FolderRingAnimator;
+import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.folder.FolderIcon.FolderRingAnimator;
import com.android.launcher3.util.ParcelableSparseArray;
import com.android.launcher3.util.Thunk;