am 7aca28a2: Merge "Fixed the gap which could occur after the speedbumpview." into lmp-preview-dev

* commit '7aca28a28037b62c8341d91d8ac2b6056cfa8137': Fixed the gap which could occur after the speedbumpview.
2014-05-26 14:16:32 +00:00
parent 60e3422d90 0b176bbc10
commit 726bb9725c
1 changed files with 5 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java
@@ -103,7 +103,11 @@ public class SpeedBumpView extends ExpandableView implements View.OnClickListene

    @Override
    public int getIntrinsicHeight() {
-        return getActualHeight();
+        if (mCurrentAnimator != null) {
+            // expand animation is running
+            return getActualHeight();
+        }
+        return mIsExpanded ? getHeight() : mCollapsedHeight;
    }

    @Override