diff --git a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java index cc2ed7ffb807c..3cc19e7614b92 100644 --- a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java +++ b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java @@ -71,7 +71,7 @@ public class MultiWaveView extends View { // Tune-able parameters private static final int CHEVRON_INCREMENTAL_DELAY = 160; - private static final int CHEVRON_ANIMATION_DURATION = 650; + private static final int CHEVRON_ANIMATION_DURATION = 850; private static final int RETURN_TO_HOME_DELAY = 1200; private static final int RETURN_TO_HOME_DURATION = 300; private static final int HIDE_ANIMATION_DELAY = 200; @@ -297,7 +297,7 @@ public class MultiWaveView extends View { */ private void startChevronAnimation() { final float r = mHandleDrawable.getWidth() * 0.4f; - final float chevronAnimationDistance = mOuterRadius * 0.8f; + final float chevronAnimationDistance = mOuterRadius * 1.0f; final float from[][] = { {mWaveCenterX - r, mWaveCenterY}, // left {mWaveCenterX + r, mWaveCenterY}, // right @@ -310,6 +310,8 @@ public class MultiWaveView extends View { {mWaveCenterX, mWaveCenterY + chevronAnimationDistance} }; // bottom mChevronAnimations.clear(); + final float startScale = 0.5f; + final float endScale = 2.0f; for (int direction = 0; direction < 4; direction++) { for (int count = 0; count < mFeedbackCount; count++) { int delay = count * CHEVRON_INCREMENTAL_DELAY; @@ -323,6 +325,8 @@ public class MultiWaveView extends View { "x", new float[] { from[direction][0], to[direction][0] }, "y", new float[] { from[direction][1], to[direction][1] }, "alpha", new float[] {1.0f, 0.0f}, + "scaleX", new float[] {startScale, endScale}, + "scaleY", new float[] {startScale, endScale}, "onUpdate", mUpdateListener)); } } diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_down.png b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_down.png index 620844ec374f1..bc718b57b43c1 100644 Binary files a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_down.png and b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_down.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_left.png b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_left.png index d008afa1ef264..0892c31863b25 100644 Binary files a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_left.png and b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_left.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_right.png b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_right.png index e5089003c0528..04cc0a23b4aae 100644 Binary files a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_right.png and b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_right.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_up.png b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_up.png index 4ffa833b93cfb..bb553b1fc2a19 100644 Binary files a/core/res/res/drawable-hdpi/ic_lockscreen_chevron_up.png and b/core/res/res/drawable-hdpi/ic_lockscreen_chevron_up.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_down.png b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_down.png index d3cfd17ea1042..308fe8a29321a 100644 Binary files a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_down.png and b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_down.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_left.png b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_left.png index e5ef113b09095..9a2563433d1f4 100644 Binary files a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_left.png and b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_left.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_right.png b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_right.png index ab723b711e944..77240d03453f2 100644 Binary files a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_right.png and b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_right.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_up.png b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_up.png index 35aca4e824508..e0b013425e7c9 100644 Binary files a/core/res/res/drawable-mdpi/ic_lockscreen_chevron_up.png and b/core/res/res/drawable-mdpi/ic_lockscreen_chevron_up.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_down.png b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_down.png index c655d93b0cc7b..b8e5733522ef9 100644 Binary files a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_down.png and b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_down.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_left.png b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_left.png index 75173cb701fd6..ce5da43fc6502 100644 Binary files a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_left.png and b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_left.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_right.png b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_right.png index 9f6da72fbc134..c16f1431125d5 100644 Binary files a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_right.png and b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_right.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_up.png b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_up.png index 53794fde8cf7d..9bed39a3e3e07 100644 Binary files a/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_up.png and b/core/res/res/drawable-xhdpi/ic_lockscreen_chevron_up.png differ