diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-08-14 22:53:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-14 22:53:40 +0000 |
| commit | e1c4a90635f18548d3cadab5866dd1aba7bbfea4 (patch) | |
| tree | 4c541836edb98c0b87a3bbc9330129a24b655ecd /src/com/android/launcher3/CellLayout.java | |
| parent | d7f266fee18f8766f49f3911e443c5e48fb58b2f (diff) | |
| parent | d230307a958189041a7d5616e89fb2966011b55e (diff) | |
| download | android_packages_apps_Trebuchet-e1c4a90635f18548d3cadab5866dd1aba7bbfea4.tar.gz android_packages_apps_Trebuchet-e1c4a90635f18548d3cadab5866dd1aba7bbfea4.tar.bz2 android_packages_apps_Trebuchet-e1c4a90635f18548d3cadab5866dd1aba7bbfea4.zip | |
Merge "Migrating to android-x" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index f52a4d675..f6f149631 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -37,9 +37,6 @@ import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Parcelable; -import android.os.SystemClock; -import android.support.annotation.IntDef; -import android.support.v4.view.ViewCompat; import android.util.ArrayMap; import android.util.AttributeSet; import android.util.Log; @@ -75,6 +72,9 @@ import java.util.Collections; import java.util.Comparator; import java.util.Stack; +import androidx.annotation.IntDef; +import androidx.core.view.ViewCompat; + public class CellLayout extends ViewGroup { public static final int WORKSPACE_ACCESSIBILITY_DRAG = 2; public static final int FOLDER_ACCESSIBILITY_DRAG = 1; |