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

Merge "Use clipped content translation when dismissing a HUN." into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-10 18:12:27 +00:00
committed by Android (Google) Code Review
parent e59a4fee55 3ce69ef4d6
commit da7e1b884e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3986,6 +3986,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
updateChronometers(); updateChronometers();
requestChildrenUpdate(); requestChildrenUpdate();
updateUseRoundedRectClipping(); updateUseRoundedRectClipping();
updateDismissBehavior();
} }
} }
@@ -4932,6 +4933,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
StringBuilder sb = new StringBuilder("[") StringBuilder sb = new StringBuilder("[")
.append(this.getClass().getSimpleName()).append(":") .append(this.getClass().getSimpleName()).append(":")
.append(" pulsing=").append(mPulsing ? "T" : "f") .append(" pulsing=").append(mPulsing ? "T" : "f")
.append(" expanded=").append(mIsExpanded ? "T" : "f")
.append(" headsUpPinned=").append(mInHeadsUpPinnedMode ? "T" : "f")
.append(" qsClipping=").append(mShouldUseRoundedRectClipping ? "T" : "f")
.append(" qsClipDismiss=").append(mDismissUsingRowTranslationX ? "T" : "f")
.append(" visibility=").append(DumpUtilsKt.visibilityString(getVisibility())) .append(" visibility=").append(DumpUtilsKt.visibilityString(getVisibility()))
.append(" alpha=").append(getAlpha()) .append(" alpha=").append(getAlpha())
.append(" scrollY=").append(mAmbientState.getScrollY()) .append(" scrollY=").append(mAmbientState.getScrollY())
@@ -5459,7 +5464,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
// On the split keyguard, dismissing with clipping without a visual boundary looks odd, // On the split keyguard, dismissing with clipping without a visual boundary looks odd,
// so let's use the content dismiss behavior instead. // so let's use the content dismiss behavior instead.
boolean dismissUsingRowTranslationX = !mShouldUseSplitNotificationShade boolean dismissUsingRowTranslationX = !mShouldUseSplitNotificationShade
|| mStatusBarState != StatusBarState.KEYGUARD; || (mStatusBarState != StatusBarState.KEYGUARD && mIsExpanded);
if (mDismissUsingRowTranslationX != dismissUsingRowTranslationX) { if (mDismissUsingRowTranslationX != dismissUsingRowTranslationX) {
mDismissUsingRowTranslationX = dismissUsingRowTranslationX; mDismissUsingRowTranslationX = dismissUsingRowTranslationX;
for (int i = 0; i < getChildCount(); i++) { for (int i = 0; i < getChildCount(); i++) {