summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar/stack
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-08-05 17:10:43 +0000
committerJorim Jaggi <jjaggi@google.com>2014-08-05 17:10:43 +0000
commitf641174eb9a41c9d340e350624533b36e265402f (patch)
treef3473eee66126416eeb67d1d71487480b831f9b0 /packages/SystemUI/src/com/android/systemui/statusbar/stack
parent62a7c831d54d0a552f059e70176ccf7ac77e57f4 (diff)
downloadframeworks_base-f641174eb9a41c9d340e350624533b36e265402f.zip
frameworks_base-f641174eb9a41c9d340e350624533b36e265402f.tar.gz
frameworks_base-f641174eb9a41c9d340e350624533b36e265402f.tar.bz2
Revert "Clean up hiden notifications on Keyguard handling"
This reverts commit d9267cae958b572b715d22a4905b18749a369c9f. Too much performance regression - need to figure out something else. Change-Id: I2d399add74402e1c036235ec095a053a6d5b828e
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/stack')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java14
1 files changed, 6 insertions, 8 deletions
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 6c6bd30..fcca5fa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -1520,7 +1520,7 @@ public class NotificationStackScrollLayout extends ViewGroup
super.onViewAdded(child);
mStackScrollAlgorithm.notifyChildrenChanged(this);
((ExpandableView) child).setOnHeightChangedListener(this);
- generateAddAnimation(child);
+ generateAddAnimation(child, false /* fromMoreCard */);
}
public void setAnimationsEnabled(boolean animationsEnabled) {
@@ -1535,21 +1535,19 @@ public class NotificationStackScrollLayout extends ViewGroup
* Generate an animation for an added child view.
*
* @param child The view to be added.
+ * @param fromMoreCard Whether this add is coming from the "more" card on lockscreen.
*/
- private void generateAddAnimation(View child) {
+ public void generateAddAnimation(View child, boolean fromMoreCard) {
if (mIsExpanded && mAnimationsEnabled && !mChangePositionInProgress) {
// Generate Animations
mChildrenToAddAnimated.add(child);
+ if (fromMoreCard) {
+ mFromMoreCardAdditions.add(child);
+ }
mNeedsAnimation = true;
}
}
- public void notifyAddFromMoreCard(View v) {
- if (mChildrenToAddAnimated.contains(v)) {
- mFromMoreCardAdditions.add(v);
- }
- }
-
/**
* Change the position of child to a new location
*