diff options
2 files changed, 11 insertions, 21 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java index f9f2cd328094..24d0a85f3c0a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.phone; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.isNull; @@ -35,7 +36,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; -import com.android.systemui.flags.FakeFeatureFlagsClassic; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shade.ShadeHeadsUpTracker; @@ -87,7 +87,6 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { private KeyguardStateController mKeyguardStateController; private CommandQueue mCommandQueue; private NotificationRoundnessManager mNotificationRoundnessManager; - private final FakeFeatureFlagsClassic mFeatureFlags = new FakeFeatureFlagsClassic(); @Before public void setUp() throws Exception { @@ -124,7 +123,6 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { mNotificationRoundnessManager, mHeadsUpStatusBarView, new Clock(mContext, null), - mFeatureFlags, mock(HeadsUpNotificationIconInteractor.class), Optional.of(mOperatorNameView)); mHeadsUpAppearanceController.setAppearFraction(0.0f, 0.0f); @@ -141,7 +139,7 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { mRow.setPinnedStatus(PinnedStatus.NotPinned); when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(false); mHeadsUpAppearanceController.onHeadsUpUnPinned(mEntry); - assertEquals(null, mHeadsUpStatusBarView.getShowingEntry()); + assertNull(mHeadsUpStatusBarView.getShowingEntry()); } @Test @@ -210,7 +208,7 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { mNotificationRoundnessManager, mHeadsUpStatusBarView, new Clock(mContext, null), - mFeatureFlags, mock(HeadsUpNotificationIconInteractor.class), + mock(HeadsUpNotificationIconInteractor.class), Optional.empty()); assertEquals(expandedHeight, newController.mExpandedHeight, 0.0f); @@ -227,7 +225,7 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { mHeadsUpAppearanceController.onViewDetached(); verify(mHeadsUpManager).removeListener(any()); - verify(mDarkIconDispatcher).removeDarkReceiver((DarkIconDispatcher.DarkReceiver) any()); + verify(mDarkIconDispatcher).removeDarkReceiver(any()); verify(mShadeHeadsUpTracker).removeTrackingHeadsUpListener(any()); verify(mShadeHeadsUpTracker).setHeadsUpAppearanceController(isNull()); verify(mStackScrollerController).removeOnExpandedHeightChangedListener(any()); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java index 677ed9f1ccdc..a4f6ac3d49de 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java @@ -27,7 +27,6 @@ import androidx.annotation.NonNull; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.widget.ViewClippingUtil; import com.android.systemui.dagger.qualifiers.DisplaySpecific; -import com.android.systemui.flags.FeatureFlagsClassic; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.res.R; @@ -108,7 +107,6 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar }; private boolean mAnimationsEnabled = true; private final KeyguardStateController mKeyguardStateController; - private final FeatureFlagsClassic mFeatureFlags; private final HeadsUpNotificationIconInteractor mHeadsUpNotificationIconInteractor; @VisibleForTesting @@ -127,7 +125,6 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar NotificationRoundnessManager notificationRoundnessManager, HeadsUpStatusBarView headsUpStatusBarView, Clock clockView, - FeatureFlagsClassic featureFlags, HeadsUpNotificationIconInteractor headsUpNotificationIconInteractor, @Named(OPERATOR_NAME_FRAME_VIEW) Optional<View> operatorNameViewOptional) { super(headsUpStatusBarView); @@ -145,7 +142,6 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar mStackScrollerController = stackScrollerController; mShadeViewController = shadeViewController; - mFeatureFlags = featureFlags; mHeadsUpNotificationIconInteractor = headsUpNotificationIconInteractor; mStackScrollerController.setHeadsUpAppearanceController(this); mClockView = clockView; @@ -157,7 +153,7 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) { if (shouldBeVisible()) { - updateTopEntry("onLayoutChange"); + updateTopEntry(); // trigger scroller to notify the latest panel translation mStackScrollerController.requestLayout(); @@ -207,7 +203,7 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar @Override public void onHeadsUpPinned(NotificationEntry entry) { - updateTopEntry("onHeadsUpPinned"); + updateTopEntry(); updateHeader(entry); updateHeadsUpAndPulsingRoundness(entry); } @@ -218,7 +214,7 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar mPhoneStatusBarTransitions.onHeadsUpStateChanged(isHeadsUp); } - private void updateTopEntry(String reason) { + private void updateTopEntry() { NotificationEntry newEntry = null; if (shouldBeVisible()) { newEntry = mHeadsUpManager.getTopEntry(); @@ -226,17 +222,13 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar NotificationEntry previousEntry = mView.getShowingEntry(); mView.setEntry(newEntry); if (newEntry != previousEntry) { - boolean animateIsolation = false; if (newEntry == null) { // no heads up anymore, lets start the disappear animation - setShown(false); - animateIsolation = !isExpanded(); } else if (previousEntry == null) { // We now have a headsUp and didn't have one before. Let's start the disappear // animation setShown(true); - animateIsolation = !isExpanded(); } mHeadsUpNotificationIconInteractor.setIsolatedIconNotificationKey( newEntry == null ? null : newEntry.getRepresentativeEntry().getKey()); @@ -355,7 +347,7 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar @Override public void onHeadsUpUnPinned(NotificationEntry entry) { - updateTopEntry("onHeadsUpUnPinned"); + updateTopEntry(); updateHeader(entry); updateHeadsUpAndPulsingRoundness(entry); } @@ -373,7 +365,7 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar updateHeadsUpHeaders(); } if (isExpanded() != oldIsExpanded) { - updateTopEntry("setAppearFraction"); + updateTopEntry(); } } @@ -447,11 +439,11 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar } public void onStateChanged() { - updateTopEntry("onStateChanged"); + updateTopEntry(); } @Override public void onFullyHiddenChanged(boolean isFullyHidden) { - updateTopEntry("onFullyHiddenChanged"); + updateTopEntry(); } } |