commit c1aac02a37f334ba04d7b2b3a5a3417c3ebe2a38
author Jason Monk <jmonk@google.com> Mon Aug 08 15:32:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 08 15:32:47 2016 +0000
tree 6ca1a154bf2851faa026dbe4d18135e2586c0cd0
parent a6ab28d3c9c48b9bfc58e11d81397fb1fca15040
parent 08a79197da3ceff52f8dbd82ac62710c229f6e19

Merge "QS: Tweak animation paths when few icons" into nyc-mr1-dev

packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
index 63444d2..a21408d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
@@ -233,10 +233,14 @@
                     .addFloat(mQsPanel.getTileLayout(), "alpha", 0, 1)
                     .addFloat(mQsPanel.getFooter().getView(), "alpha", 0, 1).build();
             mAllViews.add(mQsPanel.getFooter().getView());
-            Path path = new Path();
-            path.moveTo(0, 0);
-            path.cubicTo(0, 0, 0, 1, 1, 1);
-            PathInterpolatorBuilder interpolatorBuilder = new PathInterpolatorBuilder(0, 0, 0, 1);
+            float px = 0;
+            float py = 1;
+            if (tiles.size() <= 3) {
+                px = 1;
+            } else if (tiles.size() <= 6) {
+                px = .4f;
+            }
+            PathInterpolatorBuilder interpolatorBuilder = new PathInterpolatorBuilder(0, 0, px, py);
             translationXBuilder.setInterpolator(interpolatorBuilder.getXInterpolator());
             translationYBuilder.setInterpolator(interpolatorBuilder.getYInterpolator());
             mTranslationXAnimator = translationXBuilder.build();