Commit Graph

127 Commits

Author SHA1 Message Date
Neil Fuller
c1a5e82c25 Merge "Remove usages of FloatMath" automerge: a8e8cdb
automerge: 27316a9

* commit '27316a93e5979859ae98f506eca365784353007a':
  Remove usages of FloatMath
2015-02-12 10:00:41 +00:00
Neil Fuller
e573aa9371 Remove usages of FloatMath
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iec8fb663ed54eb967050f6ff25a36ba534204c4d
2015-02-12 09:20:31 +00:00
George Mount
419754545e Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 2014-11-20 15:29:26 +00:00
George Mount
6c211ff43e Reset the transitionAlpha after the transition completes.
Bug 18423893

Change-Id: I2ea30c3b7c45eca70d1518e73f814b827f519fa0
2014-11-19 16:39:16 -08:00
George Mount
2db3bf5c49 Slide supports Gravity.START and Gravity.END.
Bug 18444396

Change-Id: Id7b82b44948e4501c2b4fb5302d22672fa20cd00
2014-11-19 14:14:53 -08:00
George Mount
20559079ab Fix Visibility transitions canceling when nothing has changed.
Bug 18377719

Change-Id: I4ba282bba928781e7b8a62e813cb83f8bf78b58c
2014-11-14 21:02:42 +00:00
George Mount
8f7d3715c5 Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev 2014-11-10 15:25:10 +00:00
George Mount
fa35d14e43 Allow PathMotion to affect translations in ChangeTransform.
Bug 18207599

Change-Id: I813976527de426ba6fbdc89291d2ecde0135c19d
2014-11-05 12:09:52 -08:00
George Mount
b592d84514 Fix javadoc.
Bug 18183024

Change-Id: Ia29d46e03b0137cc6964dcf488af052486b6898c
2014-10-31 17:19:18 -07:00
Dake Gu
4c2e3491ec Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev 2014-10-27 20:23:28 +00:00
George Mount
e0f76e9a6d Merge "Fix transition being canceled improperly." into lmp-mr1-dev 2014-10-27 14:31:29 +00:00
George Mount
b7573c2dba Add resizeClip attribute to ChangeBounds.
Bug 17765948

Added the XML attribute for the resizeClip property of
ChangeBounds. Also updated support for resizing a view
using its clip bounds and position to fix the TODO.

Change-Id: I358d07d6a28fed4b7f39f9ccb9d89b9325f64239
2014-10-24 16:21:01 -07:00
George Mount
d359952459 Use one method to change bounds in ChangeBounds.
Bug 17936593

Instead of calling setLeft(), setTop(), setRight(), setBottom()
separately, make one call that does all at the same time.

Change-Id: I986274f3a98b3136e71204501ffc272986ad31dd
2014-10-23 13:08:15 -07:00
George Mount
cba01b2310 Fix transition being canceled improperly.
Bug 18092208

When a transition is determining whether or not it should be
canceled, the old values and new values are compared. Previously,
the if a value was in the old values, but not in the new values
then the value was considered changed. This discounts that
transitions sometimes don't target views and it may be that
no value was populated.

Change-Id: I8210ba1e44921fadedf9ead571d380ad34e73d3f
2014-10-22 14:39:43 -07:00
George Mount
5ac9b20b41 Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
Bug 17938614

Change-Id: Ia341fdd63ab57ec16a3de6349b7eb07fdc0a48ae
2014-10-10 13:22:36 -07:00
Chris Craik
f791703f9b Avoid changeBounds animations on Views that are not yet laidout
bug:17683930

This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.

Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
2014-10-06 14:55:17 -07:00
George Mount
24314e7d10 Fix ChangeTransform works only once on a View.
Bug 17762118

When ChangeTransform is used on a View, its intermediate values
are being set, but not cleared after the transition completes
unless it uses a GhostView. This CL clears the intermediate
values when the animation ends if no GhostView is used.

