diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-23 03:40:24 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-23 03:40:24 +0000 |
commit | 955644cc93f4ec42c8a58e8f32c0d61a176586a7 (patch) | |
tree | b092268c5e9b47641fe823175c00ea6e5375b22b | |
parent | 474dda22b5aa88760f8804f789f1b8e1b0910d7c (diff) | |
parent | a3ec72cb36de6e363ce7c1b42ee93e3cd7029e69 (diff) | |
download | base-955644cc93f4ec42c8a58e8f32c0d61a176586a7.tar.gz |
Merge cherrypicks of [9256784, 9257496, 9256447] into qt-release
Change-Id: Id77f6486c473a0adbd2e4d13694897250051067e
3 files changed, 14 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 237825e44b97..f7b79d175263 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -88,6 +88,7 @@ import com.android.systemui.R; import com.android.systemui.SwipeHelper; import com.android.systemui.classifier.FalsingManagerFactory; import com.android.systemui.colorextraction.SysuiColorExtractor; +import com.android.systemui.doze.DozeLog; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; @@ -506,6 +507,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd * If the {@link NotificationShelf} should be visible when dark. */ private boolean mAnimateBottomOnLayout; + private int mPulseReason; @Inject public NotificationStackScrollLayout( @@ -1355,7 +1357,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd mIsClipped = clipped; } - if (!mPulsing && mAmbientState.isFullyDark()) { + if ((!mPulsing || mPulseReason == DozeLog.PULSE_REASON_DOCKING) + && mAmbientState.isFullyDark()) { setClipBounds(null); } else if (mAmbientState.isDarkAtAll()) { clipToOutline = true; @@ -5179,6 +5182,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd notifyHeightChangeListener(null, animated); } + public void setPulseReason(int pulseReason) { + mPulseReason = pulseReason; + updateClipping(); + } + @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) public void setQsExpanded(boolean qsExpanded) { mQsExpanded = qsExpanded; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index bc205d676914..3665dcba0749 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -3134,6 +3134,10 @@ public class NotificationPanelView extends PanelView implements mAnimateNextPositionUpdate = true; } + public void setPulseReason(int reason) { + mNotificationStackScroller.setPulseReason(reason); + } + /** * Panel and QS expansion callbacks. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index c6de829e49be..2c305dff3246 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -3928,6 +3928,7 @@ public class StatusBar extends SystemUI implements DemoMode, // execute the transition. The pulse callback will then be invoked when the scrims // are black, indicating that StatusBar is ready to present the rest of the UI. mPulsing = true; + mNotificationPanel.setPulseReason(reason); mDozeScrimController.pulse(new PulseCallback() { @Override public void onPulseStarted() { |