summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2014-05-26 07:49:03 +0200
committerSelim Cinek <cinek@google.com>2014-05-26 07:49:03 +0200
commit0045cc1bbd71e8be1ef15658f82d659f6d0ba47a (patch)
tree8de397e155538c25a1d101677fa841a5ad2386ff /packages
parent5bfee4986a9cd5146eb30a2bddcb201f79728d6c (diff)
downloadframeworks_base-0045cc1bbd71e8be1ef15658f82d659f6d0ba47a.zip
frameworks_base-0045cc1bbd71e8be1ef15658f82d659f6d0ba47a.tar.gz
frameworks_base-0045cc1bbd71e8be1ef15658f82d659f6d0ba47a.tar.bz2
Fixed the gap which could occur after the speedbumpview.
Bug: 15126099 Change-Id: Ia1724c123296313a706790d3a25ffc1857968b63
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java
index a2f8991..a84daef 100644
--- 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