diff options
| author | George Mount <mount@google.com> | 2014-05-13 18:08:38 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2014-05-14 12:40:06 -0700 |
| commit | 7b75062fb05a9981faf3c0c9f840dbdb9e97e7f7 (patch) | |
| tree | 9b7065ab3b5f15a3614104b23547539b4c771afe /api | |
| parent | 11d04154811f8f64f86ff0652efe84868284ef8e (diff) | |
| download | frameworks_base-7b75062fb05a9981faf3c0c9f840dbdb9e97e7f7.zip frameworks_base-7b75062fb05a9981faf3c0c9f840dbdb9e97e7f7.tar.gz frameworks_base-7b75062fb05a9981faf3c0c9f840dbdb9e97e7f7.tar.bz2 | |
Allow changing order of matching Views in Transitions.
Bug 14899804
Change-Id: I13c080141fce6be8430d540e3c42d40a445bb224
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 36aa4a0..b1e093e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -798,6 +798,7 @@ package android { field public static final int manageSpaceActivity = 16842756; // 0x1010004 field public static final int mapViewStyle = 16842890; // 0x101008a field public static final int marqueeRepeatLimit = 16843293; // 0x101021d + field public static final int matchOrder = 16843861; // 0x1010455 field public static final int max = 16843062; // 0x1010136 field public static final int maxDate = 16843584; // 0x1010340 field public static final int maxEms = 16843095; // 0x1010157 @@ -29092,8 +29093,13 @@ package android.transition { method public android.transition.Transition setDuration(long); method public void setEpicenterCallback(android.transition.Transition.EpicenterCallback); method public android.transition.Transition setInterpolator(android.animation.TimeInterpolator); + method public void setMatchOrder(int...); method public void setPropagation(android.transition.TransitionPropagation); method public android.transition.Transition setStartDelay(long); + field public static final int MATCH_ID = 3; // 0x3 + field public static final int MATCH_INSTANCE = 1; // 0x1 + field public static final int MATCH_ITEM_ID = 4; // 0x4 + field public static final int MATCH_VIEW_NAME = 2; // 0x2 } public static abstract class Transition.EpicenterCallback { |