diff options
| author | Ed Heyl <ed@google.com> | 2012-07-25 14:52:36 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2012-07-25 14:52:36 -0700 |
| commit | 90abcc94258ba9d9c8b68ac9764b6ab1eba12985 (patch) | |
| tree | bc753e764d1fecedbd43a4f9ea7d3c29e5298008 /src/com/android/launcher2/CellLayout.java | |
| parent | 4a3b54f51f54b5d68926d312eb07d74f90a1673d (diff) | |
| parent | 0ede734d0780a968c9c345f99a18f9f8b9fc02cd (diff) | |
| download | android_packages_apps_Trebuchet-90abcc94258ba9d9c8b68ac9764b6ab1eba12985.tar.gz android_packages_apps_Trebuchet-90abcc94258ba9d9c8b68ac9764b6ab1eba12985.tar.bz2 android_packages_apps_Trebuchet-90abcc94258ba9d9c8b68ac9764b6ab1eba12985.zip | |
resolved conflicts w/0ede734d0780a968c9c345f99a18f9f8b9fc02cd
Change-Id: I50900698a590e8d84a6cbcc560f95209d3a6d110
Diffstat (limited to 'src/com/android/launcher2/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher2/CellLayout.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 3ad13369f..fe69e9fd0 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -19,6 +19,7 @@ package com.android.launcher2; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; +import android.animation.ObjectAnimator; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; @@ -36,8 +37,10 @@ import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.NinePatchDrawable; +import android.os.Parcelable; import android.util.AttributeSet; import android.util.Log; +import android.util.SparseArray; import android.view.MotionEvent; import android.view.View; import android.view.ViewDebug; @@ -540,6 +543,10 @@ public class CellLayout extends ViewGroup { return false; } + public void restoreInstanceState(SparseArray<Parcelable> states) { + dispatchRestoreInstanceState(states); + } + @Override public void cancelLongPress() { super.cancelLongPress(); |