Merge "Allow notification reordering after user adjusts importance" into qt-dev (57f42f50) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java

+57 −5

Original line number	Original line	Diff line number	Diff line
	@@ -16,18 +16,26 @@

	package com.android.systemui.statusbar.notification;		package com.android.systemui.statusbar.notification;

			import static com.android.systemui.Dependency.MAIN_HANDLER_NAME;

			import android.os.Handler;
			import android.os.SystemClock;
	import android.view.View;		import android.view.View;

	import androidx.collection.ArraySet;		import androidx.collection.ArraySet;

			import com.android.systemui.Dumpable;
	import com.android.systemui.statusbar.NotificationPresenter;		import com.android.systemui.statusbar.NotificationPresenter;
	import com.android.systemui.statusbar.notification.collection.NotificationEntry;		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
	import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
	import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener;		import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener;

			import java.io.FileDescriptor;
			import java.io.PrintWriter;
	import java.util.ArrayList;		import java.util.ArrayList;

	import javax.inject.Inject;		import javax.inject.Inject;
			import javax.inject.Named;
	import javax.inject.Singleton;		import javax.inject.Singleton;

	/**		/**
	@@ -35,14 +43,19 @@ import javax.inject.Singleton;
	* and reorder at the right time when they are out of view.		* and reorder at the right time when they are out of view.
	*/		*/
	@Singleton		@Singleton
	public class VisualStabilityManager implements OnHeadsUpChangedListener {		public class VisualStabilityManager implements OnHeadsUpChangedListener, Dumpable {

			private static final long TEMPORARY_REORDERING_ALLOWED_DURATION = 1000;

	private final ArrayList<Callback> mCallbacks = new ArrayList<>();		private final ArrayList<Callback> mCallbacks = new ArrayList<>();
			private final Handler mHandler;

	private NotificationPresenter mPresenter;		private NotificationPresenter mPresenter;
	private boolean mPanelExpanded;		private boolean mPanelExpanded;
	private boolean mScreenOn;		private boolean mScreenOn;
	private boolean mReorderingAllowed;		private boolean mReorderingAllowed;
			private boolean mIsTemporaryReorderingAllowed;
			private long mTemporaryReorderingStart;
	private VisibilityLocationProvider mVisibilityLocationProvider;		private VisibilityLocationProvider mVisibilityLocationProvider;
	private ArraySet<View> mAllowedReorderViews = new ArraySet<>();		private ArraySet<View> mAllowedReorderViews = new ArraySet<>();
	private ArraySet<NotificationEntry> mLowPriorityReorderingViews = new ArraySet<>();		private ArraySet<NotificationEntry> mLowPriorityReorderingViews = new ArraySet<>();
	@@ -50,7 +63,12 @@ public class VisualStabilityManager implements OnHeadsUpChangedListener {
	private boolean mPulsing;		private boolean mPulsing;

	@Inject		@Inject
	public VisualStabilityManager(NotificationEntryManager notificationEntryManager) {		public VisualStabilityManager(
			NotificationEntryManager notificationEntryManager,
			@Named(MAIN_HANDLER_NAME) Handler handler) {

			mHandler = handler;

	notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {		notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {
	@Override		@Override
	public void onPreEntryUpdated(NotificationEntry entry) {		public void onPreEntryUpdated(NotificationEntry entry) {
	@@ -114,10 +132,11 @@ public class VisualStabilityManager implements OnHeadsUpChangedListener {
	}		}

	private void updateReorderingAllowed() {		private void updateReorderingAllowed() {
	boolean reorderingAllowed = (!mScreenOn \|\| !mPanelExpanded) && !mPulsing;		boolean reorderingAllowed =
	boolean changed = reorderingAllowed && !mReorderingAllowed;		(!mScreenOn \|\| !mPanelExpanded \|\| mIsTemporaryReorderingAllowed) && !mPulsing;
			boolean changedToTrue = reorderingAllowed && !mReorderingAllowed;
	mReorderingAllowed = reorderingAllowed;		mReorderingAllowed = reorderingAllowed;
	if (changed) {		if (changedToTrue) {
	notifyCallbacks();		notifyCallbacks();
	}		}
	}		}
	@@ -179,6 +198,25 @@ public class VisualStabilityManager implements OnHeadsUpChangedListener {
	}		}
	}		}

			/**
			* Temporarily allows reordering of the entire shade for a period of 1000ms. Subsequent calls
			* to this method will extend the timer.
			*/
			public void temporarilyAllowReordering() {
			mHandler.removeCallbacks(mOnTemporaryReorderingExpired);
			mHandler.postDelayed(mOnTemporaryReorderingExpired, TEMPORARY_REORDERING_ALLOWED_DURATION);
			if (!mIsTemporaryReorderingAllowed) {
			mTemporaryReorderingStart = SystemClock.elapsedRealtime();
			}
			mIsTemporaryReorderingAllowed = true;
			updateReorderingAllowed();
			}

			private final Runnable mOnTemporaryReorderingExpired = () -> {
			mIsTemporaryReorderingAllowed = false;
			updateReorderingAllowed();
			};

	/**		/**
	* Notify the visual stability manager that a new view was added and should be allowed to		* Notify the visual stability manager that a new view was added and should be allowed to
	* reorder next time.		* reorder next time.
	@@ -187,6 +225,20 @@ public class VisualStabilityManager implements OnHeadsUpChangedListener {
	mAddedChildren.add(view);		mAddedChildren.add(view);
	}		}

			@Override
			public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
			pw.println("VisualStabilityManager state:");
			pw.print(" mIsTemporaryReorderingAllowed="); pw.println(mIsTemporaryReorderingAllowed);
			pw.print(" mTemporaryReorderingStart="); pw.println(mTemporaryReorderingStart);

			long now = SystemClock.elapsedRealtime();
			pw.print(" Temporary reordering window has been open for ");
			pw.print(now - (mIsTemporaryReorderingAllowed ? mTemporaryReorderingStart : now));
			pw.println("ms");

			pw.println();
			}

	public interface Callback {		public interface Callback {
	/**		/**
	* Called when reordering is allowed again.		* Called when reordering is allowed again.

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager;
	import com.android.systemui.statusbar.NotificationPresenter;		import com.android.systemui.statusbar.NotificationPresenter;
	import com.android.systemui.statusbar.StatusBarState;		import com.android.systemui.statusbar.StatusBarState;
	import com.android.systemui.statusbar.notification.NotificationActivityStarter;		import com.android.systemui.statusbar.notification.NotificationActivityStarter;
			import com.android.systemui.statusbar.notification.VisualStabilityManager;
	import com.android.systemui.statusbar.notification.collection.NotificationEntry;		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
	import com.android.systemui.statusbar.notification.row.NotificationInfo.CheckSaveListener;		import com.android.systemui.statusbar.notification.row.NotificationInfo.CheckSaveListener;
	import com.android.systemui.statusbar.notification.stack.NotificationListContainer;		import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
	@@ -73,6 +74,7 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx

	private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class);		private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class);
	private final Context mContext;		private final Context mContext;
			private final VisualStabilityManager mVisualStabilityManager;
	private final AccessibilityManager mAccessibilityManager;		private final AccessibilityManager mAccessibilityManager;

	// Dependencies:		// Dependencies:
	@@ -96,8 +98,11 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx
	protected String mKeyToRemoveOnGutsClosed;		protected String mKeyToRemoveOnGutsClosed;

	@Inject		@Inject
	public NotificationGutsManager(Context context) {		public NotificationGutsManager(
			Context context,
			VisualStabilityManager visualStabilityManager) {
	mContext = context;		mContext = context;
			mVisualStabilityManager = visualStabilityManager;
	mAccessibilityManager = (AccessibilityManager)		mAccessibilityManager = (AccessibilityManager)
	mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);		mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
	}		}
	@@ -304,6 +309,7 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx
	notificationInfoView.bindNotification(		notificationInfoView.bindNotification(
	pmUser,		pmUser,
	iNotificationManager,		iNotificationManager,
			mVisualStabilityManager,
	packageName,		packageName,
	row.getEntry().channel,		row.getEntry().channel,
	row.getUniqueChannels(),		row.getUniqueChannels(),

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,6 +65,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
	import com.android.systemui.Dependency;		import com.android.systemui.Dependency;
	import com.android.systemui.Interpolators;		import com.android.systemui.Interpolators;
	import com.android.systemui.R;		import com.android.systemui.R;
			import com.android.systemui.statusbar.notification.VisualStabilityManager;
	import com.android.systemui.statusbar.notification.logging.NotificationCounters;		import com.android.systemui.statusbar.notification.logging.NotificationCounters;

	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	@@ -104,6 +105,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
	private INotificationManager mINotificationManager;		private INotificationManager mINotificationManager;
	private PackageManager mPm;		private PackageManager mPm;
	private MetricsLogger mMetricsLogger;		private MetricsLogger mMetricsLogger;
			private VisualStabilityManager mVisualStabilityManager;
	private ChannelEditorDialogController mChannelEditorDialogController;		private ChannelEditorDialogController mChannelEditorDialogController;

	private String mPackageName;		private String mPackageName;
	@@ -244,6 +246,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
	void bindNotification(		void bindNotification(
	final PackageManager pm,		final PackageManager pm,
	final INotificationManager iNotificationManager,		final INotificationManager iNotificationManager,
			final VisualStabilityManager visualStabilityManager,
	final String pkg,		final String pkg,
	final NotificationChannel notificationChannel,		final NotificationChannel notificationChannel,
	final Set<NotificationChannel> uniqueChannelsInRow,		final Set<NotificationChannel> uniqueChannelsInRow,
	@@ -256,7 +259,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
	int importance,		int importance,
	boolean wasShownHighPriority)		boolean wasShownHighPriority)
	throws RemoteException {		throws RemoteException {
	bindNotification(pm, iNotificationManager, pkg, notificationChannel,		bindNotification(pm, iNotificationManager, visualStabilityManager, pkg, notificationChannel,
	uniqueChannelsInRow, sbn, checkSaveListener, onSettingsClick,		uniqueChannelsInRow, sbn, checkSaveListener, onSettingsClick,
	onAppSettingsClick, isDeviceProvisioned, isNonblockable,		onAppSettingsClick, isDeviceProvisioned, isNonblockable,
	false /* isBlockingHelper */,		false /* isBlockingHelper */,
	@@ -266,6 +269,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
	public void bindNotification(		public void bindNotification(
	PackageManager pm,		PackageManager pm,
	INotificationManager iNotificationManager,		INotificationManager iNotificationManager,
			VisualStabilityManager visualStabilityManager,
	String pkg,		String pkg,
	NotificationChannel notificationChannel,		NotificationChannel notificationChannel,
	Set<NotificationChannel> uniqueChannelsInRow,		Set<NotificationChannel> uniqueChannelsInRow,
	@@ -281,6 +285,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
	throws RemoteException {		throws RemoteException {
	mINotificationManager = iNotificationManager;		mINotificationManager = iNotificationManager;
	mMetricsLogger = Dependency.get(MetricsLogger.class);		mMetricsLogger = Dependency.get(MetricsLogger.class);
			mVisualStabilityManager = visualStabilityManager;
	mChannelEditorDialogController = Dependency.get(ChannelEditorDialogController.class);		mChannelEditorDialogController = Dependency.get(ChannelEditorDialogController.class);
	mPackageName = pkg;		mPackageName = pkg;
	mUniqueChannelsInRow = uniqueChannelsInRow;		mUniqueChannelsInRow = uniqueChannelsInRow;
	@@ -539,6 +544,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
	new UpdateImportanceRunnable(mINotificationManager, mPackageName, mAppUid,		new UpdateImportanceRunnable(mINotificationManager, mPackageName, mAppUid,
	mNumUniqueChannelsInRow == 1 ? mSingleNotificationChannel : null,		mNumUniqueChannelsInRow == 1 ? mSingleNotificationChannel : null,
	mStartingChannelImportance, newImportance));		mStartingChannelImportance, newImportance));
			mVisualStabilityManager.temporarilyAllowReordering();
	}		}
	}		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/VisualStabilityManagerTest.java

+84 −27

Original line number	Original line	Diff line number	Diff line
	@@ -16,17 +16,20 @@

	package com.android.systemui.statusbar.notification;		package com.android.systemui.statusbar.notification;

	import static junit.framework.Assert.assertEquals;		import static org.junit.Assert.assertFalse;
			import static org.junit.Assert.assertTrue;
	import static org.mockito.Matchers.anyObject;		import static org.mockito.ArgumentMatchers.any;
	import static org.mockito.Mockito.mock;		import static org.mockito.Mockito.mock;
			import static org.mockito.Mockito.never;
	import static org.mockito.Mockito.verify;		import static org.mockito.Mockito.verify;
	import static org.mockito.Mockito.when;		import static org.mockito.Mockito.when;

			import android.os.Handler;
	import android.service.notification.StatusBarNotification;		import android.service.notification.StatusBarNotification;
	import android.test.suitebuilder.annotation.SmallTest;		import android.testing.AndroidTestingRunner;
			import android.testing.TestableLooper;

	import androidx.test.runner.AndroidJUnit4;		import androidx.test.filters.SmallTest;

	import com.android.systemui.SysuiTestCase;		import com.android.systemui.SysuiTestCase;
	import com.android.systemui.statusbar.NotificationPresenter;		import com.android.systemui.statusbar.NotificationPresenter;
	@@ -38,11 +41,13 @@ import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;

	@SmallTest		@SmallTest
	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidTestingRunner.class)
			@TestableLooper.RunWithLooper()
	public class VisualStabilityManagerTest extends SysuiTestCase {		public class VisualStabilityManagerTest extends SysuiTestCase {

	private VisualStabilityManager mVisualStabilityManager = new VisualStabilityManager(		private TestableLooper mTestableLooper;
	mock(NotificationEntryManager.class));
			private VisualStabilityManager mVisualStabilityManager;
	private VisualStabilityManager.Callback mCallback = mock(VisualStabilityManager.Callback.class);		private VisualStabilityManager.Callback mCallback = mock(VisualStabilityManager.Callback.class);
	private VisibilityLocationProvider mLocationProvider = mock(VisibilityLocationProvider.class);		private VisibilityLocationProvider mLocationProvider = mock(VisibilityLocationProvider.class);
	private ExpandableNotificationRow mRow = mock(ExpandableNotificationRow.class);		private ExpandableNotificationRow mRow = mock(ExpandableNotificationRow.class);
	@@ -50,46 +55,53 @@ public class VisualStabilityManagerTest extends SysuiTestCase {

	@Before		@Before
	public void setUp() {		public void setUp() {
			mTestableLooper = TestableLooper.get(this);
			mVisualStabilityManager = new VisualStabilityManager(
			mock(NotificationEntryManager.class),
			new Handler(mTestableLooper.getLooper()));

	mVisualStabilityManager.setUpWithPresenter(mock(NotificationPresenter.class));		mVisualStabilityManager.setUpWithPresenter(mock(NotificationPresenter.class));
	mVisualStabilityManager.setVisibilityLocationProvider(mLocationProvider);		mVisualStabilityManager.setVisibilityLocationProvider(mLocationProvider);
	mEntry = new NotificationEntry(mock(StatusBarNotification.class));		mEntry = new NotificationEntry(mock(StatusBarNotification.class));
	mEntry.setRow(mRow);		mEntry.setRow(mRow);

			when(mRow.getEntry()).thenReturn(mEntry);
	}		}

	@Test		@Test
	public void testPanelExpansion() {		public void testPanelExpansion() {
	mVisualStabilityManager.setPanelExpanded(true);		mVisualStabilityManager.setPanelExpanded(true);
	mVisualStabilityManager.setScreenOn(true);		mVisualStabilityManager.setScreenOn(true);
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), false);		assertFalse(mVisualStabilityManager.canReorderNotification(mRow));
	mVisualStabilityManager.setPanelExpanded(false);		mVisualStabilityManager.setPanelExpanded(false);
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), true);		assertTrue(mVisualStabilityManager.canReorderNotification(mRow));
	}		}

	@Test		@Test
	public void testScreenOn() {		public void testScreenOn() {
	mVisualStabilityManager.setPanelExpanded(true);		mVisualStabilityManager.setPanelExpanded(true);
	mVisualStabilityManager.setScreenOn(true);		mVisualStabilityManager.setScreenOn(true);
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), false);		assertFalse(mVisualStabilityManager.canReorderNotification(mRow));
	mVisualStabilityManager.setScreenOn(false);		mVisualStabilityManager.setScreenOn(false);
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), true);		assertTrue(mVisualStabilityManager.canReorderNotification(mRow));
	}		}

	@Test		@Test
	public void testReorderingAllowedChangesScreenOn() {		public void testReorderingAllowedChangesScreenOn() {
	mVisualStabilityManager.setPanelExpanded(true);		mVisualStabilityManager.setPanelExpanded(true);
	mVisualStabilityManager.setScreenOn(true);		mVisualStabilityManager.setScreenOn(true);
	assertEquals(mVisualStabilityManager.isReorderingAllowed(), false);		assertFalse(mVisualStabilityManager.isReorderingAllowed());
	mVisualStabilityManager.setScreenOn(false);		mVisualStabilityManager.setScreenOn(false);
	assertEquals(mVisualStabilityManager.isReorderingAllowed(), true);		assertTrue(mVisualStabilityManager.isReorderingAllowed());
	}		}

	@Test		@Test
	public void testReorderingAllowedChangesPanel() {		public void testReorderingAllowedChangesPanel() {
	mVisualStabilityManager.setPanelExpanded(true);		mVisualStabilityManager.setPanelExpanded(true);
	mVisualStabilityManager.setScreenOn(true);		mVisualStabilityManager.setScreenOn(true);
	assertEquals(mVisualStabilityManager.isReorderingAllowed(), false);		assertFalse(mVisualStabilityManager.isReorderingAllowed());
	mVisualStabilityManager.setPanelExpanded(false);		mVisualStabilityManager.setPanelExpanded(false);
	assertEquals(mVisualStabilityManager.isReorderingAllowed(), true);		assertTrue(mVisualStabilityManager.isReorderingAllowed());
	}		}

	@Test		@Test
	@@ -126,51 +138,51 @@ public class VisualStabilityManagerTest extends SysuiTestCase {
	mVisualStabilityManager.setPanelExpanded(true);		mVisualStabilityManager.setPanelExpanded(true);
	mVisualStabilityManager.setScreenOn(true);		mVisualStabilityManager.setScreenOn(true);
	mVisualStabilityManager.notifyViewAddition(mRow);		mVisualStabilityManager.notifyViewAddition(mRow);
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), true);		assertTrue(mVisualStabilityManager.canReorderNotification(mRow));
	}		}

	@Test		@Test
	public void testReorderingVisibleHeadsUpNotAllowed() {		public void testReorderingVisibleHeadsUpNotAllowed() {
	mVisualStabilityManager.setPanelExpanded(true);		mVisualStabilityManager.setPanelExpanded(true);
	mVisualStabilityManager.setScreenOn(true);		mVisualStabilityManager.setScreenOn(true);
	when(mLocationProvider.isInVisibleLocation(anyObject())).thenReturn(true);		when(mLocationProvider.isInVisibleLocation(any(NotificationEntry.class))).thenReturn(true);
	mVisualStabilityManager.onHeadsUpStateChanged(mEntry, true);		mVisualStabilityManager.onHeadsUpStateChanged(mEntry, true);
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), false);		assertFalse(mVisualStabilityManager.canReorderNotification(mRow));
	}		}

	@Test		@Test
	public void testReorderingVisibleHeadsUpAllowed() {		public void testReorderingVisibleHeadsUpAllowed() {
	mVisualStabilityManager.setPanelExpanded(true);		mVisualStabilityManager.setPanelExpanded(true);
	mVisualStabilityManager.setScreenOn(true);		mVisualStabilityManager.setScreenOn(true);
	when(mLocationProvider.isInVisibleLocation(anyObject())).thenReturn(false);		when(mLocationProvider.isInVisibleLocation(any(NotificationEntry.class))).thenReturn(false);
	mVisualStabilityManager.onHeadsUpStateChanged(mEntry, true);		mVisualStabilityManager.onHeadsUpStateChanged(mEntry, true);
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), true);		assertTrue(mVisualStabilityManager.canReorderNotification(mRow));
	}		}

	@Test		@Test
	public void testReorderingVisibleHeadsUpAllowedOnce() {		public void testReorderingVisibleHeadsUpAllowedOnce() {
	mVisualStabilityManager.setPanelExpanded(true);		mVisualStabilityManager.setPanelExpanded(true);
	mVisualStabilityManager.setScreenOn(true);		mVisualStabilityManager.setScreenOn(true);
	when(mLocationProvider.isInVisibleLocation(anyObject())).thenReturn(false);		when(mLocationProvider.isInVisibleLocation(any(NotificationEntry.class))).thenReturn(false);
	mVisualStabilityManager.onHeadsUpStateChanged(mEntry, true);		mVisualStabilityManager.onHeadsUpStateChanged(mEntry, true);
	mVisualStabilityManager.onReorderingFinished();		mVisualStabilityManager.onReorderingFinished();
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), false);		assertFalse(mVisualStabilityManager.canReorderNotification(mRow));
	}		}

	@Test		@Test
	public void testPulsing() {		public void testPulsing() {
	mVisualStabilityManager.setPulsing(true);		mVisualStabilityManager.setPulsing(true);
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), false);		assertFalse(mVisualStabilityManager.canReorderNotification(mRow));
	mVisualStabilityManager.setPulsing(false);		mVisualStabilityManager.setPulsing(false);
	assertEquals(mVisualStabilityManager.canReorderNotification(mRow), true);		assertTrue(mVisualStabilityManager.canReorderNotification(mRow));
	}		}

	@Test		@Test
	public void testReorderingAllowedChanges_Pulsing() {		public void testReorderingAllowedChanges_Pulsing() {
	mVisualStabilityManager.setPulsing(true);		mVisualStabilityManager.setPulsing(true);
	assertEquals(mVisualStabilityManager.isReorderingAllowed(), false);		assertFalse(mVisualStabilityManager.isReorderingAllowed());
	mVisualStabilityManager.setPulsing(false);		mVisualStabilityManager.setPulsing(false);
	assertEquals(mVisualStabilityManager.isReorderingAllowed(), true);		assertTrue(mVisualStabilityManager.isReorderingAllowed());
	}		}

	@Test		@Test
	@@ -180,4 +192,49 @@ public class VisualStabilityManagerTest extends SysuiTestCase {
	mVisualStabilityManager.setPulsing(false);		mVisualStabilityManager.setPulsing(false);
	verify(mCallback).onReorderingAllowed();		verify(mCallback).onReorderingAllowed();
	}		}

			@Test
			public void testTemporarilyAllowReorderingNotifiesCallbacks() {
			// GIVEN having the panel open (which would block reordering)
			mVisualStabilityManager.setScreenOn(true);
			mVisualStabilityManager.setPanelExpanded(true);
			mVisualStabilityManager.addReorderingAllowedCallback(mCallback);

			// WHEN we temprarily allow reordering
			mVisualStabilityManager.temporarilyAllowReordering();

			// THEN callbacks are notified that reordering is allowed
			verify(mCallback).onReorderingAllowed();
			assertTrue(mVisualStabilityManager.isReorderingAllowed());
			}

			@Test
			public void testTemporarilyAllowReorderingDoesntOverridePulsing() {
			// GIVEN we are in a pulsing state
			mVisualStabilityManager.setPulsing(true);
			mVisualStabilityManager.addReorderingAllowedCallback(mCallback);

			// WHEN we temprarily allow reordering
			mVisualStabilityManager.temporarilyAllowReordering();

			// THEN reordering is still not allowed
			verify(mCallback, never()).onReorderingAllowed();
			assertFalse(mVisualStabilityManager.isReorderingAllowed());
			}

			@Test
			public void testTemporarilyAllowReorderingExpires() {
			// GIVEN having the panel open (which would block reordering)
			mVisualStabilityManager.setScreenOn(true);
			mVisualStabilityManager.setPanelExpanded(true);
			mVisualStabilityManager.addReorderingAllowedCallback(mCallback);

			// WHEN we temprarily allow reordering and then wait until the window expires
			mVisualStabilityManager.temporarilyAllowReordering();
			assertTrue(mVisualStabilityManager.isReorderingAllowed());
			mTestableLooper.processMessages(1);

			// THEN reordering is no longer allowed
			assertFalse(mVisualStabilityManager.isReorderingAllowed());
			}
	}		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -63,6 +63,7 @@ import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
	import com.android.systemui.statusbar.NotificationPresenter;		import com.android.systemui.statusbar.NotificationPresenter;
	import com.android.systemui.statusbar.NotificationTestHelper;		import com.android.systemui.statusbar.NotificationTestHelper;
	import com.android.systemui.statusbar.notification.NotificationActivityStarter;		import com.android.systemui.statusbar.notification.NotificationActivityStarter;
			import com.android.systemui.statusbar.notification.VisualStabilityManager;
	import com.android.systemui.statusbar.notification.collection.NotificationEntry;		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
	import com.android.systemui.statusbar.notification.row.NotificationGutsManager.OnSettingsClickListener;		import com.android.systemui.statusbar.notification.row.NotificationGutsManager.OnSettingsClickListener;
	import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
	@@ -97,6 +98,7 @@ public class NotificationGutsManagerTest extends SysuiTestCase {

	@Rule public MockitoRule mockito = MockitoJUnit.rule();		@Rule public MockitoRule mockito = MockitoJUnit.rule();
	@Mock private MetricsLogger mMetricsLogger;		@Mock private MetricsLogger mMetricsLogger;
			@Mock private VisualStabilityManager mVisualStabilityManager;
	@Mock private NotificationPresenter mPresenter;		@Mock private NotificationPresenter mPresenter;
	@Mock private NotificationActivityStarter mNotificationActivityStarter;		@Mock private NotificationActivityStarter mNotificationActivityStarter;
	@Mock private NotificationStackScrollLayout mStackScroller;		@Mock private NotificationStackScrollLayout mStackScroller;
	@@ -111,11 +113,12 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
	mDependency.injectTestDependency(DeviceProvisionedController.class,		mDependency.injectTestDependency(DeviceProvisionedController.class,
	mDeviceProvisionedController);		mDeviceProvisionedController);
	mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);		mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);
			mDependency.injectTestDependency(VisualStabilityManager.class, mVisualStabilityManager);
	mHandler = Handler.createAsync(mTestableLooper.getLooper());		mHandler = Handler.createAsync(mTestableLooper.getLooper());

	mHelper = new NotificationTestHelper(mContext);		mHelper = new NotificationTestHelper(mContext);

	mGutsManager = new NotificationGutsManager(mContext);		mGutsManager = new NotificationGutsManager(mContext, mVisualStabilityManager);
	mGutsManager.setUpWithPresenter(mPresenter, mStackScroller,		mGutsManager.setUpWithPresenter(mPresenter, mStackScroller,
	mCheckSaveListener, mOnSettingsClickListener);		mCheckSaveListener, mOnSettingsClickListener);
	mGutsManager.setNotificationActivityStarter(mNotificationActivityStarter);		mGutsManager.setNotificationActivityStarter(mNotificationActivityStarter);
	@@ -316,6 +319,7 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
	verify(notificationInfoView).bindNotification(		verify(notificationInfoView).bindNotification(
	any(PackageManager.class),		any(PackageManager.class),
	any(INotificationManager.class),		any(INotificationManager.class),
			eq(mVisualStabilityManager),
	eq(statusBarNotification.getPackageName()),		eq(statusBarNotification.getPackageName()),
	any(NotificationChannel.class),		any(NotificationChannel.class),
	anySet(),		anySet(),
	@@ -344,6 +348,7 @@ public class NotificationGutsManagerTest extends SysuiTestCase {
	verify(notificationInfoView).bindNotification(		verify(notificationInfoView).bindNotification(
	any(PackageManager.class),		any(PackageManager.class),