Merge "Revert "Fix shade flicker when launching activity from glanceable hub"" into main (da65f24b) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -883,16 +883,6 @@ flag {
		}
		}

		flag {
		name: "shade_collapse_activity_launch_fix"
		namespace: "systemui"
		description: "Avoid collapsing the shade on activity launch if it is already collapsed, as this causes a flicker."
		bug: "331591373"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "slice_broadcast_relay_in_background"
		namespace: "systemui"

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import static com.android.app.animation.Interpolators.EMPHASIZED_DECELERATE;
		import static com.android.keyguard.KeyguardClockSwitch.LARGE;
		import static com.android.keyguard.KeyguardClockSwitch.SMALL;
		import static com.android.systemui.Flags.predictiveBackAnimateShade;
		import static com.android.systemui.Flags.shadeCollapseActivityLaunchFix;
		import static com.android.systemui.Flags.smartspaceRelocateToBottom;
		import static com.android.systemui.classifier.Classifier.BOUNCER_UNLOCK;
		import static com.android.systemui.classifier.Classifier.GENERIC;
		@@ -4118,11 +4117,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump

		@Override
		public boolean canBeCollapsed() {
		return !isFullyCollapsed() && !isTracking() && !isClosing()
		// Don't try to collapse if on keyguard, as the expansion fraction is 1 in this
		// case.
		&& !(shadeCollapseActivityLaunchFix() && mExpandedFraction == 1f
		&& mBarState == KEYGUARD);
		return !isFullyCollapsed() && !isTracking() && !isClosing();
		}

		public void instantCollapse() {

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java

+0 −28

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.systemui.shade;

		import static com.android.keyguard.KeyguardClockSwitch.LARGE;
		import static com.android.keyguard.KeyguardClockSwitch.SMALL;
		import static com.android.systemui.Flags.FLAG_SHADE_COLLAPSE_ACTIVITY_LAUNCH_FIX;
		import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_CLOSED;
		import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_OPEN;
		import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_OPENING;
		@@ -48,7 +47,6 @@ import android.animation.ValueAnimator;
		import android.graphics.Point;
		import android.os.PowerManager;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;
		import android.view.MotionEvent;
		@@ -678,32 +676,6 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo
		assertThat(mNotificationPanelViewController.canCollapsePanelOnTouch()).isFalse();
		}

		@Test
		@EnableFlags(FLAG_SHADE_COLLAPSE_ACTIVITY_LAUNCH_FIX)
		public void testCanBeCollapsed_expandedInKeyguard() {
		mStatusBarStateController.setState(KEYGUARD);
		mNotificationPanelViewController.setExpandedFraction(1f);

		assertThat(mNotificationPanelViewController.canBeCollapsed()).isFalse();
		}

		@Test
		@EnableFlags(FLAG_SHADE_COLLAPSE_ACTIVITY_LAUNCH_FIX)
		public void testCanBeCollapsed_expandedInShade() {
		mStatusBarStateController.setState(SHADE);
		mNotificationPanelViewController.setExpandedFraction(1f);
		assertThat(mNotificationPanelViewController.canBeCollapsed()).isTrue();
		}

		@Test
		@DisableFlags(FLAG_SHADE_COLLAPSE_ACTIVITY_LAUNCH_FIX)
		public void testCanBeCollapsed_expandedInKeyguard_flagDisabled() {
		mStatusBarStateController.setState(KEYGUARD);
		mNotificationPanelViewController.setExpandedFraction(1f);

		assertThat(mNotificationPanelViewController.canBeCollapsed()).isTrue();
		}

		@Test
		@Ignore("b/341163515 - fails to clean up animators correctly")
		public void testSwipeWhileLocked_notifiesKeyguardState() {