diff options
author | Jorim Jaggi <jjaggi@google.com> | 2014-09-05 16:22:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 16:22:25 +0000 |
commit | 89b39b2b07c13ef44aa228759d1d6cf72a235d62 (patch) | |
tree | 974f818f351fb98129fcb788a88d3a5ca16c9d29 /packages/SystemUI | |
parent | a0843f4967a42b3f0346394b7acc59a26a4f6f1a (diff) | |
parent | 12a6782d61dbefd5ba0bb286372936f957849637 (diff) | |
download | frameworks_base-89b39b2b07c13ef44aa228759d1d6cf72a235d62.zip frameworks_base-89b39b2b07c13ef44aa228759d1d6cf72a235d62.tar.gz frameworks_base-89b39b2b07c13ef44aa228759d1d6cf72a235d62.tar.bz2 |
Merge "Don't update notification layer when collapsing the panel" into lmp-dev
Diffstat (limited to 'packages/SystemUI')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index f467e27..cf5aebc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -1278,7 +1278,7 @@ public class NotificationPanelView extends PanelView implements private void updateNotificationTranslucency() { float alpha = (getNotificationsTopY() + mNotificationStackScroller.getItemHeight()) / (mQsMinExpansionHeight + mNotificationStackScroller.getBottomStackPeekSize() - + mNotificationStackScroller.getCollapseSecondCardPadding()); + - mNotificationStackScroller.getCollapseSecondCardPadding()); alpha = Math.max(0, Math.min(alpha, 1)); alpha = (float) Math.pow(alpha, 0.75); if (alpha != 1f && mNotificationStackScroller.getLayerType() != LAYER_TYPE_HARDWARE) { |