Change-Id: I2590d9c2bc36d31023b3e1af94d2bd72c9589eb5
2014-10-01 14:28:05 -07:00
Dake Gu
017b13a50c ActivityTransition: Encode scaleType and matrix in snapshot view
So that SharedElementCallback can setup initial imageView scale
type properly to run transition against.

b/17703309

Change-Id: I0ab212e0413fd666de605bc51ef64c8d66e4d09d
2014-09-30 23:58:57 +00:00
George Mount
2deeaa3314 Target only shared elements with shared element Transition
Bug 17549213
Bug 17553253

Change-Id: If54aebb4e37d2012aa8d1c5354d5ec03f92b81a3
2014-09-19 12:55:20 -07:00
George Mount
7343ba2f80 Merge "Fix broken logic in isValidTarget" into lmp-dev 2014-09-18 22:51:23 +00:00
George Mount
cc82424b44 Fix broken logic in isValidTarget
Bug 17553253

Change-Id: I9f3f2c80e59128fd5f8d4b1b2a67692c00804f62
2014-09-18 11:21:09 -07:00
George Mount
dc5bf6a7f0 Default to using hardware layer during fade transition.
Bug 17499864

When hasOverlappingRendering() is true, a layer is used to
to fade views because performance can be much worse then.
When hasOverlappingRendering() is false, the performance
is not hurt and a layer is not used.

Change-Id: If3fb1c23ffc8d0bef85c9d16df6c26ff4bbd49ac
2014-09-17 15:41:18 -07:00
George Mount
79b2781aa7 Fixed OOM due to visibility transitions.
Have maximum size for Visibility transition bitmaps.

Also changed Visibility to avoid transitioning out child views
while transitioning out their parents.

Also moved view-to-bitmap code to common utility.

Bug 17469198

Change-Id: I05f069a267539b479da1b39cdad2cc9270c5c381
2014-09-15 11:05:36 -07:00
George Mount
5030c7f6f1 Made Transitions act only the views that they target.
Bug 17465989
Bug 17452585

Change-Id: I2f921e98f68df3d549a370179c0a4488d56923ad
2014-09-12 16:15:44 -07:00
George Mount
a374bc049c Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev 2014-09-11 23:56:36 +00:00
George Mount
e6f66e78a5 Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev 2014-09-11 22:08:36 +00:00
George Mount
04600023d0 Fixed: TransitionSet setStartDelay did nothing.
Bug 17452965

Change-Id: Id2fd6ed3bd8e7156dd3d22dcd83117cec12e3528
2014-09-11 14:59:58 -07:00
George Mount
38a664986b Fixed empty TransitionSet not notifying listeners.
Bug 17469482

Change-Id: I2673960e75737d659e52132f1f3b8230080adb7b
2014-09-11 14:37:20 -07:00
Craig Stout
e988ee1eb2 Omit appearing views that have a parent that is also appearing.
b/17460766

Change-Id: Ib3fe619e271688c93a5cd4cb4d557e6cca5baa34
2014-09-10 23:44:30 +00:00
George Mount
a740b2bf9a Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev 2014-09-08 14:52:34 +00:00
George Mount
24e08d0692 Merge "Improve Visibility parent value check." into lmp-dev 2014-09-08 13:59:40 +00:00
George Mount
9f1ac3976e Improve Visibility parent value check.
Bug 17412818
Bug 16398271

The Visibility Transition must not run against children that
are already disappearing or there will be, for example, a double
fade-out effect. Before this change, if a parent matched another
view, it would prevent its child from disappearing.

This change also removes using the overlay for children that have
been removed from the view hierarchy indirectly. This prevents
ListView and RecyclerView children from being added to the overlay.

Change-Id: Iac0610f0939da8643b98812ee1ec1c8d1d70a215
2014-09-07 15:04:03 -07:00
George Mount
21f54f3940 Only call setHasTransientState in captureHierarchy.
Bug 17390936

Change-Id: I1a8cdc2820b53f6ca9f6edc41a7e87f45bea7811
2014-09-05 12:13:49 -07:00
George Mount
f9557619a7 API Review: Improve javadoc.
Bug 17189781
Also rename PatternMotion to PatternPathMotion

