commit aa7766b4d4990bc80764f942ee49ad7ba8d6334b
author Selim Cinek <cinek@google.com> Tue Jul 24 14:55:11 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 24 14:55:11 2018 +0000
tree a18fae77fd3f4048be6740a6fae4f9d6987cd381
parent 5d0af8d357389f58add0c6001a6566f89d4609be
parent 51810d56f38188dc884f831c51fc24dbbb8499f1

Merge "Fixed a bug where the shelf could be stuck translating" into pi-dev

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
index 3063199..a215ec6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
@@ -151,12 +151,11 @@
     }
 
     public void fadeInTranslating() {
-        float translation = mShelfIcons.getTranslationY();
-        mShelfIcons.setTranslationY(translation - mShelfAppearTranslation);
+        mShelfIcons.setTranslationY(-mShelfAppearTranslation);
         mShelfIcons.setAlpha(0);
         mShelfIcons.animate()
                 .setInterpolator(Interpolators.DECELERATE_QUINT)
-                .translationY(translation)
+                .translationY(0)
                 .setDuration(SHELF_IN_TRANSLATION_DURATION)
                 .start();
         mShelfIcons.animate()