diff options
author | Selim Cinek <cinek@google.com> | 2015-06-10 23:30:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 23:30:11 +0000 |
commit | 059271ec2945e146b88dfb1e5c4a1e564d757ddf (patch) | |
tree | 3b50d009ac536266959a60ce28953275757971ef | |
parent | dc4c4198f06290ddcb2afec70ae74842ca781a37 (diff) | |
parent | b24e0a90fde332b102c9787f590a94900467340c (diff) | |
download | frameworks_base-059271ec2945e146b88dfb1e5c4a1e564d757ddf.zip frameworks_base-059271ec2945e146b88dfb1e5c4a1e564d757ddf.tar.gz frameworks_base-059271ec2945e146b88dfb1e5c4a1e564d757ddf.tar.bz2 |
Merge "Reseting scrollposition to 0 when going to keyguard" into mnc-dev
2 files changed, 6 insertions, 0 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 d852698..a750572 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -487,6 +487,7 @@ public class NotificationPanelView extends PanelView implements mStatusBar.dismissPopups(); mNotificationStackScroller.setOverScrollAmount(0f, true /* onTop */, false /* animate */, true /* cancelAnimators */); + mNotificationStackScroller.resetScrollPosition(); } public void closeQs() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 6e0c85c..f11a878 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -2230,6 +2230,11 @@ public class NotificationStackScrollLayout extends ViewGroup } } + public void resetScrollPosition() { + mScroller.abortAnimation(); + mOwnScrollY = 0; + } + private void setIsExpanded(boolean isExpanded) { boolean changed = isExpanded != mIsExpanded; mIsExpanded = isExpanded; |