diff options
| author | Selim Cinek <cinek@google.com> | 2014-05-26 14:13:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-26 14:13:05 +0000 |
| commit | 0b176bbc10147df9a5b814e164cf9f9c748382c5 (patch) | |
| tree | f79c4f73de55c78f75347fa7546226674ce4625a /packages | |
| parent | b13d754898eee54876799b3a306ff6fa453acfda (diff) | |
| parent | 0045cc1bbd71e8be1ef15658f82d659f6d0ba47a (diff) | |
| download | frameworks_base-0b176bbc10147df9a5b814e164cf9f9c748382c5.zip frameworks_base-0b176bbc10147df9a5b814e164cf9f9c748382c5.tar.gz frameworks_base-0b176bbc10147df9a5b814e164cf9f9c748382c5.tar.bz2 | |
Merge "Fixed the gap which could occur after the speedbumpview." into lmp-preview-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java | 6 |
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 |