diff options
| author | George Mount <mount@google.com> | 2015-10-20 16:41:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-20 16:41:33 +0000 |
| commit | 1313020acc93e601c98779d8859f44391c504ba2 (patch) | |
| tree | 5039b3672bae8d03e0dbaba04c990cdcafe144c8 /core | |
| parent | 57a5cba606e5d58cc4ad1c5c1cf4918dc16fe819 (diff) | |
| parent | ef396b57c66247c098e80c76855146649c6276cd (diff) | |
| download | frameworks_base-1313020acc93e601c98779d8859f44391c504ba2.zip frameworks_base-1313020acc93e601c98779d8859f44391c504ba2.tar.gz frameworks_base-1313020acc93e601c98779d8859f44391c504ba2.tar.bz2 | |
Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/transition/ChangeBounds.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/core/java/android/transition/ChangeBounds.java b/core/java/android/transition/ChangeBounds.java index c82587b..6d1d893 100644 --- a/core/java/android/transition/ChangeBounds.java +++ b/core/java/android/transition/ChangeBounds.java @@ -432,23 +432,24 @@ public class ChangeBounds extends Transition { return anim; } } else { - int startX = (Integer) startValues.values.get(PROPNAME_WINDOW_X); - int startY = (Integer) startValues.values.get(PROPNAME_WINDOW_Y); - int endX = (Integer) endValues.values.get(PROPNAME_WINDOW_X); - int endY = (Integer) endValues.values.get(PROPNAME_WINDOW_Y); + sceneRoot.getLocationInWindow(tempLocation); + int startX = (Integer) startValues.values.get(PROPNAME_WINDOW_X) - tempLocation[0]; + int startY = (Integer) startValues.values.get(PROPNAME_WINDOW_Y) - tempLocation[1]; + int endX = (Integer) endValues.values.get(PROPNAME_WINDOW_X) - tempLocation[0]; + int endY = (Integer) endValues.values.get(PROPNAME_WINDOW_Y) - tempLocation[1]; // TODO: also handle size changes: check bounds and animate size changes if (startX != endX || startY != endY) { - sceneRoot.getLocationInWindow(tempLocation); - Bitmap bitmap = Bitmap.createBitmap(view.getWidth(), view.getHeight(), - Bitmap.Config.ARGB_8888); + final int width = view.getWidth(); + final int height = view.getHeight(); + Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); Canvas canvas = new Canvas(bitmap); view.draw(canvas); final BitmapDrawable drawable = new BitmapDrawable(bitmap); + drawable.setBounds(startX, startY, startX + width, startY + height); final float transitionAlpha = view.getTransitionAlpha(); view.setTransitionAlpha(0); sceneRoot.getOverlay().add(drawable); - Path topLeftPath = getPathMotion().getPath(startX - tempLocation[0], - startY - tempLocation[1], endX - tempLocation[0], endY - tempLocation[1]); + Path topLeftPath = getPathMotion().getPath(startX, startY, endX, endY); PropertyValuesHolder origin = PropertyValuesHolder.ofObject( DRAWABLE_ORIGIN_PROPERTY, null, topLeftPath); ObjectAnimator anim = ObjectAnimator.ofPropertyValuesHolder(drawable, origin); |