From bb701aaa83889b208ba8910e08023c84693138d1 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Thu, 19 Sep 2013 15:03:00 -0400 Subject: Updated launcher assets part 2. - fixed centering on new pagination indicators - also tuned the pagination animation a bit to make the size change feel more natural Bug: 10807054 Change-Id: I0953cff80bfeecf085172f710a4bc947133115ed --- src/com/android/launcher3/PageIndicatorMarker.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/com/android/launcher3/PageIndicatorMarker.java') diff --git a/src/com/android/launcher3/PageIndicatorMarker.java b/src/com/android/launcher3/PageIndicatorMarker.java index f64c14fdc..1ad0abb6b 100644 --- a/src/com/android/launcher3/PageIndicatorMarker.java +++ b/src/com/android/launcher3/PageIndicatorMarker.java @@ -57,26 +57,38 @@ public class PageIndicatorMarker extends FrameLayout { if (immediate) { mActiveMarker.animate().cancel(); mActiveMarker.setAlpha(1f); + mActiveMarker.setScaleX(1f); + mActiveMarker.setScaleY(1f); mInactiveMarker.animate().cancel(); mInactiveMarker.setAlpha(0f); } else { - mActiveMarker.animate().alpha(1f) + mActiveMarker.animate() + .alpha(1f) + .scaleX(1f) + .scaleY(1f) .setDuration(MARKER_FADE_DURATION).start(); - mInactiveMarker.animate().alpha(0f) + mInactiveMarker.animate() + .alpha(0f) .setDuration(MARKER_FADE_DURATION).start(); } mIsActive = true; } + void inactivate(boolean immediate) { if (immediate) { mInactiveMarker.animate().cancel(); mInactiveMarker.setAlpha(1f); mActiveMarker.animate().cancel(); mActiveMarker.setAlpha(0f); + mActiveMarker.setScaleX(0.5f); + mActiveMarker.setScaleY(0.5f); } else { mInactiveMarker.animate().alpha(1f) .setDuration(MARKER_FADE_DURATION).start(); - mActiveMarker.animate().alpha(0f) + mActiveMarker.animate() + .alpha(0f) + .scaleX(0.5f) + .scaleY(0.5f) .setDuration(MARKER_FADE_DURATION).start(); } mIsActive = false; -- cgit v1.2.3