Change-Id: I1c4dcbdd65e33cf9de1504277e31f9f7ede0380d
2014-09-05 10:27:27 -07:00
George Mount
66946e22b1 Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 2014-09-03 17:30:24 +00:00
George Mount
dc19ac008c Fix ChangeTransform to work with interruptions
Bug 17372872

If ChangeTransform was interrupted after its animation completed,
but before the parent's Transition completed, it would think
that its start location was relative to its parent's current
position and not relative to its end position.

Change-Id: Iad25aafc03c41c1e0a7530548fb38acafbaffb8e
2014-09-03 17:29:06 +00:00
Chet Haase
95f3bcdce0 Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 2014-09-03 15:19:29 +00:00
Chet Haase
5a7cf3eeeb Fix TransitionManager.go() to allow null transitions
The doc'd behavior of go() is that a null transition is equivalent
to just switching to a scene with no transition. The actual behavior
was an NPE crash.

Issue #17342291 TransitionManager.go() with null Transition parameter throws NPE unlike documentation

Change-Id: I9416aa6e307f80eefc201ca3264fd64f8587ac2f
2014-09-03 07:53:15 -07:00
George Mount
a2327aacac Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 2014-09-03 14:21:47 +00:00
George Mount
c03da0e7a9 Make Fragment Transitions match Acitivty Transitions API
Bug 17188255

Change-Id: I506a097be4010d7156caf465c95295c58612c16e
2014-09-02 15:15:12 -07:00
George Mount
9a61f9485e Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev 2014-08-29 22:43:25 +00:00
George Mount
ff8e6d85dc Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
Bug 17015836

When the size does not change, use offsetLeftAndRight and
offsetTopAndBottom to improve performance.

Change-Id: I3e70c783321346bb98867ec60bd899c39293c9e7
2014-08-28 16:58:01 -07:00
George Mount
46a761db9a Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 2014-08-28 23:24:06 +00:00
George Mount
6276cd4b8d Fix NPE when transitioning on unattached scene root.
Bug 17261558

Change-Id: Ib86c72e26f7fd9ac3fc47df650d95fdeeb43f1be
2014-08-28 16:17:38 -07:00
Craig Mautner
3b2cd1d59f Update API per council requests
launchTaskBehindBackgroundAnimation => launchTaskBehindTargetAnimation
visibilityMode => transitionVisiblityMode
makeLaunchTaskBehindAnimation => makeTaskLaunchBehind
launch_task_behind_background = launch_task_behind_target

Fixes bug 16958544.

Change-Id: I3b7c791fc0671b8071a5377cf6fa878bd5861f70
2014-08-25 14:25:54 -07:00
Dake Gu
c94e2b393f Add Parent Change to ChangeTransform
Bug 16460123

Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.

Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee
2014-08-21 15:50:17 -07:00
George Mount
4d1ecf5daf Fixed ChangeBounds matching against the wrong View.
ChangeBounds must ensure that its parents match to use reparent,
but it used instance and ID matching. Matching can now be
done in several ways and that is insufficient.

Change-Id: Ic0432cd06549e4dc9ba49f33b0a6a42082e29dc1
2014-08-19 14:39:47 -07:00
George Mount
dbe3655c0b Set start transform before animator starts.
Bug 16958319

ChangeImageTransform was waiting until the animator started
before setting the image matrix. Animators with a
start delay would leave the ImageView with the final transform
before the animator started.

Change-Id: I5ebc03b58a8697da3edf4a01c8906d60e7938f44
2014-08-19 16:43:45 +00:00
George Mount
7f15164ecb Add a way to get Transitions from a TransitionSet.
Bug 17113732

Change-Id: I0a157a59448e66560ba2252709971131c5dea401
2014-08-19 16:43:06 +00:00
George Mount
fe361d2113 Move shared elements to overlay when in a transition group.
Bug 15744995

Change-Id: Icf1ee603de23c7bb3bce3723cb24009e36f153d7
2014-08-08 18:01:31 +00:00