Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug with not-gone notifications

Browse Source 
Notifications with a GONE parent broke the whole scrolling model.
The shelf is now always placed at the end instead and the number
of GONE views are measured.

Test: Add a group with a single notification and see that nothing jumps
Bug: 32437839
Change-Id: I27a8c0b46eb8f329f23ad46c3995a19fb839caff
This commit is contained in:
Selim Cinek
2016-11-02 16:12:56 -07:00
parent eccb5de73c
commit 25b5291e12
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -2237,8 +2237,7 @@ public abstract class BaseStatusBar extends SystemUI implements
mStackScroller.changeViewPosition(mDismissView, mStackScroller.getChildCount() - 1);
mStackScroller.changeViewPosition(mEmptyShadeView, mStackScroller.getChildCount() - 2);
mStackScroller.changeViewPosition(mNotificationShelf,
mStackScroller.getChildCount() - 3);
mStackScroller.changeViewPosition(mNotificationShelf, mStackScroller.getChildCount() - 3);
}
public boolean shouldShowOnKeyguard(StatusBarNotification sbn) {

24
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -178,8 +178,11 @@ public class NotificationShelf extends ActivatableNotificationView {
int shelfIndex = mAmbientState.getShelfIndex();
mNotGoneIndex = -1;
// find the first view that doesn't overlap with the shelf
for (int i = shelfIndex - 1; i >= 0; i--) {
ExpandableView child = (ExpandableView) mHostLayout.getChildAt(i);
int notificationIndex = 0;
int notGoneNotifications = 0;
while (notGoneNotifications < shelfIndex) {
ExpandableView child = (ExpandableView) mHostLayout.getChildAt(notificationIndex);
notificationIndex++;
if (!(child instanceof ExpandableNotificationRow)
|| child.getVisibility() == GONE) {
continue;
@@ -188,12 +191,10 @@ public class NotificationShelf extends ActivatableNotificationView {
StatusBarIconView icon = row.getEntry().expandedIcon;
IconState iconState = iconStates.get(icon);
float notificationClipEnd;
float shelfStart;
if (i == shelfIndex - 1) {
shelfStart = getTranslationY();
float shelfStart = getTranslationY();
if (notGoneNotifications == shelfIndex - 1) {
notificationClipEnd = shelfStart + getIntrinsicHeight();
} else {
shelfStart = getTranslationY();
notificationClipEnd = shelfStart - mPaddingBetweenElements;
float height = notificationClipEnd - row.getTranslationY();
if (height <= getNotificationMergeSize()) {
@@ -206,14 +207,15 @@ public class NotificationShelf extends ActivatableNotificationView {
updateNotificationClipHeight(row, notificationClipEnd);
updateIconAppearance(shelfStart, row, iconState, icon);
numIconsInShelf += iconState.iconAppearAmount;
if (row.getTranslationY() >= getTranslationY()) {
mNotGoneIndex = i;
if (row.getTranslationY() >= getTranslationY() && mNotGoneIndex == -1) {
mNotGoneIndex = notGoneNotifications;
}
notGoneNotifications++;
}
for (int i = mHostLayout.getChildCount() - 1; i >= shelfIndex; i--) {
while (notificationIndex < mHostLayout.getChildCount()) {
// We need to reset the clipping in case a notification switches from high to low
// priority.
ExpandableView child = (ExpandableView) mHostLayout.getChildAt(i);
ExpandableView child = (ExpandableView) mHostLayout.getChildAt(notificationIndex);
if (child.getClipBottomAmount() != 0) {
child.setClipBottomAmount(0);
}
@@ -221,7 +223,7 @@ public class NotificationShelf extends ActivatableNotificationView {
ExpandableNotificationRow row = (ExpandableNotificationRow) child;
row.setIconTransformationAmount(0);
}
notificationIndex++;
}
mNotificationIconContainer.calculateIconTranslations();
mNotificationIconContainer.applyIconStates();

1
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -539,7 +539,6 @@ public class NotificationStackScrollLayout extends ViewGroup
public void updateShelfIndex(int newIndex, boolean noAmbient) {
mAmbientState.setShelfIndex(newIndex);
changeViewPosition(mShelf, newIndex);
mNoAmbient = noAmbient;
}