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

Merge "Showing the notification icon properly now when the pulse is suppressed" into qt-dev

Browse Source 
am: bb94263ca2

Change-Id: Ibedcdda1079dc344e3e86205da3a0e738f51d5af
This commit is contained in:
Selim Cinek
2019-07-29 14:18:28 -07:00
committed by android-build-merger
parent 6d122f1837 bb94263ca2
commit b6bb219d9e
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,7 +512,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
float viewEnd = row.getTranslationY() + row.getActualHeight(); float viewEnd = row.getTranslationY() + row.getActualHeight();
boolean isPinned = (row.isPinned() || row.isHeadsUpAnimatingAway()) boolean isPinned = (row.isPinned() || row.isHeadsUpAnimatingAway())
&& !mAmbientState.isDozingAndNotPulsing(row); && !mAmbientState.isDozingAndNotPulsing(row);
boolean shouldClipOwnTop = row.showingAmbientPulsing() boolean shouldClipOwnTop = row.showingAmbientPulsing() && !mAmbientState.isFullyDark()
|| (mAmbientState.isPulseExpanding() && childIndex == 0); || (mAmbientState.isPulseExpanding() && childIndex == 0);
if (viewEnd > notificationClipEnd && !shouldClipOwnTop if (viewEnd > notificationClipEnd && !shouldClipOwnTop
&& (mAmbientState.isShadeExpanded() || !isPinned)) { && (mAmbientState.isShadeExpanded() || !isPinned)) {
@@ -752,8 +752,9 @@ public class NotificationShelf extends ActivatableNotificationView implements
iconState.scaleY = 1.0f; iconState.scaleY = 1.0f;
iconState.hidden = false; iconState.hidden = false;
} }
if (row.isAboveShelf() || (!row.isInShelf() && (isLastChild && row.areGutsExposed() if ((row.isAboveShelf() || (!row.isInShelf() && (isLastChild && row.areGutsExposed()
|| row.getTranslationZ() > mAmbientState.getBaseZHeight()))) { || row.getTranslationZ() > mAmbientState.getBaseZHeight())))
&& !mAmbientState.isFullyDark()) {
iconState.hidden = true; iconState.hidden = true;
} }
int backgroundColor = getBackgroundColorWithoutTint(); int backgroundColor = getBackgroundColorWithoutTint();

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

@@ -1355,7 +1355,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
mIsClipped = clipped; mIsClipped = clipped;
} }
if (!mAmbientPulseManager.hasNotifications() && mAmbientState.isFullyDark()) { if (!mPulsing && mAmbientState.isFullyDark()) {
setClipBounds(null); setClipBounds(null);
} else if (mAmbientState.isDarkAtAll()) { } else if (mAmbientState.isDarkAtAll()) {
clipToOutline = true; clipToOutline = true;
@@ -5169,6 +5169,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
return; return;
} }
mPulsing = pulsing; mPulsing = pulsing;
updateClipping();
mAmbientState.setPulsing(pulsing); mAmbientState.setPulsing(pulsing);
mSwipeHelper.setPulsing(pulsing); mSwipeHelper.setPulsing(pulsing);
updateNotificationAnimationStates(); updateNotificationAnimationStates();

3
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
View File

@@ -501,7 +501,8 @@ public class StackScrollAlgorithm {
continue; continue;
} }
ExpandableNotificationRow row = (ExpandableNotificationRow) child; ExpandableNotificationRow row = (ExpandableNotificationRow) child;
if (!row.showingAmbientPulsing() || (i == 0 && ambientState.isPulseExpanding())) { if (!row.showingAmbientPulsing() || ambientState.isFullyDark()
|| (i == 0 && ambientState.isPulseExpanding())) {
continue; continue;
} }
ExpandableViewState viewState = row.getViewState(); ExpandableViewState viewState = row.getViewState();