Removed the darkShelf logic
Previously we were hiding the dark shelf conditionally,
but that logic isn't needed anymore and is creating
other issues
Fixes: 130327302
Test: atest SystemUiTests
Change-Id: Iaadad0c1de6a0bcaba98799585bf35813d60a765
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 de187f1..05ffea4 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
@@ -409,7 +409,7 @@
private final ViewOutlineProvider mOutlineProvider = new ViewOutlineProvider() {
@Override
public void getOutline(View view, Outline outline) {
- if (mAmbientState.isDarkAtAll() || !mShowDarkShelf) {
+ if (mAmbientState.isDarkAtAll()) {
float xProgress = mDarkXInterpolator.getInterpolation(
(1 - mLinearDarkAmount) * mBackgroundXFactor);
outline.setRoundRect(mBackgroundAnimationRect,
@@ -507,7 +507,6 @@
/**
* If the {@link NotificationShelf} should be visible when dark.
*/
- private boolean mShowDarkShelf;
private boolean mAnimateBottomOnLayout;
@Inject
@@ -1365,8 +1364,7 @@
mIsClipped = clipped;
}
- if (!mAmbientPulseManager.hasNotifications()
- && mAmbientState.isFullyDark() && mShowDarkShelf) {
+ if (!mAmbientPulseManager.hasNotifications() && mAmbientState.isFullyDark()) {
setClipBounds(null);
} else if (mAmbientState.isDarkAtAll()) {
clipToOutline = true;
@@ -4719,9 +4717,6 @@
if (mAmbientState.isDark() == dark) {
return;
}
- if (!dark) {
- mShowDarkShelf = false;
- }
mAmbientState.setDark(dark);
if (animate && mAnimationsEnabled) {
mDarkNeedsAnimation = true;
@@ -4783,7 +4778,7 @@
boolean nowDarkAtAll = mAmbientState.isDarkAtAll();
if (nowFullyDark != wasFullyDark) {
updateContentHeight();
- if (nowFullyDark && mShowDarkShelf) {
+ if (nowFullyDark) {
updateDarkShelfVisibility();
}
}
@@ -4799,14 +4794,6 @@
requestChildrenUpdate();
}
- /**
- * If the shelf should be visible when the device is in ambient mode (dozing.)
- */
- @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
- public void showDarkShelf() {
- mShowDarkShelf = true;
- }
-
private void updateDarkShelfVisibility() {
DozeParameters dozeParameters = DozeParameters.getInstance(mContext);
if (dozeParameters.shouldControlScreenOff()) {
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 da9f244..3fe7f36 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -2853,9 +2853,6 @@
if (dozing == mDozing) return;
mDozing = dozing;
mNotificationStackScroller.setDark(mDozing, animate, wakeUpTouchLocation);
- if (mDozing) {
- mNotificationStackScroller.showDarkShelf();
- }
mKeyguardBottomArea.setDozing(mDozing, animate);
if (mBarState == StatusBarState.KEYGUARD
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java
index 08471d8..2f9d892 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java
@@ -119,25 +119,10 @@
mNotificationPanelView.setDozing(true /* dozing */, true /* animate */, null /* touch */);
InOrder inOrder = inOrder(mNotificationStackScrollLayout, mStatusBarStateController);
inOrder.verify(mNotificationStackScrollLayout).setDark(eq(true), eq(true), eq(null));
- inOrder.verify(mNotificationStackScrollLayout).showDarkShelf();
inOrder.verify(mStatusBarStateController).setDozeAmount(eq(1f), eq(true));
}
@Test
- public void testSetDozing_showsDarkShelfWithDefaultClock() {
- when(mKeyguardStatusView.hasCustomClock()).thenReturn(false);
- mNotificationPanelView.setDozing(true /* dozing */, true /* animate */, null /* touch */);
- verify(mNotificationStackScrollLayout).showDarkShelf();
- }
-
- @Test
- public void testSetDozing_showsDarkShelfWhenCustomClock() {
- when(mKeyguardStatusView.hasCustomClock()).thenReturn(true);
- mNotificationPanelView.setDozing(true /* dozing */, true /* animate */, null /* touch */);
- verify(mNotificationStackScrollLayout).showDarkShelf();
- }
-
- @Test
public void testSetExpandedHeight() {
mNotificationPanelView.setExpandedHeight(200);
assertThat((int) mNotificationPanelView.getExpandedHeight()).isEqualTo(200);