diff options
| author | Christoph Studer <chstuder@google.com> | 2014-10-31 15:03:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 15:03:53 +0000 |
| commit | 5004c6d028630197cebd0b657f3c3df99372dba9 (patch) | |
| tree | 27afc71d72d911d2d6db4a44b85c545c07efb291 /packages/SystemUI/src/com/android/systemui/statusbar | |
| parent | c7587ddefa74d6fe8ef01304ec878aa0faeeae2f (diff) | |
| parent | 76f21de029252758e7bd94a8fc0a67e6ae8ac943 (diff) | |
| download | frameworks_base-5004c6d028630197cebd0b657f3c3df99372dba9.zip frameworks_base-5004c6d028630197cebd0b657f3c3df99372dba9.tar.gz frameworks_base-5004c6d028630197cebd0b657f3c3df99372dba9.tar.bz2 | |
am 76f21de0: am 104078c8: Merge "SysUI: Never log GONE notifications as visible" into lmp-mr1-dev
* commit '76f21de029252758e7bd94a8fc0a67e6ae8ac943':
SysUI: Never log GONE notifications as visible
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java | 2 |
2 files changed, 5 insertions, 0 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 4a20406..dd178cd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -367,6 +367,9 @@ public class NotificationStackScrollLayout extends ViewGroup if (childViewState == null) { return ViewState.LOCATION_UNKNOWN; } + if (childViewState.gone) { + return ViewState.LOCATION_GONE; + } return childViewState.location; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java index 026c2f3..4611370 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java @@ -234,6 +234,8 @@ public class StackScrollState { public static final int LOCATION_MAIN_AREA = 0x08; public static final int LOCATION_BOTTOM_STACK_PEEKING = 0x10; public static final int LOCATION_BOTTOM_STACK_HIDDEN = 0x20; + /** The view isn't layouted at all. */ + public static final int LOCATION_GONE = 0x40; float alpha; float yTranslation; |