From ae61b85cb595ad157000279e77475900a3f44e05 Mon Sep 17 00:00:00 2001 From: George Mount Date: Fri, 24 Jun 2016 17:29:21 -0700 Subject: Return proper values from ChangeScroll.getTransitionProperties Bug 29644621 Change-Id: I9035e94582d05889a00df61f84de46d782baea17 --- core/java/android/transition/ChangeScroll.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'core/java') diff --git a/core/java/android/transition/ChangeScroll.java b/core/java/android/transition/ChangeScroll.java index 5a78b9497f3f..e09268553a18 100644 --- a/core/java/android/transition/ChangeScroll.java +++ b/core/java/android/transition/ChangeScroll.java @@ -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()); -- cgit v1.2.3