Skip to content

Commit 451da77

Browse files
chethaaseAndroid (Google) Code Review
authored andcommitted
Merge "Add getter for animateFirstView property of ViewAnimator" into jb-mr1-dev
2 parents e671cce + 201501f commit 451da77

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

api/current.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29583,6 +29583,7 @@ package android.widget {
2958329583
public class ViewAnimator extends android.widget.FrameLayout {
2958429584
ctor public ViewAnimator(android.content.Context);
2958529585
ctor public ViewAnimator(android.content.Context, android.util.AttributeSet);
29586+
method public boolean getAnimateFirstView();
2958629587
method public android.view.View getCurrentView();
2958729588
method public int getDisplayedChild();
2958829589
method public android.view.animation.Animation getInAnimation();

core/java/android/widget/ViewAnimator.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,22 @@ public void setOutAnimation(Context context, int resourceID) {
328328
setOutAnimation(AnimationUtils.loadAnimation(context, resourceID));
329329
}
330330

331+
/**
332+
* Returns whether the current View should be animated the first time the ViewAnimator
333+
* is displayed.
334+
*
335+
* @return true if the current View will be animated the first time it is displayed,
336+
* false otherwise.
337+
*
338+
* @see #setAnimateFirstView(boolean)
339+
*/
340+
public boolean getAnimateFirstView() {
341+
return mAnimateFirstTime;
342+
}
343+
331344
/**
332345
* Indicates whether the current View should be animated the first time
333-
* the ViewAnimation is displayed.
346+
* the ViewAnimator is displayed.
334347
*
335348
* @param animate True to animate the current View the first time it is displayed,
336349
* false otherwise.

0 commit comments

Comments
 (0)