diff options
| author | George Mount <mount@google.com> | 2014-08-21 23:00:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-21 23:00:05 +0000 |
| commit | 99db6030e135f0cee88408c4ec6588a6fce23963 (patch) | |
| tree | 533ba6e9cc6f8dfa7e561abed3bb849a4b268b37 /api | |
| parent | b68654ce84cb80cb89bda69a170c8f69dfb3bd77 (diff) | |
| parent | c94e2b393f6eba684ee2c84eaa50746fc1459d0f (diff) | |
| download | frameworks_base-99db6030e135f0cee88408c4ec6588a6fce23963.zip frameworks_base-99db6030e135f0cee88408c4ec6588a6fce23963.tar.gz frameworks_base-99db6030e135f0cee88408c4ec6588a6fce23963.tar.bz2 | |
Merge "Add Parent Change to ChangeTransform" into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index d193613..07ebe1d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1028,6 +1028,8 @@ package android { field public static final int readPermission = 16842759; // 0x1010007 field public static final int recognitionService = 16843932; // 0x101049c field public static final int relinquishTaskIdentity = 16843894; // 0x1010476 + field public static final int reparent = 16843965; // 0x10104bd + field public static final int reparentWithOverlay = 16843966; // 0x10104be field public static final int repeatCount = 16843199; // 0x10101bf field public static final int repeatMode = 16843200; // 0x10101c0 field public static final int reqFiveWayNav = 16843314; // 0x1010232 @@ -31803,7 +31805,7 @@ package android.transition { ctor public ChangeBounds(android.content.Context, android.util.AttributeSet); method public void captureEndValues(android.transition.TransitionValues); method public void captureStartValues(android.transition.TransitionValues); - method public void setReparent(boolean); + method public deprecated void setReparent(boolean); method public void setResizeClip(boolean); } @@ -31826,6 +31828,10 @@ package android.transition { ctor public ChangeTransform(android.content.Context, android.util.AttributeSet); method public void captureEndValues(android.transition.TransitionValues); method public void captureStartValues(android.transition.TransitionValues); + method public boolean getReparent(); + method public boolean getReparentWithOverlay(); + method public void setReparent(boolean); + method public void setReparentWithOverlay(boolean); } public class CircularPropagation extends android.transition.VisibilityPropagation { |