Merge "Return proper values from ChangeScroll.getTransitionProperties"
This commit is contained in:
committed by
Android (Google) Code Review
commit
50b2c2444c
@@ -34,6 +34,11 @@ public class ChangeScroll extends Transition {
|
||||
private static final String PROPNAME_SCROLL_X = "android:changeScroll:x";
|
||||
private static final String PROPNAME_SCROLL_Y = "android:changeScroll:y";
|
||||
|
||||
private static final String[] PROPERTIES = {
|
||||
PROPNAME_SCROLL_X,
|
||||
PROPNAME_SCROLL_Y,
|
||||
};
|
||||
|
||||
public ChangeScroll() {}
|
||||
|
||||
public ChangeScroll(Context context, AttributeSet attrs) {
|
||||
@@ -50,6 +55,11 @@ public class ChangeScroll extends Transition {
|
||||
captureValues(transitionValues);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getTransitionProperties() {
|
||||
return PROPERTIES;
|
||||
}
|
||||
|
||||
private void captureValues(TransitionValues transitionValues) {
|
||||
transitionValues.values.put(PROPNAME_SCROLL_X, transitionValues.view.getScrollX());
|
||||
transitionValues.values.put(PROPNAME_SCROLL_Y, transitionValues.view.getScrollY());
|
||||
|
||||
Reference in New Issue
Block a user