diff options
author | Adam Cohen <adamcohen@google.com> | 2014-10-28 23:24:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 23:24:26 +0000 |
commit | e3b4d795ecd5278a872627f67a46529a03e9f984 (patch) | |
tree | 28607ee4a5bb2d196f09cb9bd87a07f631317135 | |
parent | 91db0610beef0f6accce763744502a8cd136294d (diff) | |
parent | bc927f9c24001e250622ca9a2547ee5b65baef58 (diff) | |
download | android_packages_apps_Trebuchet-e3b4d795ecd5278a872627f67a46529a03e9f984.tar.gz android_packages_apps_Trebuchet-e3b4d795ecd5278a872627f67a46529a03e9f984.tar.bz2 android_packages_apps_Trebuchet-e3b4d795ecd5278a872627f67a46529a03e9f984.zip |
am bc927f9c: Make sure DragLayer layout params are of the correct type
* commit 'bc927f9c24001e250622ca9a2547ee5b65baef58':
Make sure DragLayer layout params are of the correct type
-rw-r--r-- | src/com/android/launcher3/DragLayer.java | 36 | ||||
-rw-r--r-- | src/com/android/launcher3/InsettableFrameLayout.java | 2 |
2 files changed, 33 insertions, 5 deletions
diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 79d42782c..a352b7914 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -38,6 +38,8 @@ import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.TextView; +import com.android.launcher3.InsettableFrameLayout.LayoutParams; + import java.util.ArrayList; /** @@ -410,17 +412,43 @@ public class DragLayer extends InsettableFrameLayout { return mDragController.dispatchUnhandledMove(focused, direction); } - public static class LayoutParams extends FrameLayout.LayoutParams { + @Override + public LayoutParams generateLayoutParams(AttributeSet attrs) { + return new LayoutParams(getContext(), attrs); + } + + @Override + protected LayoutParams generateDefaultLayoutParams() { + return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); + } + + // Override to allow type-checking of LayoutParams. + @Override + protected boolean checkLayoutParams(ViewGroup.LayoutParams p) { + return p instanceof LayoutParams; + } + + @Override + protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) { + return new LayoutParams(p); + } + + public static class LayoutParams extends InsettableFrameLayout.LayoutParams { public int x, y; public boolean customPosition = false; - /** - * {@inheritDoc} - */ + public LayoutParams(Context c, AttributeSet attrs) { + super(c, attrs); + } + public LayoutParams(int width, int height) { super(width, height); } + public LayoutParams(ViewGroup.LayoutParams lp) { + super(lp); + } + public void setWidth(int width) { this.width = width; } diff --git a/src/com/android/launcher3/InsettableFrameLayout.java b/src/com/android/launcher3/InsettableFrameLayout.java index 1c3d5a189..7343bf686 100644 --- a/src/com/android/launcher3/InsettableFrameLayout.java +++ b/src/com/android/launcher3/InsettableFrameLayout.java @@ -63,7 +63,7 @@ public class InsettableFrameLayout extends FrameLayout implements return new LayoutParams(p); } - class LayoutParams extends FrameLayout.LayoutParams { + public static class LayoutParams extends FrameLayout.LayoutParams { boolean ignoreInsets = false; public LayoutParams(Context c, AttributeSet attrs) { |