diff options
| author | George Mount <mount@google.com> | 2014-05-15 14:49:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 14:49:31 +0000 |
| commit | e2337588f04f12ffe6de87797e99eeb56bd17277 (patch) | |
| tree | 9f1dea46f083e4736ad14239c7b87fe3147d4012 /api | |
| parent | 4f8beae9de8ea78a139dccec25a2acee79c7093c (diff) | |
| parent | 7b75062fb05a9981faf3c0c9f840dbdb9e97e7f7 (diff) | |
| download | frameworks_base-e2337588f04f12ffe6de87797e99eeb56bd17277.zip frameworks_base-e2337588f04f12ffe6de87797e99eeb56bd17277.tar.gz frameworks_base-e2337588f04f12ffe6de87797e99eeb56bd17277.tar.bz2 | |
Merge "Allow changing order of matching Views in Transitions."
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 97e23fb..5a25b12 100644 --- a/api/current.txt +++ b/api/current.txt @@ -796,6 +796,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 @@ -29362,8 +29363,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 { |